Skip to content

Commit 3382b7c

Browse files
martin-georgievmartin-georgiev
committed
no message
1 parent 819f87a commit 3382b7c

File tree

6 files changed

+41
-46
lines changed

6 files changed

+41
-46
lines changed

‎tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsLeftTest.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,46 +17,46 @@ protected function getStringFunctions(): array
1717
}
1818

1919
#[Test]
20-
public function overlaps_left_with_test_data(): void
20+
public function returns_true_when_first_point_is_positioned_left_of_second(): void
2121
{
2222
$dql = 'SELECT OVERLAPS_LEFT(g.geometry1, g.geometry2) as result
2323
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
2424
WHERE g.id = 1';
2525

2626
$result = $this->executeDqlQuery($dql);
27-
$this->assertTrue($result[0]['result'], 'POINT(0 0) should overlap or be to the left of POINT(1 1)');
27+
$this->assertTrue($result[0]['result']);
2828
}
2929

3030
#[Test]
31-
public function overlaps_left_with_reversed_geometries(): void
31+
public function returns_false_when_geometry_positions_are_reversed(): void
3232
{
3333
$dql = 'SELECT OVERLAPS_LEFT(g.geometry2, g.geometry1) as result
3434
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
3535
WHERE g.id = 1';
3636

3737
$result = $this->executeDqlQuery($dql);
38-
$this->assertFalse($result[0]['result'], 'POINT(1 1) should NOT be to the left of POINT(0 0)');
38+
$this->assertFalse($result[0]['result']);
3939
}
4040

4141
#[Test]
42-
public function overlaps_left_with_overlapping_polygons(): void
42+
public function returns_true_when_first_polygon_overlaps_or_is_left_of_second(): void
4343
{
4444
$dql = 'SELECT OVERLAPS_LEFT(g.geometry1, g.geometry2) as result
4545
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
4646
WHERE g.id = 2';
4747

4848
$result = $this->executeDqlQuery($dql);
49-
$this->assertTrue($result[0]['result'], 'First polygon should overlap or be to the left of second polygon');
49+
$this->assertTrue($result[0]['result']);
5050
}
5151

5252
#[Test]
53-
public function overlaps_left_with_identical_geometries(): void
53+
public function returns_true_when_comparing_identical_geometries(): void
5454
{
5555
$dql = 'SELECT OVERLAPS_LEFT(g.geometry1, g.geometry1) as result
5656
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
5757
WHERE g.id = 1';
5858

5959
$result = $this->executeDqlQuery($dql);
60-
$this->assertTrue($result[0]['result'], 'Identical geometries should overlap');
60+
$this->assertTrue($result[0]['result']);
6161
}
6262
}

‎tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsRightTest.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,46 +17,46 @@ protected function getStringFunctions(): array
1717
}
1818

1919
#[Test]
20-
public function overlaps_right_returns_false_when_left_geometry_is_to_the_left(): void
20+
public function returns_false_when_left_geometry_is_to_the_left(): void
2121
{
2222
$dql = 'SELECT OVERLAPS_RIGHT(g.geometry1, g.geometry2) as result
2323
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
2424
WHERE g.id = 1';
2525

2626
$result = $this->executeDqlQuery($dql);
27-
$this->assertFalse($result[0]['result'], 'POINT(0 0) should NOT overlap or be to the right of POINT(1 1)');
27+
$this->assertFalse($result[0]['result']);
2828
}
2929

3030
#[Test]
31-
public function overlaps_right_returns_true_when_geometries_are_reversed(): void
31+
public function returns_true_when_second_point_is_positioned_right_of_first(): void
3232
{
3333
$dql = 'SELECT OVERLAPS_RIGHT(g.geometry2, g.geometry1) as result
3434
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
3535
WHERE g.id = 1';
3636

3737
$result = $this->executeDqlQuery($dql);
38-
$this->assertTrue($result[0]['result'], 'POINT(1 1) should overlap or be to the right of POINT(0 0)');
38+
$this->assertTrue($result[0]['result']);
3939
}
4040

4141
#[Test]
42-
public function overlaps_right_with_overlapping_polygons(): void
42+
public function returns_false_when_polygons_overlap_without_right_positioning(): void
4343
{
4444
$dql = 'SELECT OVERLAPS_RIGHT(g.geometry1, g.geometry2) as result
4545
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
4646
WHERE g.id = 2';
4747

4848
$result = $this->executeDqlQuery($dql);
49-
$this->assertFalse($result[0]['result'], 'Overlapping polygons may not be considered overlapping right depending on their positioning');
49+
$this->assertFalse($result[0]['result']);
5050
}
5151

