[geos-commits] [SCM] GEOS branch main updated. adc3348733c101416799608135da328151f7efbb

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, main has been updated
       via  adc3348733c101416799608135da328151f7efbb (commit)
      from  c64729cd8105a4e0973fdd024cab2b8f32ee2fee (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit adc3348733c101416799608135da328151f7efbb
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Tue Aug 20 10:56:49 2024 -0700

    Remove dupe tests from RelateNGTest that are now in RelateNGBoundarNodeRuleTest

diff --git a/tests/unit/operation/relateng/RelateNGTest.cpp b/tests/unit/operation/relateng/RelateNGTest.cpp
index 98ed898bd..7e54c71c9 100644
--- a/tests/unit/operation/relateng/RelateNGTest.cpp
+++ b/tests/unit/operation/relateng/RelateNGTest.cpp
@@ -875,16 +875,5 @@ void object::test<62> ()
     checkRelate(a, b, "212101212");
 }
 
-// Boundary node
-// template<>
-// template<>
-// void object::test<63> ()
-// {
-//     std::string a = "POLYGON((0 0,140 0,140 140,0 140,0 0))";
-//     std::string b = "POLYGON((140 0,0 0,0 140,140 140,140 0))";
-//     checkRelateRule(a, b, "2FFF0FFF2", geos::algorithm::BoundaryNodeRule::getBoundaryMultivalentEndPoint());
-// }
-
-
 
 } // namespace tut
diff --git a/tests/unit/operation/relateng/RelateNGTest.h b/tests/unit/operation/relateng/RelateNGTest.h
index 8231f886b..a1f4f7d07 100644
--- a/tests/unit/operation/relateng/RelateNGTest.h
+++ b/tests/unit/operation/relateng/RelateNGTest.h
@@ -95,13 +95,13 @@ struct test_relateng_support {
         checkPredicate(*RelatePredicate::equalsTopo(), wktb, wkta, expectedValue);
     }
 
-    void checkRelateRule(const std::string& wkta, const std::string& wktb, const std::string expectedValue, const BoundaryNodeRule& bnRule)
+    void checkRelate(const std::string& wkta, const std::string& wktb, const std::string expectedValue)
     {
         std::unique_ptr<Geometry> a = r.read(wkta);
         std::unique_ptr<Geometry> b = r.read(wktb);
         RelateMatrixPredicate pred;
         // TopologyPredicate predTrace = trace(pred);
-        RelateNG::relate(a.get(), b.get(), pred, bnRule);
+        RelateNG::relate(a.get(), b.get(), pred);
         std::string actualVal = pred.getIM()->toString();
         if (actualVal != expectedValue) {
             std::cerr << std::endl << w.write(*a) << " relate " << w.write(*b) << " = " << actualVal << std::endl;
@@ -110,11 +110,6 @@ struct test_relateng_support {
         checkPrepared(a.get(), b.get());
     }
 
-    void checkRelate(const std::string& wkta, const std::string& wktb, const std::string expectedValue)
-    {
-        checkRelateRule(wkta, wktb, expectedValue, BoundaryNodeRule::getBoundaryRuleMod2());
-    }
-
     void checkRelateMatches(const std::string& wkta, const std::string& wktb, const std::string pattern, bool expectedValue)
     {
         auto pred = RelatePredicate::matches(pattern);

-----------------------------------------------------------------------

Summary of changes:
 tests/unit/operation/relateng/RelateNGTest.cpp | 11 -----------
 tests/unit/operation/relateng/RelateNGTest.h   |  9 ++-------
 2 files changed, 2 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
GEOS