Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix: Update tests for current GEOS versions #3

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
+108 −59
Open

Bugfix: Update tests for current GEOS versions #3

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
13f3ee2
Update Multipoint Format in WKBReader GEOS 3.12
Nov 23, 2023
a4701d5
Update Output Dimensions in WKBWriter GEOS 3.12
Nov 23, 2023
ccd0121
Update Format and Output Dimensions in WKTWriter
Nov 23, 2023
2bcd0fb
Update Multipoint Formats and Values in Geoemetry GEOS 3.12
Nov 23, 2023
b3533c7
Geos version-related constants
Nov 24, 2023
09c4a3b
removing unnecessary test file
Nov 30, 2023
f42a9d1
Added more version-related constants
Nov 30, 2023
24fb484
Update Output Dimensions configuration constant in WKBWriter
Nov 30, 2023
d488c04
Update Output Dimensions configuration constant in WKTWriter
Nov 30, 2023
6bc11fe
Corrected negative zero and change expected values for GEOS 3.11 in G…
Nov 30, 2023
20491fb
Changed 'include' to 'require'
Dec 1, 2023
fb44078
Corrected php ternary syntax
Dec 1, 2023
1d7e220
Introduce assertEqualsAny and fix version comparison
Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Introduce assertEqualsAny and fix version comparison 
Introduce `assertEqualsAny` function for cleaner assertions with more than two expected values.
Correct the version comparison for GEOS_DEFAULT_EMPTY from 3.11 to 3.9.
masrih authored and masrih committed Dec 4, 2023
commit 1d7e220c53542ccefea08f3ebbc1c72535dfeeed
29 changes: 15 additions & 14 deletions tests/001_Geometry.phpt
View file
Original file line number Diff line number Diff line change
@@ -478,16 +478,16 @@ class GeometryTest extends GEOSTest
$g = $reader->read('POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))');
$g2 = $reader->read('LINESTRING(5 -10, 5 10)');
$gi = $g->difference($g2);
$this->assertEquals(GEOS_CORRECT_VALUE ? 'POLYGON ((0 0, 0 10, 5 10, 10 10, 10 0, 5 0, 0 0))' : 'POLYGON ((5 0, 0 0, 0 10, 5 10, 10 10, 10 0, 5 0))', $writer->write($gi)); //Polygon changed between 3.9 and 3.11
$this->assertEqualsAny(array('POLYGON ((0 0, 0 10, 5 10, 10 10, 10 0, 5 0, 0 0))', 'POLYGON ((0 10, 5 10, 10 10, 10 0, 5 0, 0 0, 0 10))', 'POLYGON ((5 0, 0 0, 0 10, 5 10, 10 10, 10 0, 5 0))'), $writer->write($gi)); //Polygon changed twice between 3.9 and 3.11
$g2 = $reader->read('LINESTRING(10 0, 20 0)');
$gi = $g->difference($g2);
$this->assertEquals(GEOS_CORRECT_VALUE ? 'POLYGON ((0 0, 0 10, 10 10, 10 0, 0 0))' : 'POLYGON ((10 0, 0 0, 0 10, 10 10, 10 0))', $writer->write($gi)); //Polygon changed between 3.9 and 3.11
$this->assertEqualsAny(array('POLYGON ((0 0, 0 10, 10 10, 10 0, 0 0))', 'POLYGON ((10 0, 0 0, 0 10, 10 10, 10 0))', 'POLYGON ((0 10, 10 10, 10 0, 0 0, 0 10))'), $writer->write($gi)); //Polygon changed between 3.9 and 3.11

/* POLY - POLY */
$g = $reader->read('POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))');
$g2 = $reader->read('POLYGON((5 -5, 5 5, 15 5, 15 -5, 5 -5))');
$gi = $g->difference($g2);
$this->assertEquals(GEOS_CORRECT_VALUE ? 'POLYGON ((0 0, 0 10, 10 10, 10 5, 5 5, 5 0, 0 0))' : 'POLYGON ((5 0, 0 0, 0 10, 10 10, 10 5, 5 5, 5 0))', $writer->write($gi)); //Polygon changed between 3.9 and 3.11
$this->assertEqualsAny(array('POLYGON ((0 0, 0 10, 10 10, 10 5, 5 5, 5 0, 0 0))', 'POLYGON ((5 0, 0 0, 0 10, 10 10, 10 5, 5 5, 5 0))', 'POLYGON ((0 10, 10 10, 10 5, 5 5, 5 0, 0 0, 0 10))'), $writer->write($gi)); //Polygon changed between 3.9 and 3.11
}

