[mapguide-commits] r8849 - in sandbox/jng/aspnet50/UnitTest/WebTier/Dnx/src: TestCommon/ExternalTests TestMapGuideApi/ExternalTests

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Thu Dec 3 07:46:00 PST 2015


Author: jng
Date: 2015-12-03 07:46:00 -0800 (Thu, 03 Dec 2015)
New Revision: 8849

Modified:
   sandbox/jng/aspnet50/UnitTest/WebTier/Dnx/src/TestCommon/ExternalTests/ConvenienceTests.cs
   sandbox/jng/aspnet50/UnitTest/WebTier/Dnx/src/TestMapGuideApi/ExternalTests/MapTests.cs
   sandbox/jng/aspnet50/UnitTest/WebTier/Dnx/src/TestMapGuideApi/ExternalTests/ResourceServiceTests.cs
Log:
Gave up trying to grok if resource files work in the .net core world. So hardcode the XML resources into string constants. This reduces the test failure count to 89/696

Modified: sandbox/jng/aspnet50/UnitTest/WebTier/Dnx/src/TestCommon/ExternalTests/ConvenienceTests.cs
===================================================================
--- sandbox/jng/aspnet50/UnitTest/WebTier/Dnx/src/TestCommon/ExternalTests/ConvenienceTests.cs	2015-12-03 15:13:52 UTC (rev 8848)
+++ sandbox/jng/aspnet50/UnitTest/WebTier/Dnx/src/TestCommon/ExternalTests/ConvenienceTests.cs	2015-12-03 15:46:00 UTC (rev 8849)
@@ -489,7 +489,7 @@
                 MgMapBase map = factory.CreateMap(csFactory.ConvertCoordinateSystemCodeToWkt("LL84"), new MgEnvelope(-180, -90, 180, 90), "TestMap");
                 MgLayerCollection layers = map.GetLayers();
 
-                string layerXml = string.Format(Resources.TestLayer, fsId.ToString(), className, "Geometry");
+                string layerXml = string.Format(PlatformResources.TestLayer, fsId.ToString(), className, "Geometry");
                 byte[] bytes = Encoding.UTF8.GetBytes(layerXml);
                 MgByteSource bs = new MgByteSource(bytes, bytes.Length);
                 MgByteReader br = bs.GetReader();
@@ -552,7 +552,7 @@
                 MgMapBase map = factory.CreateMap(csFactory.ConvertCoordinateSystemCodeToWkt("LL84"), new MgEnvelope(-180, -90, 180, 90), "TestMap");
                 MgLayerCollection layers = map.GetLayers();
 
-                string layerXml = string.Format(Resources.TestLayer, fsId.ToString(), className, "Geometry");
+                string layerXml = string.Format(PlatformResources.TestLayer, fsId.ToString(), className, "Geometry");
                 byte[] bytes = Encoding.UTF8.GetBytes(layerXml);
                 MgByteSource bs = new MgByteSource(bytes, bytes.Length);
                 MgByteReader br = bs.GetReader();
@@ -617,7 +617,7 @@
                 MgMapBase map = factory.CreateMap(csFactory.ConvertCoordinateSystemCodeToWkt("LL84"), new MgEnvelope(-180, -90, 180, 90), "TestMap");
                 MgLayerCollection layers = map.GetLayers();
 
-                string layerXml = string.Format(Resources.TestLayer, fsId.ToString(), className, "Geometry");
+                string layerXml = string.Format(PlatformResources.TestLayer, fsId.ToString(), className, "Geometry");
                 byte[] bytes = Encoding.UTF8.GetBytes(layerXml);
                 MgByteSource bs = new MgByteSource(bytes, bytes.Length);
                 MgByteReader br = bs.GetReader();
@@ -685,7 +685,7 @@
                 MgMapBase map = factory.CreateMap(csFactory.ConvertCoordinateSystemCodeToWkt("LL84"), new MgEnvelope(-180, -90, 180, 90), "TestMap");
                 MgLayerCollection layers = map.GetLayers();
 
-                string layerXml = string.Format(Resources.TestLayer, fsId.ToString(), className, "Geometry");
+                string layerXml = string.Format(PlatformResources.TestLayer, fsId.ToString(), className, "Geometry");
                 byte[] bytes = Encoding.UTF8.GetBytes(layerXml);
                 MgByteSource bs = new MgByteSource(bytes, bytes.Length);
                 MgByteReader br = bs.GetReader();