5252
#[Test]
53-
public function overlaps_right_with_identical_geometries(): void
53+
public function returns_true_when_comparing_identical_geometries(): void
5454
{
5555
$dql = 'SELECT OVERLAPS_RIGHT(g.geometry1, g.geometry1) as result
5656
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
5757
WHERE g.id = 1';
5858

5959
$result = $this->executeDqlQuery($dql);
60-
$this->assertTrue($result[0]['result'], 'Identical geometries should overlap');
60+
$this->assertTrue($result[0]['result']);
6161
}
6262
}

‎tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialContainedByTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ protected function getStringFunctions(): array
1717
}
1818

1919
#[Test]
20-
public function returns_false_with_overlapping_polygons(): void
20+
public function returns_false_when_first_polygon_is_not_contained_by_overlapping_second(): void
2121
{
2222
$dql = 'SELECT SPATIAL_CONTAINED_BY(g.geometry1, g.geometry2) as result
2323
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
@@ -28,7 +28,7 @@ public function returns_false_with_overlapping_polygons(): void
2828
}
2929

3030
#[Test]
31-
public function returns_false_with_separate_points(): void
31+
public function returns_false_when_comparing_separate_point_geometries(): void
3232
{
3333
$dql = 'SELECT SPATIAL_CONTAINED_BY(g.geometry1, g.geometry2) as result
3434
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
@@ -41,8 +41,8 @@ public function returns_false_with_separate_points(): void
4141
#[Test]
4242
public function returns_true_when_comparing_identical_geometries(): void
4343
{
44-
$dql = 'SELECT SPATIAL_CONTAINED_BY(g.geometry1, g.geometry1) as result
45-
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
44+
$dql = 'SELECT SPATIAL_CONTAINED_BY(g.geometry1, g.geometry1) as result
45+
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
4646
WHERE g.id = 1';
4747

4848
$result = $this->executeDqlQuery($dql);

‎tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyLeftTest.php‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ protected function getStringFunctions(): array
1717
}
1818

1919
#[Test]
20-
public function strictly_left_returns_true_when_left_geometry_is_strictly_to_the_left(): void
20+
public function returns_true_when_left_geometry_is_strictly_to_the_left(): void
2121
{
22-
// POINT(0 0) is strictly to the left of POINT(1 1)
2322
$dql = 'SELECT STRICTLY_LEFT(g.geometry1, g.geometry2) as result
2423
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
2524
WHERE g.id = 1';
@@ -29,9 +28,8 @@ public function strictly_left_returns_true_when_left_geometry_is_strictly_to_the
2928
}
3029

3130
#[Test]
32-
public function strictly_left_returns_false_when_geometries_overlap(): void
31+
public function returns_false_when_geometries_overlap(): void
3332
{
34-
// Overlapping polygons should return FALSE for strictly left
3533
$dql = 'SELECT STRICTLY_LEFT(g.geometry1, g.geometry2) as result
3634
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
3735
WHERE g.id = 2';
@@ -41,9 +39,8 @@ public function strictly_left_returns_false_when_geometries_overlap(): void
4139
}
4240

4341
#[Test]
44-
public function strictly_left_returns_false_when_left_geometry_is_to_the_right(): void
42+
public function returns_false_when_left_geometry_is_to_the_right(): void
4543
{
46-
// POINT(1 1) is NOT strictly to the left of POINT(0 0)
4744
$dql = 'SELECT STRICTLY_LEFT(g.geometry2, g.geometry1) as result
4845
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
4946
WHERE g.id = 1';
@@ -53,9 +50,8 @@ public function strictly_left_returns_false_when_left_geometry_is_to_the_right()
5350
}
5451

5552
#[Test]
56-
public function strictly_left_returns_false_with_identical_geometries(): void
53+
public function returns_false_with_identical_geometries(): void
5754
{
58-
// Identical geometries are not strictly left of each other
5955
$dql = 'SELECT STRICTLY_LEFT(g.geometry1, g.geometry1) as result
6056
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
6157
WHERE g.id = 1';

‎tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyRightTest.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,35 @@ protected function getStringFunctions(): array
1717
}
1818

1919
#[Test]
20-
public function strictly_right_with_geometries(): void
20+
public function returns_false_when_first_point_is_not_strictly_to_the_right(): void
2121
{
2222
$dql = 'SELECT STRICTLY_RIGHT(g.geometry1, g.geometry2) as result
2323
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
2424
WHERE g.id = 1';
2525

2626
$result = $this->executeDqlQuery($dql);
27-
$this->assertFalse($result[0]['result'], 'POINT(1 1) may not be strictly to the right of POINT(0 0) depending on PostGIS strictness');
27+
$this->assertFalse($result[0]['result']);
2828
}
2929

3030
#[Test]
31-
public function strictly_right_with_literal_geometry(): void
31+
public function returns_true_when_geometry_is_positioned_right_of_literal_point(): void
3232
{
33-
$dql = "SELECT STRICTLY_RIGHT(g.geometry1, 'POINT(-5 -5)') as result
34-
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
33+
$dql = "SELECT STRICTLY_RIGHT(g.geometry1, 'POINT(-5 -5)') as result
34+
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
3535
WHERE g.id = 1";
3636

3737
$result = $this->executeDqlQuery($dql);
38-
$this->assertTrue($result[0]['result'], 'POINT(0 0) should be strictly to the right of POINT(-5 -5)');
38+
$this->assertTrue($result[0]['result']);
3939
}
4040

4141
#[Test]
42-
public function strictly_right_with_linestrings(): void
42+
public function returns_true_when_higher_linestring_is_strictly_to_the_right_of_lower_onetrajetoryds(): void
4343
{
4444
$dql = 'SELECT STRICTLY_RIGHT(g.geometry2, g.geometry1) as result
4545
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
4646
WHERE g.id = 3';
4747

4848
$result = $this->executeDqlQuery($dql);
49-
$this->assertTrue($result[0]['result'], 'Higher linestring should be strictly to the right of lower linestring');
49+
$this->assertTrue($result[0]['result']);
5050
}
5151
}

