Updated tests

Fixed numerous annoying bugs in PointPlotter
pelicanmapping · Jun 17, 2022 · efc3294 · efc3294
1 parent 8ef8f46
commit efc3294
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 64 deletions.
diff --git a/BinaryUtils/Win64/PointPlotter.exe b/BinaryUtils/Win64/PointPlotter.exe
diff --git a/CPP/CMakeLists.txt b/CPP/CMakeLists.txt
@@ -80,16 +80,13 @@ if(PACKAGE_TESTS)
   package_add_test(test3 Tests/Tests/TestIntersection.cpp )
   package_add_test(test4 Tests/Tests/TestUnion.cpp )
   package_add_test(test5 Tests/Tests/TestOffset.cpp )
-  package_add_test(test6 Tests/Tests/TestFromTextFile2.cpp )
-  package_add_test(test7 Tests/Tests/TestFromTextFile3.cpp )
+  package_add_test(test6 Tests/Tests/TestHoleOwnership.cpp )
 
-  install( FILES  ../Tests/Tests3.txt DESTINATION . )
-  install( FILES  ../Tests/Tests2.txt DESTINATION . )
+  install( FILES  ../Tests/PolytreeHoleOwner.txt DESTINATION . )
   install( FILES  ../Tests/Lines.txt DESTINATION . )
   install( FILES  ../Tests/Polygons.txt DESTINATION . )
 
-  file(COPY ../Tests/Tests3.txt DESTINATION ${CMAKE_BINARY_DIR} FILE_PERMISSIONS OWNER_READ GROUP_READ WORLD_READ )
-  file(COPY ../Tests/Tests2.txt DESTINATION ${CMAKE_BINARY_DIR} FILE_PERMISSIONS OWNER_READ GROUP_READ WORLD_READ )
+  file(COPY ../Tests/PolytreeHoleOwner.txt DESTINATION ${CMAKE_BINARY_DIR} FILE_PERMISSIONS OWNER_READ GROUP_READ WORLD_READ )
   file(COPY ../Tests/Lines.txt DESTINATION ${CMAKE_BINARY_DIR} FILE_PERMISSIONS OWNER_READ GROUP_READ WORLD_READ )
   file(COPY ../Tests/Polygons.txt DESTINATION ${CMAKE_BINARY_DIR} FILE_PERMISSIONS OWNER_READ GROUP_READ WORLD_READ )
 endif()