public function testGeometry_symdifference()
@@ -527,7 +527,7 @@ class GeometryTest extends GEOSTest
$g = $reader->read('LINESTRING(0 0, 10 0)');
$g2 = $reader->read('LINESTRING(5 -10, 5 10)');
$gi = $g->symDifference($g2);
$this->assertEquals('MULTILINESTRING ((0 0, 5 0), (5 0, 10 0), (5 -10, 5 0), (5 0, 5 10))', $writer->write($gi));
$this->assertEquals(GEOS_VERSION == 3.9 ? 'MULTILINESTRING ((0 0, 5 0), (5 -10, 5 0), (5 0, 5 10), (5 0, 10 0))' : 'MULTILINESTRING ((0 0, 5 0), (5 0, 10 0), (5 -10, 5 0), (5 0, 5 10))', $writer->write($gi));
$g2 = $reader->read('LINESTRING(5 0, 20 0)');
$gi = $g->symDifference($g2);
$this->assertEquals('MULTILINESTRING ((0 0, 5 0), (10 0, 20 0))', $writer->write($gi));
@@ -536,16 +536,16 @@ class GeometryTest extends GEOSTest
$g = $reader->read('POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))');
$g2 = $reader->read('LINESTRING(5 -10, 5 10)');
$gi = $g->symDifference($g2);
$this->assertEquals(GEOS_CORRECT_VALUE ? 'GEOMETRYCOLLECTION (POLYGON ((0 0, 0 10, 5 10, 10 10, 10 0, 5 0, 0 0)), LINESTRING (5 -10, 5 0))' : 'GEOMETRYCOLLECTION (LINESTRING (5 -10, 5 0), POLYGON ((5 0, 0 0, 0 10, 5 10, 10 10, 10 0, 5 0)))', $writer->write($gi)); //Updated value between 3.9 and 3.11
$this->assertEqualsAny(array('GEOMETRYCOLLECTION (POLYGON ((0 0, 0 10, 5 10, 10 10, 10 0, 5 0, 0 0)), LINESTRING (5 -10, 5 0))', 'GEOMETRYCOLLECTION (LINESTRING (5 -10, 5 0), POLYGON ((5 0, 0 0, 0 10, 5 10, 10 10, 10 0, 5 0)))', 'GEOMETRYCOLLECTION (POLYGON ((0 10, 5 10, 10 10, 10 0, 5 0, 0 0, 0 10)), LINESTRING (5 -10, 5 0))'), $writer->write($gi)); // GemoetryCollection changed twice between 3.9 and 3.11
$g2 = $reader->read('LINESTRING(10 0, 20 0)');
$gi = $g->symDifference($g2);
$this->assertEquals(GEOS_CORRECT_VALUE ? 'GEOMETRYCOLLECTION (POLYGON ((0 0, 0 10, 10 10, 10 0, 0 0)), LINESTRING (10 0, 20 0))' : 'GEOMETRYCOLLECTION (LINESTRING (10 0, 20 0), POLYGON ((10 0, 0 0, 0 10, 10 10, 10 0)))', $writer->write($gi)); //Updated value between 3.9 and 3.11
$this->assertEqualsAny(array('GEOMETRYCOLLECTION (POLYGON ((0 0, 0 10, 10 10, 10 0, 0 0)), LINESTRING (10 0, 20 0))', 'GEOMETRYCOLLECTION (LINESTRING (10 0, 20 0), POLYGON ((10 0, 0 0, 0 10, 10 10, 10 0)))', 'GEOMETRYCOLLECTION (POLYGON ((0 10, 10 10, 10 0, 0 0, 0 10)), LINESTRING (10 0, 20 0))'), $writer->write($gi)); // GemoetryCollection changed twice between 3.9 and 3.11

