[mapguide-commits] r9788 - in sandbox/jng/vanilla_swig/Bindings: . src/Test/DotNet/src/TestRunner

[svn_mapguide at osgeo.org]

Author: jng
Date: 2020-11-17 01:52:25 -0800 (Tue, 17 Nov 2020)
New Revision: 9788

Modified:
   sandbox/jng/vanilla_swig/Bindings/TODO.txt
   sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunner/Program.cs
Log:
Add .net test runner switch to skip main SQLite test suite and only run the auxiliary tests

Modified: sandbox/jng/vanilla_swig/Bindings/TODO.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/TODO.txt	2020-11-14 17:02:14 UTC (rev 9787)
+++ sandbox/jng/vanilla_swig/Bindings/TODO.txt	2020-11-17 09:52:25 UTC (rev 9788)
@@ -2,12 +2,13 @@
  - [x] Explore whether our current instability is due to invalid class layout assumptions due to stubbing ACE_Recursive_Thread_Mutex to avoid leaking ACE headers
  - [x] Generate XML documentation for our .net wrapper binding projects
  - [ ] Make sure we can build debug bindings
- - [ ] Fix up inconsistent stack direction in C# exceptions (C++ call stack are printed downwards, C# call stack is printed upwards)
+ - [x] Fix up inconsistent stack direction in C# exceptions (C++ call stack are printed downwards, C# call stack is printed upwards)
  - [ ] Add memory leak test (ref: http://osgeo-org.1560.x6.nabble.com/Memory-Leak-in-Java-td5425579.html) and see if this still happens
  - [x] Check in test case admin tool
  - [x] Consolidate Tools.sln into Bindings.sln
  - [ ] Relocate/remove existing test code
  - Split .net binding into the Foundation/Geometry/PlatformBase/MapGuideCommon/Web layout (https://github.com/jumpinjackie/mapguide-api-bindings/issues/18)
+   - [ ] Add .targets files to each C# project so that native dlls are copied properly when consumed by legacy .net framework applications/libraries
    - [ ] Add CentOS 6 Dockerfile that
       - Install SWIG and common libs tarball (from docker build system)
       - Install same compilers/tools as the same docker image used to produce the common libs tarball
@@ -15,6 +16,7 @@
       - Copy the compiled libs out of the docker container and into the same native library staging area for Java/.net
    - [x] Refactor current .net test suite to reference these nuget packages
       - [x] Verify test suite still passes (Windows)
+      - [ ] Verify test suite still passes (Windows, legacy .net Framework)
       - [ ] Verify test suite still passes (Linux)
  - Automatic class id generation (https://github.com/jumpinjackie/mapguide-api-bindings/issues/34)
    - [ ] Add SWIG preprocessor that controls whether the class id header should be included

Modified: sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunner/Program.cs
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunner/Program.cs	2020-11-14 17:02:14 UTC (rev 9787)
+++ sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunner/Program.cs	2020-11-17 09:52:25 UTC (rev 9788)
@@ -25,6 +25,9 @@
 
         [Option("admin-pass", Required = false, HelpText = "The MapGuide Administrator password", Default = "admin")]
         public string AdminPass { get; set; }
+
+        [Option("skip-main-suite", Required = false, HelpText = "Indicate if the main suite should be skipped", Default = false)]
+        public bool SkipMainSuite { get; set; }
     }
 
 
@@ -143,15 +146,18 @@
 
                 int testsRun = 0;
                 bool isEnterprise = false;
-                failures += ExecuteTest(ApiTypes.Platform, $"{TestDataRoot.Path}/ResourceService/ResourceServiceTest.dump", ref testsRun, logger, isEnterprise);
-                failures += ExecuteTest(ApiTypes.Platform, $"{TestDataRoot.Path}/DrawingService/DrawingServiceTest.dump", ref testsRun, logger, isEnterprise);
-                failures += ExecuteTest(ApiTypes.Platform, $"{TestDataRoot.Path}/FeatureService/FeatureServiceTest.dump", ref testsRun, logger, isEnterprise);
-                failures += ExecuteTest(ApiTypes.Platform, $"{TestDataRoot.Path}/SiteService/SiteServiceTest.dump", ref testsRun, logger, isEnterprise);
-                failures += ExecuteTest(ApiTypes.Platform, $"{TestDataRoot.Path}/MappingService/MappingServiceTest.dump", ref testsRun, logger, isEnterprise);
-                failures += ExecuteTest(ApiTypes.Platform, $"{TestDataRoot.Path}/ServerAdmin/ServerAdminTest.dump", ref testsRun, logger, isEnterprise);
-                failures += ExecuteTest(ApiTypes.Platform, $"{TestDataRoot.Path}/MapLayer/MapLayerTest.dump", ref testsRun, logger, isEnterprise);
-                failures += ExecuteTest(ApiTypes.Platform, $"{TestDataRoot.Path}/WebLayout/WebLayoutTest.dump", ref testsRun, logger, isEnterprise);
-                failures += ExecuteTest(ApiTypes.Platform, $"{TestDataRoot.Path}/Unicode/UnicodeTest.dump", ref testsRun, logger, isEnterprise);
+                if (!options.SkipMainSuite)
+                {
+                    failures += ExecuteTest(ApiTypes.Platform, $"{TestDataRoot.Path}/ResourceService/ResourceServiceTest.dump", ref testsRun, logger, isEnterprise);
+                    failures += ExecuteTest(ApiTypes.Platform, $"{TestDataRoot.Path}/DrawingService/DrawingServiceTest.dump", ref testsRun, logger, isEnterprise);
+                    failures += ExecuteTest(ApiTypes.Platform, $"{TestDataRoot.Path}/FeatureService/FeatureServiceTest.dump", ref testsRun, logger, isEnterprise);
+                    failures += ExecuteTest(ApiTypes.Platform, $"{TestDataRoot.Path}/SiteService/SiteServiceTest.dump", ref testsRun, logger, isEnterprise);
+                    failures += ExecuteTest(ApiTypes.Platform, $"{TestDataRoot.Path}/MappingService/MappingServiceTest.dump", ref testsRun, logger, isEnterprise);
+                    failures += ExecuteTest(ApiTypes.Platform, $"{TestDataRoot.Path}/ServerAdmin/ServerAdminTest.dump", ref testsRun, logger, isEnterprise);
+                    failures += ExecuteTest(ApiTypes.Platform, $"{TestDataRoot.Path}/MapLayer/MapLayerTest.dump", ref testsRun, logger, isEnterprise);
+                    failures += ExecuteTest(ApiTypes.Platform, $"{TestDataRoot.Path}/WebLayout/WebLayoutTest.dump", ref testsRun, logger, isEnterprise);
+                    failures += ExecuteTest(ApiTypes.Platform, $"{TestDataRoot.Path}/Unicode/UnicodeTest.dump", ref testsRun, logger, isEnterprise);
+                }
                 //Run auxillary tests not part of the SQLite-defined suite
                 failures += CommonTests.Execute(factory, logger, ref testsRun);
                 failures += MapGuideTests.Execute(factory, logger, ref testsRun);