[Commits] r2855 - in core/trunk/geoext: lib/GeoExt/data tests/lib/GeoExt/data

[commits at geoext.org]

Author: bartvde
Date: 2011-10-10 08:28:10 +0200 (Mon, 10 Oct 2011)
New Revision: 2855

Modified:
   core/trunk/geoext/lib/GeoExt/data/WMSCapabilitiesReader.js
   core/trunk/geoext/tests/lib/GeoExt/data/WMSCapabilitiesReader.html
Log:
add infoFormats to WMSCapabilitiesReader, r=ahocevar (closes #441)

Modified: core/trunk/geoext/lib/GeoExt/data/WMSCapabilitiesReader.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/data/WMSCapabilitiesReader.js	2011-10-09 14:53:18 UTC (rev 2854)
+++ core/trunk/geoext/lib/GeoExt/data/WMSCapabilitiesReader.js	2011-10-10 06:28:10 UTC (rev 2855)
@@ -31,7 +31,7 @@
  *          name, title, abstract, queryable, opaque, noSubsets, cascaded,
  *          fixedWidth, fixedHeight, minScale, maxScale, prefix, formats,
  *          styles, srs, dimensions, bbox, llbbox, attribution, keywords,
- *          identifiers, authorityURLs, metadataURLs.
+ *          identifiers, authorityURLs, metadataURLs, infoFormats.
  *          The type of these fields is the same as for the matching fields in
  *          the object returned from
  *          ``OpenLayers.Format.WMSCapabilities::read()``.
@@ -70,7 +70,8 @@
                 {name: "keywords"}, // array
                 {name: "identifiers"}, // object
                 {name: "authorityURLs"}, // object
-                {name: "metadataURLs"} // array
+                {name: "metadataURLs"}, // array
+                {name: "infoFormats"} // array
             ]
         );
     }

Modified: core/trunk/geoext/tests/lib/GeoExt/data/WMSCapabilitiesReader.html
===================================================================
--- core/trunk/geoext/tests/lib/GeoExt/data/WMSCapabilitiesReader.html	2011-10-09 14:53:18 UTC (rev 2854)
+++ core/trunk/geoext/tests/lib/GeoExt/data/WMSCapabilitiesReader.html	2011-10-10 06:28:10 UTC (rev 2855)
@@ -17,7 +17,7 @@
             var fields = reader.recordType.prototype.fields;
 
             // 1 test
-            t.eq(fields.items.length, 24, 'number of default items is correct');
+            t.eq(fields.items.length, 25, 'number of default items is correct');
 
             var reader = new GeoExt.data.WMSCapabilitiesReader({},[
                 {name: "foo"},
@@ -43,7 +43,7 @@
         }
 
         function test_read(t) {
-            t.plan(40);
+            t.plan(41);
 
             // test a reader with the only two default LayerRecord fields
             var reader = new GeoExt.data.WMSCapabilitiesReader({}, []);
@@ -108,7 +108,14 @@
             t.eq(record.get("fixedHeight"), 200, "[2] correct fixedHeight attribute");
             t.eq(record.get("formats")[0], "image/png", "[2] correct image/png formats attribute");
             t.eq(record.get("formats")[14], "image/geotiff", "[2] correct image/geotiff formats attribute");
-            t.eq(record.get("formats")[27], "rss", "[2] correct rss formats attribute");            
+            t.eq(record.get("formats")[27], "rss", "[2] correct rss formats attribute");
+            if (!record.get("infoFormats")) {
+                // for OpenLayers versions that don't parse infoFormats
+                t.ok("infoFormats" in record.data, "infoFormats field created");
+            } else {
+                // for OpenLayers versions that do parse infoFormats
+                t.eq(record.get("infoFormats")[0], "text/plain", "[2] first infoFormat is correct");
+            }
             var srs = record.get("srs");
             var count = 0;
             for (var key in srs) {