[Geotools-commits] svn - r38771 - in trunk/modules/extension/xsd/xsd-filter/src: main/resources/org/geotools/filter/v1_1 test/java/org/geotools/filter/v1_1

[<svn...@os...>]

Author: jdeolive
Date: 2012-05-28 18:05:28 -0700 (Mon, 28 May 2012)
New Revision: 38771

Modified:
   trunk/modules/extension/xsd/xsd-filter/src/main/resources/org/geotools/filter/v1_1/filter.xsd
   trunk/modules/extension/xsd/xsd-filter/src/test/java/org/geotools/filter/v1_1/OGCFilterTest.java
Log:
updated internal copy of filter schema to match online published, PropertyName in BBOX is optional

Modified: trunk/modules/extension/xsd/xsd-filter/src/main/resources/org/geotools/filter/v1_1/filter.xsd
===================================================================
--- trunk/modules/extension/xsd/xsd-filter/src/main/resources/org/geotools/filter/v1_1/filter.xsd	2012-05-28 22:58:36 UTC (rev 38770)
+++ trunk/modules/extension/xsd/xsd-filter/src/main/resources/org/geotools/filter/v1_1/filter.xsd	2012-05-29 01:05:28 UTC (rev 38771)
@@ -194,7 +194,7 @@
       <xsd:complexContent>
          <xsd:extension base="ogc:SpatialOpsType">
             <xsd:sequence>
-               <xsd:element ref="ogc:PropertyName"/>
+               <xsd:element ref="ogc:PropertyName" minOccurs="0"/>
                <xsd:element ref="gml:Envelope"/>
             </xsd:sequence>
          </xsd:extension>

Modified: trunk/modules/extension/xsd/xsd-filter/src/test/java/org/geotools/filter/v1_1/OGCFilterTest.java
===================================================================
--- trunk/modules/extension/xsd/xsd-filter/src/test/java/org/geotools/filter/v1_1/OGCFilterTest.java	2012-05-28 22:58:36 UTC (rev 38770)
+++ trunk/modules/extension/xsd/xsd-filter/src/test/java/org/geotools/filter/v1_1/OGCFilterTest.java	2012-05-29 01:05:28 UTC (rev 38771)
@@ -26,6 +26,9 @@
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.StringReader;
+import java.util.List;
+
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.opengis.filter.Filter;
 import org.opengis.filter.FilterFactory;
@@ -34,7 +37,7 @@
 import org.opengis.filter.expression.PropertyName;
 import org.opengis.filter.spatial.DWithin;
 import org.geotools.factory.CommonFactoryFinder;
-import org.geotools.filter.v1_0.OGCConfiguration;
+
 import org.geotools.xml.Encoder;
 import org.geotools.xml.Parser;
 import org.geotools.xml.Parser.Properties;
@@ -141,4 +144,21 @@
         String unit = filter.getDistanceUnits();
         assertEquals("km", unit);
      }
+
+    public void testBBOXValidateWithoutPropertyName() throws Exception {
+        String xml = 
+              "<ogc:Filter xmlns:ogc='http://www.opengis.net/ogc'>" +
+                "<ogc:BBOX>" +
+                  "<gml:Envelope xmlns:gml='http://www.opengis.net/gml'>" +  
+                     "<gml:lowerCorner>36.986771000000005 -91.516129</gml:lowerCorner>" + 
+                     "<gml:upperCorner>42.50936100000001 -87.507889</gml:upperCorner>" +  
+                   "</gml:Envelope>" +
+                 "</ogc:BBOX>" +
+               "</ogc:Filter>";
+
+        Parser p = new Parser(new OGCConfiguration());
+        p.validate(new StringReader(xml));
+
+        assertTrue(p.getValidationErrors().isEmpty());
+    }
 }