[GEOS-8835] Return CITE compliance to normal after test

geoserver · Jul 9, 2018 · d9de0c2 · d9de0c2
1 parent 20e4781
commit d9de0c2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/wfs/src/test/java/org/geoserver/wfs/WFSTestSupport.java b/src/wfs/src/test/java/org/geoserver/wfs/WFSTestSupport.java
@@ -9,6 +9,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import org.custommonkey.xmlunit.SimpleNamespaceContext;
 import org.custommonkey.xmlunit.XMLUnit;
 import org.geoserver.data.test.CiteTestData;
@@ -17,6 +18,7 @@
 import org.geoserver.platform.Service;
 import org.geoserver.test.GeoServerSystemTestSupport;
 import org.geoserver.wfs.xml.v1_0_0.WFSConfiguration;
+import org.junit.After;
 
 /**
  * New Base support class for wfs tests.
@@ -97,4 +99,22 @@ protected List<String> getSupportedSpatialOperatorsList(boolean wfs1_0_0) {
                     "BBOX"
                 });
     }
+
+    protected Boolean citeCompliant;
+
+    protected void setCiteCompliant(boolean value) {
+        WFSInfo wfs = getWFS();
+        citeCompliant = wfs.isCiteCompliant();
+        wfs.setCiteCompliant(value);
+        getGeoServer().save(wfs);
+    }
+
+    @After
+    public void resetCiteCompliant() {
+        if (Objects.nonNull(citeCompliant)) {
+            WFSInfo wfs = getWFS();
+            wfs.setCiteCompliant(citeCompliant);
+            getGeoServer().save(wfs);
+        }
+    }
 }
diff --git a/src/wfs/src/test/java/org/geoserver/wfs/v1_1/GetFeatureTest.java b/src/wfs/src/test/java/org/geoserver/wfs/v1_1/GetFeatureTest.java
@@ -705,9 +705,7 @@ public void testEncodeSrsDimension() throws Exception {
                                 + getLayerId(SystemTestData.PRIMITIVEGEOFEATURE));
         assertXpathExists("//gml:Point[@srsDimension = '2']", dom);
 
-        WFSInfo wfs = getWFS();
-        wfs.setCiteCompliant(true);
-        getGeoServer().save(wfs);
+        setCiteCompliant(true);
 
         dom =
                 getAsDOM(