/* POLY - POLY */
$g = $reader->read('POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))');
$g2 = $reader->read('POLYGON((5 -5, 5 5, 15 5, 15 -5, 5 -5))');
$gi = $g->symDifference($g2);
$this->assertEquals(GEOS_CORRECT_VALUE ? 'MULTIPOLYGON (((0 0, 0 10, 10 10, 10 5, 5 5, 5 0, 0 0)), ((10 0, 10 5, 15 5, 15 -5, 5 -5, 5 0, 10 0)))' : 'MULTIPOLYGON (((5 0, 0 0, 0 10, 10 10, 10 5, 5 5, 5 0)), ((5 0, 10 0, 10 5, 15 5, 15 -5, 5 -5, 5 0)))', $writer->write($gi)); //Updated value between 3.9 and 3.11
$this->assertEqualsAny(array('MULTIPOLYGON (((0 0, 0 10, 10 10, 10 5, 5 5, 5 0, 0 0)), ((10 0, 10 5, 15 5, 15 -5, 5 -5, 5 0, 10 0)))', 'MULTIPOLYGON (((5 0, 0 0, 0 10, 10 10, 10 5, 5 5, 5 0)), ((5 0, 10 0, 10 5, 15 5, 15 -5, 5 -5, 5 0)))', 'MULTIPOLYGON (((0 10, 10 10, 10 5, 5 5, 5 0, 0 0, 0 10)), ((5 0, 10 0, 10 5, 15 5, 15 -5, 5 -5, 5 0)))'), $writer->write($gi)); // GemoetryCollection changed twice between 3.9 and 3.11
}

public function testGeometry_boundary()
@@ -607,7 +607,7 @@ class GeometryTest extends GEOSTest
$g = $reader->read('LINESTRING(0 0, 10 0)');
$g2 = $reader->read('LINESTRING(5 -10, 5 10)');
$gi = $g->union($g2);
$this->assertEquals('MULTILINESTRING ((0 0, 5 0), (5 0, 10 0), (5 -10, 5 0), (5 0, 5 10))', $writer->write($gi));
$this->assertEquals(GEOS_VERSION == 3.9 ? 'MULTILINESTRING ((0 0, 5 0), (5 -10, 5 0), (5 0, 5 10), (5 0, 10 0))' : 'MULTILINESTRING ((0 0, 5 0), (5 0, 10 0), (5 -10, 5 0), (5 0, 5 10))', $writer->write($gi));
$g2 = $reader->read('LINESTRING(5 0, 20 0)');
$gi = $g->union($g2);
$this->assertEquals('MULTILINESTRING ((0 0, 5 0), (5 0, 10 0), (10 0, 20 0))', $writer->write($gi));
@@ -616,16 +616,16 @@ class GeometryTest extends GEOSTest
$g = $reader->read('POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))');
$g2 = $reader->read('LINESTRING(5 -10, 5 10)');
$gi = $g->union($g2);
$this->assertEquals(GEOS_CORRECT_VALUE ? 'GEOMETRYCOLLECTION (POLYGON ((0 0, 0 10, 5 10, 10 10, 10 0, 5 0, 0 0)), LINESTRING (5 -10, 5 0))' : 'GEOMETRYCOLLECTION (LINESTRING (5 -10, 5 0), POLYGON ((5 0, 0 0, 0 10, 5 10, 10 10, 10 0, 5 0)))', $writer->write($gi)); //Updated value between 3.9 and 3.11
$this->assertEqualsAny(array('GEOMETRYCOLLECTION (POLYGON ((0 0, 0 10, 5 10, 10 10, 10 0, 5 0, 0 0)), LINESTRING (5 -10, 5 0))', 'GEOMETRYCOLLECTION (LINESTRING (5 -10, 5 0), POLYGON ((5 0, 0 0, 0 10, 5 10, 10 10, 10 0, 5 0)))', 'GEOMETRYCOLLECTION (POLYGON ((0 10, 5 10, 10 10, 10 0, 5 0, 0 0, 0 10)), LINESTRING (5 -10, 5 0))'), $writer->write($gi)); // GeometryCollection updated twice between 3.9 and 3.11
$g2 = $reader->read('LINESTRING(10 0, 20 0)');
$gi = $g->union($g2);
$this->assertEquals(GEOS_CORRECT_VALUE ? 'GEOMETRYCOLLECTION (POLYGON ((0 0, 0 10, 10 10, 10 0, 0 0)), LINESTRING (10 0, 20 0))' : 'GEOMETRYCOLLECTION (LINESTRING (10 0, 20 0), POLYGON ((10 0, 0 0, 0 10, 10 10, 10 0)))', $writer->write($gi)); //Updated value between 3.9 and 3.11
$this->assertEqualsAny(array('GEOMETRYCOLLECTION (POLYGON ((0 0, 0 10, 10 10, 10 0, 0 0)), LINESTRING (10 0, 20 0))', 'GEOMETRYCOLLECTION (LINESTRING (10 0, 20 0), POLYGON ((10 0, 0 0, 0 10, 10 10, 10 0)))', 'GEOMETRYCOLLECTION (POLYGON ((0 10, 10 10, 10 0, 0 0, 0 10)), LINESTRING (10 0, 20 0))'), $writer->write($gi)); //GeometryCollection updated twice between 3.9 and 3.11