@@ -755,7 +755,7 @@
                 MgMapBase map = factory.CreateMap(csFactory.ConvertCoordinateSystemCodeToWkt("LL84"), new MgEnvelope(-180, -90, 180, 90), "TestMap");
                 MgLayerCollection layers = map.GetLayers();
 
-                string layerXml = string.Format(Resources.TestLayer, fsId.ToString(), className, "Geometry");
+                string layerXml = string.Format(PlatformResources.TestLayer, fsId.ToString(), className, "Geometry");
                 byte[] bytes = Encoding.UTF8.GetBytes(layerXml);
                 MgByteSource bs = new MgByteSource(bytes, bytes.Length);
                 MgByteReader br = bs.GetReader();
@@ -820,7 +820,7 @@
                 MgMapBase map = factory.CreateMap(csFactory.ConvertCoordinateSystemCodeToWkt("LL84"), new MgEnvelope(-180, -90, 180, 90), "TestMap");
                 MgLayerCollection layers = map.GetLayers();
 
-                string layerXml = string.Format(Resources.TestLayer, fsId.ToString(), className, "Geometry");
+                string layerXml = string.Format(PlatformResources.TestLayer, fsId.ToString(), className, "Geometry");
                 byte[] bytes = Encoding.UTF8.GetBytes(layerXml);
                 MgByteSource bs = new MgByteSource(bytes, bytes.Length);
                 MgByteReader br = bs.GetReader();
@@ -898,7 +898,7 @@
                 MgMapBase map = factory.CreateMap(csFactory.ConvertCoordinateSystemCodeToWkt("LL84"), new MgEnvelope(-180, -90, 180, 90), "TestMap");
                 MgLayerCollection layers = map.GetLayers();
 
-                string layerXml = string.Format(Resources.TestLayer, fsId.ToString(), className, "Geometry");
+                string layerXml = string.Format(PlatformResources.TestLayer, fsId.ToString(), className, "Geometry");
                 byte[] bytes = Encoding.UTF8.GetBytes(layerXml);
                 MgByteSource bs = new MgByteSource(bytes, bytes.Length);
                 MgByteReader br = bs.GetReader();
@@ -979,7 +979,7 @@
                 MgMapBase map = factory.CreateMap(csFactory.ConvertCoordinateSystemCodeToWkt("LL84"), new MgEnvelope(-180, -90, 180, 90), "TestMap");
                 MgLayerCollection layers = map.GetLayers();
 
-                string layerXml = string.Format(Resources.TestLayer, fsId.ToString(), className, "Geometry");
+                string layerXml = string.Format(PlatformResources.TestLayer, fsId.ToString(), className, "Geometry");
                 byte[] bytes = Encoding.UTF8.GetBytes(layerXml);
                 MgByteSource bs = new MgByteSource(bytes, bytes.Length);
                 MgByteReader br = bs.GetReader();
@@ -1201,7 +1201,7 @@
                 MgMapBase map = factory.CreateMap(srcWkt, new MgEnvelope(-180, -90, 180, 90), "TestMap");
                 MgLayerCollection layers = map.GetLayers();
 
-                string layerXml = string.Format(Resources.TestLayer, fsId.ToString(), "Default:Test", "Geometry");
+                string layerXml = string.Format(PlatformResources.TestLayer, fsId.ToString(), "Default:Test", "Geometry");
                 byte[] bytes = Encoding.UTF8.GetBytes(layerXml);
                 MgByteSource bs = new MgByteSource(bytes, bytes.Length);
                 MgByteReader br = bs.GetReader();
@@ -1287,7 +1287,7 @@
                 MgMapBase map = factory.CreateMap(csFactory.ConvertCoordinateSystemCodeToWkt("LL84"), new MgEnvelope(-180, -90, 180, 90), "TestMap");
                 MgLayerCollection layers = map.GetLayers();
 
-                string layerXml = string.Format(Resources.TestLayer, fsId.ToString(), className, "Geometry");
+                string layerXml = string.Format(PlatformResources.TestLayer, fsId.ToString(), className, "Geometry");
                 byte[] bytes = Encoding.UTF8.GetBytes(layerXml);
                 MgByteSource bs = new MgByteSource(bytes, bytes.Length);
                 MgByteReader br = bs.GetReader();

