Add modification for the last test

Add modification for the last test. orbisgis#17 there always an error with the test : new Operator.
Vquillien · May 15, 2017 · b6bc053 · b6bc053
1 parent 7293f39
commit b6bc053
Show file tree

Hide file tree

Showing 7 changed files with 157 additions and 8 deletions.
diff --git a/ogc-custom-test/src/main/java/net/opengis/fes/_2_0_2/newOps/ObjectFactory.java b/ogc-custom-test/src/main/java/net/opengis/fes/_2_0_2/newOps/ObjectFactory.java
@@ -0,0 +1,60 @@
+//
+// Ce fichier a �t� g�n�r� par l'impl�mentation de r�f�rence JavaTM Architecture for XML Binding (JAXB), v2.2.8-b130911.1802 
+// Voir <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Toute modification apport�e � ce fichier sera perdue lors de la recompilation du sch�ma source. 
+// G�n�r� le : 2017.05.15 � 03:12:35 PM CEST 
+//
+
+
+package net.opengis.fes._2_0_2.newOps;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the net.opengis.fes._2_0_2.newOps package. 
+ * <p>An ObjectFactory allows you to programatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private final static QName _PropertyExists_QNAME = new QName("http://www.someserver.com/myops/1.0", "PropertyExists");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: net.opengis.fes._2_0_2.newOps
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link PropertyExistsType }
+     * 
+     */
+    public PropertyExistsType createPropertyExistsType() {
+        return new PropertyExistsType();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link PropertyExistsType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.someserver.com/myops/1.0", name = "PropertyExists", substitutionHeadNamespace = "http://www.opengis.net/fes/2.0", substitutionHeadName = "comparisonOps")
+    public JAXBElement<PropertyExistsType> createPropertyExists(PropertyExistsType value) {
+        return new JAXBElement<PropertyExistsType>(_PropertyExists_QNAME, PropertyExistsType.class, value);
+    }
+
+}
diff --git a/ogc-custom-test/src/main/java/net/opengis/fes/_2_0_2/newOps/PropertyExistsType.java b/ogc-custom-test/src/main/java/net/opengis/fes/_2_0_2/newOps/PropertyExistsType.java
@@ -0,0 +1,77 @@
+//
+// Ce fichier a �t� g�n�r� par l'impl�mentation de r�f�rence JavaTM Architecture for XML Binding (JAXB), v2.2.8-b130911.1802 
+// Voir <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Toute modification apport�e � ce fichier sera perdue lors de la recompilation du sch�ma source. 
+// G�n�r� le : 2017.05.15 � 03:12:35 PM CEST 
+//
+
+
+package net.opengis.fes._2_0_2.newOps;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import net.opengis.fes._2.ComparisonOpsType;
+import net.opengis.fes._2_0_2.ExtensionOpsType;
+
+
+/**
+ * <p>Classe Java pour PropertyExistsType complex type.
+ * 
+ * <p>Le fragment de sch�ma suivant indique le contenu attendu figurant dans cette classe.
+ * 
+ * <pre>
+ * &lt;complexType name="PropertyExistsType">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.opengis.net/fes/2.0}ComparisonOpsType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://www.opengis.net/fes/2.0}ValueReference"/>
+ *       &lt;/sequence>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "PropertyExistsType", propOrder = {
+    "valueReference"
+})
+public class PropertyExistsType
+    extends ComparisonOpsType
+{
+
+    @XmlElement(name = "ValueReference", namespace = "http://www.opengis.net/fes/2.0", required = true)
+    protected String valueReference;
+
+    /**
+     * Obtient la valeur de la propri�t� valueReference.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getValueReference() {
+        return valueReference;
+    }
+
+    /**
+     * D�finit la valeur de la propri�t� valueReference.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setValueReference(String value) {
+        this.valueReference = value;
+    }
+
+    public boolean isSetValueReference() {
+        return (this.valueReference!= null);
+    }
+
+}
diff --git a/ogc-custom-test/src/main/java/net/opengis/fes/_2_0_2/newOps/package-info.java b/ogc-custom-test/src/main/java/net/opengis/fes/_2_0_2/newOps/package-info.java
@@ -0,0 +1,9 @@
+//
+// Ce fichier a �t� g�n�r� par l'impl�mentation de r�f�rence JavaTM Architecture for XML Binding (JAXB), v2.2.8-b130911.1802 
+// Voir <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Toute modification apport�e � ce fichier sera perdue lors de la recompilation du sch�ma source. 
+// G�n�r� le : 2017.05.15 � 03:12:35 PM CEST 
+//
+
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.someserver.com/myops/1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package net.opengis.fes._2_0_2.newOps;
diff --git a/ogc-custom-test/src/main/java/org/orbisgis/ogccustomtest/JaxbContainer.java b/ogc-custom-test/src/main/java/org/orbisgis/ogccustomtest/JaxbContainer.java
@@ -51,7 +51,11 @@ private JaxbContainer() {}
     static {
         try {
             JAXBCONTEXT = JAXBContext.newInstance(
-                    net.opengis.fes._2_0_2.ObjectFactory.class);
+                    net.opengis.wms.ObjectFactory.class,
+                    net.opengis.se._2_0.core.ObjectFactory.class,
+                    oasis.names.tc.ciq.xsdschema.xal._2.ObjectFactory.class,
+                    net.opengis.fes._2_0_2.ObjectFactory.class,
+                    net.opengis.fes._2_0_2.newOps.ObjectFactory.class);
         } catch (JAXBException ex) {
             throw new ExceptionInInitializerError(ex);
         }

diff --git a/ogc-custom-test/src/test/java/org/orbisgis/ogccustomtest/OGC_FilterEncodingTest.java b/ogc-custom-test/src/test/java/org/orbisgis/ogccustomtest/OGC_FilterEncodingTest.java
@@ -499,5 +499,4 @@ public void TestSorting() throws JAXBException {
                 sortBy.getSortProperty().get(1).getValueReference(), "temperature");
     }
 
-
 }
diff --git a/ogc-custom-test/src/test/resources/org/orbisgis/ogccustomtest/Xml_Return.xml b/ogc-custom-test/src/test/resources/org/orbisgis/ogccustomtest/Xml_Return.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Filter xmlns="http://www.opengis.net/fes/2.0" xmlns:ns2="http://www.opengis.net/ows/1.1" xmlns:ns3="http://www.w3.org/1999/xlink"/>
+<ns18:Filter xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.opengis.net/sld/1.2" xmlns:ns4="http://www.opengis.net/fes/2.1" xmlns:ns5="http://www.opengis.net/se/2.0/core" xmlns:ns6="http://www.opengis.net/ows/2.0" xmlns:ns7="http://www.opengis.net/wps/2.0" xmlns:ns8="http://www.opengis.net/wfs/2.1" xmlns:ns9="http://www.opengis.net/wms" xmlns:ns10="http://www.opengis.net/ows-context" xmlns:ns11="http://www.opengis.net/se/2.0/thematic" xmlns:ns12="http://www.opengis.net/gml" xmlns:ns13="http://www.opengis.net/kml/2.2" xmlns:ns14="http://www.w3.org/2005/Atom" xmlns:ns15="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0" xmlns:ns16="http://www.w3.org/2001/SMIL20/" xmlns:ns17="http://www.opengis.net/se/2.0/raster" xmlns:ns18="http://www.opengis.net/fes/2.0" xmlns:ns19="http://www.someserver.com/myops/1.0" xmlns:ns20="http://www.opengis.net/ows/1.1" xmlns:ns21="http://www.w3.org/2001/SMIL20/Language"/>
diff --git a/ogc-custom-test/src/test/resources/org/orbisgis/ogccustomtest/filter_NewOperator.xml b/ogc-custom-test/src/test/resources/org/orbisgis/ogccustomtest/filter_NewOperator.xml
@@ -3,9 +3,9 @@
         xmlns:fes="http://www.opengis.net/fes/2.0"
         xmlns:myops="http://www.someserver.example.com/myops/1.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.opengis.net/fes/2.0
-        http://schemas.opengis.net/filter/2.0.0/filterAll.xsd">
-    <myops:PropertyExists>
-        <fes:ValueReference>Person</fes:ValueReference>
-    </myops:PropertyExists>
+        xsi:schemaLocation="http://www.opengis.net/fes/2.0 http://schemas.opengis.net/filter/2.0/filterAll.xsd
+                      http://www.someserver.example.com/myops/1.0 ./NewOperator.xsd">
+        <myops:PropertyExists>
+            <fes:ValueReference>Person/age</fes:ValueReference>
+        </myops:PropertyExists>
 </fes:Filter>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -499,5 +499,4 @@ public void TestSorting() throws JAXBException {
		sortBy.getSortProperty().get(1).getValueReference(), "temperature");
		}


		}