‎tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/TrajectoryDistanceTest.php‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@ protected function getStringFunctions(): array
1717
}
1818

1919
#[Test]
20-
public function trajectory_distance_with_measured_geometries(): void
20+
public function can_calculate_distance_between_measured_linestring_trajectories(): void
2121
{
22-
// Test with linestrings that have measure values (trajectories)
23-
$dql = "SELECT TRAJECTORY_DISTANCE('LINESTRING M(0 0 1, 1 1 2)', 'LINESTRING M(2 2 1, 3 3 2)') as distance
24-
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
22+
$dql = "SELECT TRAJECTORY_DISTANCE('LINESTRING M(0 0 1, 1 1 2)', 'LINESTRING M(2 2 1, 3 3 2)') as distance
23+
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
2524
WHERE g.id = 1";
2625

2726
$result = $this->executeDqlQuery($dql);
@@ -30,21 +29,21 @@ public function trajectory_distance_with_measured_geometries(): void
3029
}
3130

3231
#[Test]
33-
public function trajectory_distance_with_identical_trajectories(): void
32+
public function returns_zero_when_comparing_identical_trajectories(): void
3433
{
35-
$dql = "SELECT TRAJECTORY_DISTANCE('LINESTRING M(0 0 1, 1 1 2)', 'LINESTRING M(0 0 1, 1 1 2)') as distance
36-
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
34+
$dql = "SELECT TRAJECTORY_DISTANCE('LINESTRING M(0 0 1, 1 1 2)', 'LINESTRING M(0 0 1, 1 1 2)') as distance
35+
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
3736
WHERE g.id = 1";
3837

3938
$result = $this->executeDqlQuery($dql);
4039
$this->assertEquals(0, $result[0]['distance']);
4140
}
4241

4342
#[Test]
44-
public function trajectory_distance_with_complex_trajectories(): void
43+
public function can_calculate_distance_between_complex_measured_trajectories(): void
4544
{
46-
$dql = "SELECT TRAJECTORY_DISTANCE('LINESTRING M(0 0 0, 5 5 10)', 'LINESTRING M(1 1 0, 6 6 10)') as distance
47-
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
45+
$dql = "SELECT TRAJECTORY_DISTANCE('LINESTRING M(0 0 0, 5 5 10)', 'LINESTRING M(1 1 0, 6 6 10)') as distance
46+
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries g
4847
WHERE g.id = 1";
4948

5049
$result = $this->executeDqlQuery($dql);

0 commit comments

Comments
 (0)