Modified: sandbox/jng/aspnet50/UnitTest/WebTier/Dnx/src/TestMapGuideApi/ExternalTests/MapTests.cs
===================================================================
--- sandbox/jng/aspnet50/UnitTest/WebTier/Dnx/src/TestMapGuideApi/ExternalTests/MapTests.cs	2015-12-03 15:13:52 UTC (rev 8848)
+++ sandbox/jng/aspnet50/UnitTest/WebTier/Dnx/src/TestMapGuideApi/ExternalTests/MapTests.cs	2015-12-03 15:46:00 UTC (rev 8849)
@@ -49,7 +49,7 @@
                 LoadResourceData(resSvc, "Library://UnitTests/Data/Parcels.FeatureSource", "UT_Parcels.sdf", MgResourceDataType.File, root + "UT_Parcels.sdf");
                 LoadResource(resSvc, "Library://UnitTests/Layers/Parcels.LayerDefinition", root + "UT_Parcels.ldf");
 
-                string str = Resources.UT_XYZ;
+                string str = MapGuideResources.UT_XYZ;
                 byte[] tsd = Encoding.UTF8.GetBytes(str);
                 MgByteSource sourceTSD = new MgByteSource(tsd, tsd.Length);
                 MgByteReader contentTSD = sourceTSD.GetReader();
@@ -57,7 +57,7 @@
 
                 resSvc.SetResource(resTSD, contentTSD, null);
 
-                string mdf = Resources.UT_BaseMap;
+                string mdf = MapGuideResources.UT_BaseMap;
                 mdf = string.Format(mdf, resTSD.ToString());
                 byte[] mdfBytes = Encoding.UTF8.GetBytes(mdf);
                 MgByteSource sourceMDF = new MgByteSource(mdfBytes, mdfBytes.Length);
@@ -105,7 +105,7 @@
             LoadResourceData(resSvc, "Library://UnitTests/Data/Parcels.FeatureSource", "UT_Parcels.sdf", MgResourceDataType.File, root + "UT_Parcels.sdf");
             LoadResource(resSvc, "Library://UnitTests/Layers/Parcels.LayerDefinition", root + "UT_Parcels.ldf");
 
-            string tsd = Resources.UT_BaseMapTileSet;
+            string tsd = MapGuideResources.UT_BaseMap_TSD;
             tsd = string.Format(tsd, csWkt, -87.5, 43.5, -86.5, 44.5);
             byte[] tsdBytes = Encoding.UTF8.GetBytes(tsd);
             MgByteSource sourceTSD = new MgByteSource(tsdBytes, tsdBytes.Length);
@@ -114,7 +114,7 @@
 
             resSvc.SetResource(resTSD, contentTSD, null);
 
-            string mdf = Resources.UT_LinkedTileSet;
+            string mdf = MapGuideResources.UT_LinkedTileSet;
             mdf = string.Format(mdf, csWkt, -87.0, 43.0, -86.0, 44.0, resTSD.ToString());
             byte[] mdfBytes = Encoding.UTF8.GetBytes(mdf);
             MgByteSource sourceMDF = new MgByteSource(mdfBytes, mdfBytes.Length);

Modified: sandbox/jng/aspnet50/UnitTest/WebTier/Dnx/src/TestMapGuideApi/ExternalTests/ResourceServiceTests.cs
===================================================================
--- sandbox/jng/aspnet50/UnitTest/WebTier/Dnx/src/TestMapGuideApi/ExternalTests/ResourceServiceTests.cs	2015-12-03 15:13:52 UTC (rev 8848)
+++ sandbox/jng/aspnet50/UnitTest/WebTier/Dnx/src/TestMapGuideApi/ExternalTests/ResourceServiceTests.cs	2015-12-03 15:46:00 UTC (rev 8849)
@@ -26,7 +26,7 @@
                 File.WriteAllText("metadata.txt", metadata);
 
                 string className = FeatureServiceTestUtil.CreateTestDataStore(fsId, "OSGeo.SDF", featSvc);
-                string headerXml = string.Format(Resources.ResourceHeaderTemplate, "Foo", "Bar");
+                string headerXml = string.Format(MapGuideResources.ResourceHeaderTemplate, "Foo", "Bar");
                 var bytes = Encoding.UTF8.GetBytes(headerXml);
                 var source = new MgByteSource(bytes, bytes.Length);
                 var rdr = source.GetReader();



More information about the mapguide-commits mailing list