/* POLY - POLY */
$g = $reader->read('POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))');
$g2 = $reader->read('POLYGON((5 -5, 5 5, 15 5, 15 -5, 5 -5))');
$gi = $g->union($g2);
$this->assertEquals(GEOS_CORRECT_VALUE ? 'POLYGON ((0 0, 0 10, 10 10, 10 5, 15 5, 15 -5, 5 -5, 5 0, 0 0))' : 'POLYGON ((5 0, 0 0, 0 10, 10 10, 10 5, 15 5, 15 -5, 5 -5, 5 0))', $writer->write($gi)); //Updated value between 3.9 and 3.11
$this->assertEqualsAny(array('POLYGON ((0 0, 0 10, 10 10, 10 5, 15 5, 15 -5, 5 -5, 5 0, 0 0))', 'POLYGON ((5 0, 0 0, 0 10, 10 10, 10 5, 15 5, 15 -5, 5 -5, 5 0))', 'POLYGON ((0 10, 10 10, 10 5, 15 5, 15 -5, 5 -5, 5 0, 0 0, 0 10))'), $writer->write($gi)); //Updated Polygon twice between 3.9 and 3.11
}

public function testGeometry_unaryunion()
@@ -645,7 +645,7 @@ class GeometryTest extends GEOSTest
)');

$gu = $g->union();
$this->assertEquals(GEOS_CORRECT_VALUE ? 'POLYGON ((0 0, 0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0, 0 0), (12 12, 11 12, 11 11, 12 11, 12 12))' : 'POLYGON ((1 0, 0 0, 0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0), (11 11, 12 11, 12 12, 11 12, 11 11))', $writer->write($gu)); //Updated value between 3.9 and 3.11
$this->assertEqualsAny(array('POLYGON ((0 0, 0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0, 0 0), (12 12, 11 12, 11 11, 12 11, 12 12))', 'POLYGON ((1 0, 0 0, 0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0), (11 11, 12 11, 12 12, 11 12, 11 11))', 'POLYGON ((0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0, 0 0, 0 1), (12 12, 11 12, 11 11, 12 11, 12 12))'), $writer->write($gu)); //Updated Polygon twice between 3.9 and 3.11

$g = $reader->read('MULTILINESTRING(
(0 0, 1 0, 1 1, 0 1, 0 0),
@@ -655,7 +655,7 @@ class GeometryTest extends GEOSTest
)');

$gu = $g->union();
$this->assertEquals(GEOS_CORRECT_VALUE ? 'MULTILINESTRING ((0 0, 1 0), (1 0, 1 1, 0 1), (0 1, 0 0), (10 10, 10 11), (10 11, 10 14, 14 14, 14 10, 11 10), (11 10, 10 10), (11 11, 11 12, 12 12, 12 11, 11 11), (1 0, 11 0, 11 10), (11 10, 11 11), (11 11, 10 11), (10 11, 0 11, 0 1))' : 'MULTILINESTRING ((0 0, 1 0), (1 0, 1 1, 0 1), (0 1, 0 0), (1 0, 11 0, 11 10), (11 10, 11 11), (11 11, 10 11), (10 11, 0 11, 0 1), (11 11, 11 12, 12 12, 12 11, 11 11), (10 10, 10 11), (10 11, 10 14, 14 14, 14 10, 11 10), (11 10, 10 10))', $writer->write($gu)); //Updated value between 3.9 and 3.11
$this->assertEqualsAny(array('MULTILINESTRING ((0 0, 1 0), (1 0, 1 1, 0 1), (0 1, 0 0), (10 10, 10 11), (10 11, 10 14, 14 14, 14 10, 11 10), (11 10, 10 10), (11 11, 11 12, 12 12, 12 11, 11 11), (1 0, 11 0, 11 10), (11 10, 11 11), (11 11, 10 11), (10 11, 0 11, 0 1))', 'MULTILINESTRING ((0 0, 1 0), (1 0, 1 1, 0 1), (0 1, 0 0), (1 0, 11 0, 11 10), (11 10, 11 11), (11 11, 10 11), (10 11, 0 11, 0 1), (11 11, 11 12, 12 12, 12 11, 11 11), (10 10, 10 11), (10 11, 10 14, 14 14, 14 10, 11 10), (11 10, 10 10))', 'MULTILINESTRING ((0 1, 0 0), (0 0, 1 0), (10 11, 0 11, 0 1), (1 0, 1 1, 0 1), (1 0, 11 0, 11 10), (10 10, 10 11), (11 10, 10 10), (10 11, 10 14, 14 14, 14 10, 11 10), (11 11, 10 11), (11 10, 11 11), (11 11, 11 12, 12 12, 12 11, 11 11))'), $writer->write($gu)); //Updated value twice between 3.9 and 3.11