diff --git a/CPP/Tests/Tests/TestFromTextFile2.cpp b/CPP/Tests/Tests/TestFromTextFile2.cpp
diff --git a/CPP/Tests/Tests/TestFromTextFile3.cpp → CPP/Tests/Tests/TestHoleOwnership.cpp b/CPP/Tests/Tests/TestFromTextFile3.cpp → CPP/Tests/Tests/TestHoleOwnership.cpp
@@ -43,9 +43,9 @@ std::vector<ResultRegion> ExtractResults(
 
 TEST(Clipper2Tests, TestFromTextFile3) {
 #ifdef _WIN32
-    std::ifstream ifs("../../../Tests/Tests3.txt");
+    std::ifstream ifs("../../../Tests/PolytreeHoleOwner.txt");
 #else
-    std::ifstream ifs("Tests3.txt");
+    std::ifstream ifs("PolytreeHoleOwner.txt");
 #endif
     ASSERT_TRUE(ifs);
     ASSERT_TRUE(ifs.good());

diff --git a/Tests/Tests3.txt → Tests/PolytreeHoleOwner.txt b/Tests/Tests3.txt → Tests/PolytreeHoleOwner.txt
@@ -1,6 +1,6 @@
 CAPTION: 1.
 CLIPTYPE: INTERSECTION
-FILLRULE: POSITIVE
+FILLRULE: NEGATIVE
 SOL_AREA: -1
 SOL_COUNT: -1
 SUBJECTS
@@ -10,4 +10,4 @@ SUBJECTS
 66895,121257 66895,121262 66895,121268 66890,121273 66884,121278 66884,121284 66879,121289 66874,121295 66874,121300 66868,121300 66863,121305 66858,121305 66852,121305 66847,121305 66841,121305 66836,121305 66831,121305 66825,121305 66820,121305 66814,121305 66809,121305 66804,121311 66798,121305 66804,121300 66809,121300 66814,121300 66820,121295 66825,121295 66831,121295 66836,121289 66841,121289 66847,121289 66852,121284 66858,121284 66863,121278 66868,121273 66874,121273 66879,121268 66884,121262 66890,121257 
 67073,121063 67078,121063 67084,121068 67089,121068 67094,121074 67100,121079 67100,121085 67105,121090 67105,121095 67105,121101 67105,121106 67105,121112 67100,121117 67100,121122 67094,121122 67089,121128 67084,121128 67078,121128 67073,121128 67068,121128 67062,121128 67057,121128 67051,121122 67046,121122 67041,121117 67035,121117 67030,121112 67030,121106 67030,121101 67030,121095 67035,121090 67041,121085 67046,121079 67051,121074 67057,121068 67062,121068 67068,121063 
 CLIPS
-65382,121020 65382,122455 65393,122444 65408,122444 65422,122444 65436,122444 65451,122444 65465,122458 65479,122458 65494,122458 65508,122472 65522,122472 65537,122487 65551,122501 65566,122515 65580,122515 65594,122530 65609,122544 65623,122559 65637,122573 65652,122587 65666,122602 65680,122602 65695,122616 65709,122630 65724,122645 65738,122645 65752,122659 65767,122673 65781,122688 65795,122702 65795,122716 65810,122731 65810,122745 65824,122760 65838,122774 65838,122788 65853,122803 65853,122817 65867,122831 65881,122846 65896,122860 65910,122874 65925,122874 65939,122889 65953,122889 65968,122889 65982,122903 65996,122903 66011,122903 66025,122903 66039,122903 66054,122903 66068,122903 66083,122903 66097,122903 66111,122903 66126,122903 66140,122903 66154,122903 66169,122903 66183,122903 66197,122903 66212,122903 66226,122918 66240,122918 66255,122918 66269,122932 66284,122932 66298,122932 66312,122946 66327,122946 66341,122961 66355,122961 66370,122975 66384,122989 66398,122989 66413,123004 66427,123018 66442,123032 66456,123047 66470,123061 66485,123075 66499,123090 66513,123104 66528,123119 66542,123133 66556,123147 66571,123162 66585,123176 66599,123190 66599,123205 66614,123219 66628,123233 66643,123233 66657,123248 66671,123262 66686,123276 66700,123291 66714,123305 66729,123320 66743,123334 66757,123334 66772,123348 66786,123363 66800,123363 66815,123377 66829,123391 66844,123391 66858,123406 66872,123420 66887,123420 66901,123434 66915,123434 66930,123449 66944,123463 66958,123463 66973,123478 66987,123478 67002,123492 67016,123506 67030,123506 67045,123521 67059,123521 67073,123535 67088,123535 67102,123549 67116,123549 67131,123564 67145,123564 67159,123578 67174,123578 67188,123592 67203,123592 67217,123607 67231,123607 67246,123621 67260,123635 67274,123650 67289,123650 67303,123664 67317,123679 67332,123693 67332,123707 67346,123722 67346,123736 67361,123750 67361,123765 67375,123779 67375,123793 67389,123808 67404,123822 67418,123837 67432,123837 67447,123851 67461,123851 67475,123865 67490,123865 67504,123865 67518,123880 67533,123880 67547,123880 67562,123880 67576,123894 67590,123894 67605,123894 67619,123908 67633,123923 67648,123923 67662,123937 67676,123951 67691,123966 67705,123980 67705,123994 67720,124009 67734,124023 67748,124038 67763,124052 67763,124066 67777,124081 67791,124095 67791,124109 67806,124124 67806,124138 67806,124152 67820,124167 67820,124181 67820,124196 67820,124210 67834,124224 67834,124239 67834,124253 67834,124267 67834,124282 67849,124296 67849,124310 67863,124325 67877,124339 67892,124339 67906,124339 67921,124353 67935,124353 67949,124353 67964,124353 67978,124353 67992,124353 68007,124368 68021,124368 68035,124368 68050,124368 68064,124368 68078,124368 68093,124382 68107,124382 68122,124382 68136,124397 68150,124397 68165,124397 68179,124411 68193,124411 68208,124425 68222,124425 68236,124440 68251,124440 68265,124440 68280,124454 68294,124454 68308,124454 68323,124454 68337,124468 68351,124468 68366,124468 68380,124468 68394,124468 68409,124483 68423,124483 68437,124497 68452,124497 68466,124511 68481,124526 68495,124540 68495,124554 68509,124569 68509,124583 68524,124598 68524,124612 68538,124626 68538,124641 68552,124655 68552,124669 68567,124684 68567,124698 68581,124712 68595,124727 68610,124741 68624,124756 68639,124770 68653,124784 68667,124799 68682,124813 68696,124827 68710,124842 68725,124856 68739,124870 68753,124885 68753,124899 68768,124913 68782,124928 68796,124942 68811,124957 68825,124971 68840,124985 68854,125000 68868,125000 68883,125014 68897,125028 68911,125028 68926,125043 68940,125043 68954,125057 68969,125057 68983,125071 68998,125071 69012,125086 69026,125086 69041,125100 69055,125100 69069,125100 69084,125115 69098,125115 69112,125115 69127,125129 69141,125129 69155,125129 69170,125129 69184,125129 69199,125143 69213,125143 69227,125143 69242,125143 69256,125143 69270,125158 69285,125158 69299,125158 69313,125158 69328,125158 69342,125158 69356,125158 69371,125158 69385,125158 69400,125158 69414,125158 69428,125158 69443,125158 69457,125158 69471,125158 69486,125158 69500,125158 69514,125143 69529,125143 69543,125143 69558,125143 69572,125143 69586,125143 69601,125158 69615,125158 69629,125158 69644,125158 69658,125158 69672,125158 69687,125172 69701,125172 69715,125172 69730,125172 69744,125186 69759,125186 69773,125186 69787,125186 69802,125186 69816,125186 69830,125186 69845,125186 69859,125186 69873,125186 69888,125186 69902,125186 69917,125186 69931,125186 69945,125186 69960,125172 69974,125172 69988,125172 70003,125172 70017,125158 70031,125158 70046,125158 70060,125158 70074,125158 70089,125158 70103,125158 70118,125158 70132,125158 70146,125158 70161,125158 70175,125158 70189,125158 70204,125158 70206,125158 70206,121020 
+66100,121020 66100,124000 68700,124000 68700,121020
diff --git a/Tests/Tests2.txt b/Tests/Tests2.txt