[mapguide-commits] r6039 - in trunk/Tools/Maestro: MaestroAPITests OSGeo.MapGuide.MaestroAPI/Capability

[svn_mapguide at osgeo.org]

Author: jng
Date: 2011-08-05 04:57:17 -0700 (Fri, 05 Aug 2011)
New Revision: 6039

Modified:
   trunk/Tools/Maestro/MaestroAPITests/CapabilityTests.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Capability/ConnectionCapabilities.cs
Log:
Update capabilities for AIMS 2012


Modified: trunk/Tools/Maestro/MaestroAPITests/CapabilityTests.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/CapabilityTests.cs	2011-08-05 11:48:21 UTC (rev 6038)
+++ trunk/Tools/Maestro/MaestroAPITests/CapabilityTests.cs	2011-08-05 11:57:17 UTC (rev 6039)
@@ -797,5 +797,125 @@
                 Assert.IsTrue(caps.IsSupportedResourceType(rt), rt.ToString());
             }
         }
+
+        [Test]
+        public void TestHttpCapabilities230()
+        {
+            _mocks = new Mockery();
+            var conn = _mocks.NewMock<IServerConnection>();
+            Stub.On(conn).GetProperty("SiteVersion").Will(Return.Value(new Version(2, 3)));
+
+            var caps = new HttpCapabilities(conn);
+
+            foreach (ResourceTypes type in Enum.GetValues(typeof(ResourceTypes)))
+            {
+                switch (type)
+                {
+                    case ResourceTypes.ApplicationDefinition:
+                        {
+                            var version = caps.GetMaxSupportedResourceVersion(type);
+                            Assert.AreEqual(version, new Version(1, 0, 0));
+                        }
+                        break;
+                    case ResourceTypes.DrawingSource:
+                        {
+                            var version = caps.GetMaxSupportedResourceVersion(type);
+                            Assert.AreEqual(version, new Version(1, 0, 0));
+                        }
+                        break;
+                    case ResourceTypes.FeatureSource:
+                        {
+                            var version = caps.GetMaxSupportedResourceVersion(type);
+                            Assert.AreEqual(version, new Version(1, 0, 0));
+                        }
+                        break;
+                    case ResourceTypes.LayerDefinition:
+                        {
+                            var version = caps.GetMaxSupportedResourceVersion(type);
+                            Assert.AreEqual(version, new Version(2, 3, 0));
+                        }
+                        break;
+                    case ResourceTypes.LoadProcedure:
+                        {
+                            var version = caps.GetMaxSupportedResourceVersion(type);
+                            Assert.AreEqual(version, new Version(2, 2, 0));
+                        }
+                        break;
+                    case ResourceTypes.MapDefinition:
+                        {
+                            var version = caps.GetMaxSupportedResourceVersion(type);
+                            Assert.AreEqual(version, new Version(2, 3, 0));
+                        }
+                        break;
+                    case ResourceTypes.PrintLayout:
+                        {
+                            var version = caps.GetMaxSupportedResourceVersion(type);
+                            Assert.AreEqual(version, new Version(1, 0, 0));
+                        }
+                        break;
+                    case ResourceTypes.SymbolLibrary:
+                        {
+                            var version = caps.GetMaxSupportedResourceVersion(type);
+                            Assert.AreEqual(version, new Version(1, 0, 0));
+                        }
+                        break;
+                    case ResourceTypes.SymbolDefinition:
+                        {
+                            var version = caps.GetMaxSupportedResourceVersion(type);
+                            Assert.AreEqual(version, new Version(1, 1, 0));
+                        }
+                        break;
+                    case ResourceTypes.WebLayout:
+                        {
+                            var version = caps.GetMaxSupportedResourceVersion(type);
+                            Assert.AreEqual(version, new Version(1, 1, 0));
+                        }
+                        break;
+                }
+            }
+            Assert.IsTrue(caps.SupportsResourcePreviewUrls);
+            int[] services = caps.SupportedServices;
+            foreach (ServiceType st in Enum.GetValues(typeof(ServiceType)))
+            {
+                switch (st)
+                {
+                    case ServiceType.Drawing:
+                        {
+                            Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
+                        }
+                        break;
+                    case ServiceType.Feature:
+                        {
+                            Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
+                        }
+                        break;
+                    case ServiceType.Fusion:
+                        {
+                            Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
+                        }
+                        break;
+                    case ServiceType.Mapping:
+                        {
+                            Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
+                        }
+                        break;
+                    case ServiceType.Resource:
+                        {
+                            Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
+                        }
+                        break;
+                    case ServiceType.Tile:
+                        {
+                            Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
+                        }
+                        break;
+                }
+            }
+
+            foreach (ResourceTypes rt in Enum.GetValues(typeof(ResourceTypes)))
+            {
+                Assert.IsTrue(caps.IsSupportedResourceType(rt), rt.ToString());
+            }
+        }
     }
 }

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Capability/ConnectionCapabilities.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Capability/ConnectionCapabilities.cs	2011-08-05 11:48:21 UTC (rev 6038)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Capability/ConnectionCapabilities.cs	2011-08-05 11:57:17 UTC (rev 6039)
@@ -58,6 +58,12 @@
                     if (!SupportsFusion())
                         throw new UnsupportedResourceTypeException(ResourceTypes.ApplicationDefinition);
                     break;
+                case ResourceTypes.WatermarkDefinition:
+                    ver = GetMaxWatermarkDefinitionVersion();
+                    break;
+                case ResourceTypes.MapDefinition:
+                    ver = GetMaxMapDefinitionVersion();
+                    break;
                 case ResourceTypes.LayerDefinition:
                     ver = GetMaxLayerDefinitionVersion();
                     break;
@@ -96,6 +102,15 @@
         }
 
         /// <summary>
+        /// Gets the max watermark definition version
+        /// </summary>
+        /// <returns></returns>
+        protected virtual Version GetMaxWatermarkDefinitionVersion()
+        {
+            return new Version(2, 3, 0);
+        }
+
+        /// <summary>
         /// Gets the max load procedure version.
         /// </summary>
         /// <returns></returns>
@@ -134,17 +149,32 @@
         }
 
         /// <summary>
+        /// Gets the max map definition version
+        /// </summary>
+        /// <returns></returns>
+        protected virtual Version GetMaxMapDefinitionVersion()
+        {
+            if (_parent.SiteVersion >= new Version(2, 3))
+                return new Version(2, 3, 0);
+
+            return new Version(1, 0, 0);
+        }
+
+        /// <summary>
         /// Gets the max layer definition version.
         /// </summary>
         /// <returns></returns>
         protected virtual Version GetMaxLayerDefinitionVersion()
         {
+            if (_parent.SiteVersion >= new Version(2, 3))
+                return new Version(2, 3, 0);
             if (_parent.SiteVersion >= new Version(2, 1))
                 return new Version(1, 3, 0);
             if (_parent.SiteVersion >= new Version(2, 0))
                 return new Version(1, 2, 0);
             if (_parent.SiteVersion >= new Version(1, 2))
                 return new Version(1, 1, 0);
+            
             return new Version(1, 0, 0);
         }