$g = $reader->read('MULTIPOINT(
0 0, 1 0, 1 1, 0 1, 0 0,
@@ -688,7 +688,8 @@ class GeometryTest extends GEOSTest
))');

$gu = $g->union();
$this->assertEquals(GEOS_CORRECT_VALUE ? 'GEOMETRYCOLLECTION (POINT (-10 -10), POLYGON ((0 0, 0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0, 0 0), (11 11, 12 11, 12 12, 11 12, 11 11)), LINESTRING (-8 8, -8 6))' : 'GEOMETRYCOLLECTION (POINT (-10 -10), LINESTRING (-8 8, -8 6), POLYGON ((1 0, 0 0, 0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0), (11 12, 11 11, 12 11, 12 12, 11 12)))', $writer->write($gu)); //Updated value between 3.9 and 3.11

$this->assertEqualsAny(array('GEOMETRYCOLLECTION (POINT (-10 -10), POLYGON ((0 0, 0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0, 0 0), (11 11, 12 11, 12 12, 11 12, 11 11)), LINESTRING (-8 8, -8 6))', 'GEOMETRYCOLLECTION (POINT (-10 -10), LINESTRING (-8 8, -8 6), POLYGON ((1 0, 0 0, 0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0), (11 12, 11 11, 12 11, 12 12, 11 12)))', 'GEOMETRYCOLLECTION (POINT (-10 -10), POLYGON ((0 1, 0 11, 10 11, 10 14, 14 14, 14 10, 11 10, 11 0, 1 0, 0 0, 0 1), (11 11, 12 11, 12 12, 11 12, 11 11)), LINESTRING (-8 8, -8 6))'), $writer->write($gu)); //Updated value twice between 3.9 and 3.11
}

public function testGeometry_pointOnSurface()
11 changes: 11 additions & 0 deletions tests/TestHelper.php
View file
Original file line number Diff line number Diff line change
@@ -97,6 +97,17 @@ public function assertEquals($expected, $actual)
}
}

public function assertEqualsAny($expectedValues, $actual)
{
foreach ($expectedValues as $expected) {
if ($actual == $expected) {
// If a match is found, return early without throwing an exception
return;
}
}
throw new Exception("Expected '{$expected}' to contain '{$actual}'.");
}

public function assertNull($actual)
{
if (!is_null($actual)) {
2 changes: 1 addition & 1 deletion tests/geos_version_test.php
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
define('GEOS_CHANGE_VALUE', version_compare(GEOS_VERSION, '3.12', '>='));
define('GEOS_CORRECT_NEGATIVE_ZERO', version_compare(GEOS_VERSION, '3.12', '>=')); // Update since 3.12.1 see: https://github.com/libgeos/geos/blob/ddba88a37bd8edb0acc08c9753a1a0e28de3baee/tests/unit/capi/GEOSEqualsIdenticalTest.cpp#L203
define('GEOS_CORRECT_VALUE', version_compare(GEOS_VERSION, '3.11', '>='));
define('GEOS_DEFAULT_EMPTY', version_compare(GEOS_VERSION, '3.11', '>=')); // The bad mix appears to be with GEOS 3.10 and POLYGON EMPTY GH-501
define('GEOS_DEFAULT_EMPTY', version_compare(GEOS_VERSION, '3.9', '>=')); // The bad mix appears to be with GEOS 3.10 and POLYGON EMPTY GH-501
//turn trim on(true), see : https://github.com/libgeos/geos/pull/915

function getGeosVersion()