import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / libs / geometry / test / algorithms / set_operations / intersection / intersection_multi.cpp

diff --git a/ceph/src/boost/libs/geometry/test/algorithms/set_operations/intersection/intersection_multi.cpp b/ceph/src/boost/libs/geometry/test/algorithms/set_operations/intersection/intersection_multi.cpp
index 7bc1d4615e378c8869689348495354015ee4cf5f..5852322737e63504d91b538e60bebab1541b29fc 100644 (file)
--- a/ceph/src/boost/libs/geometry/test/algorithms/set_operations/intersection/intersection_multi.cpp
+++ b/ceph/src/boost/libs/geometry/test/algorithms/set_operations/intersection/intersection_multi.cpp
@@ -37,7 +37,7 @@
     ( #caseid "_rev", caseid[1], caseid[0], clips, points, area)
 
 #define TEST_INTERSECTION_IGNORE(caseid, clips, points, area) \
-    { ut_settings ignore_validity; ignore_validity.test_validity = false; \
+    { ut_settings ignore_validity; ignore_validity.set_test_validity(false); \
     (test_one<Polygon, MultiPolygon, MultiPolygon>) \
     ( #caseid, caseid[0], caseid[1], clips, points, area, ignore_validity); }
 
@@ -350,21 +350,16 @@ void test_areal()
 
     test_one<Polygon, MultiPolygon, MultiPolygon>("ticket_9081",
         ticket_9081[0], ticket_9081[1],
-        2, 10, 0.0019812556);
+        count_set(2, 4), 10, 0.0019812556);
 
     // Should generate output, even for <float>
+    // For long double two small extra slivers are generated
     test_one<Polygon, MultiPolygon, MultiPolygon>("mail_2019_01_21_johan",
         mail_2019_01_21_johan[2], mail_2019_01_21_johan[3],
-        2, -1, 0.0005889587);
+        count_set(2, 4), -1, 0.0005889587);
 
-    // Very small slice is generated.
-    // qcc-arm reports 1.7791215549400884e-14
-    // With rescaling, generates very small triangle
-    test_one<Polygon, MultiPolygon, MultiPolygon>("ticket_11018",
-        ticket_11018[0], ticket_11018[1],
-        BG_IF_RESCALED(1, 0), 0,
-        1.0e-8, ut_settings(-1)
-    );
+    // Might generate a very small triangle, which is acceptable
+    TEST_INTERSECTION(ticket_11018, count_set(0, 1), 0, expectation_limits(0.0, 4.0e-7));
 
     TEST_INTERSECTION(ticket_12503, 2, 13, 17.375);
 
@@ -374,7 +369,7 @@ void test_areal()
 #endif
 #if ! defined(BOOST_GEOMETRY_USE_KRAMER_RULE) || defined(BOOST_GEOMETRY_TEST_FAILURES)
     // Two cases produce either too large, or no output if Kramer rule is used
-    TEST_INTERSECTION(issue_630_b, 1, -1, BG_IF_KRAMER(0.1714, 0.1713911));
+    TEST_INTERSECTION(issue_630_b, 1, -1, expectation_limits(0.1713911, 0.1714));
     TEST_INTERSECTION(issue_630_c, 1, -1, 0.1770);
 #endif
 
@@ -491,8 +486,6 @@ void test_all()
 #endif
 
     test_point_output<P>();
-    // linear
-
 }
 
 
@@ -503,12 +496,10 @@ int test_main(int, char* [])
 
 #if ! defined(BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE)
     test_all<bg::model::d2::point_xy<float> >();
-
-#if defined(HAVE_TTMATH)
-    std::cout << "Testing TTMATH" << std::endl;
-    test_all<bg::model::d2::point_xy<ttmath_big> >();
 #endif
 
+#if defined(BOOST_GEOMETRY_TEST_FAILURES)
+    BoostGeometryWriteExpectedFailures(9, 3, 2, 1);
 #endif
 
     return 0;