update echo test file and add new integration test for variable renaming

during script execution
bpross-52n · Apr 23, 2014 · a1ea55e · a1ea55e
1 parent 08d0d32
commit a1ea55e
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 7 deletions.
diff --git a/52n-wps-webapp/src/main/webapp/R/scripts/test_echo.R b/52n-wps-webapp/src/main/webapp/R/scripts/test_echo.R
@@ -2,6 +2,22 @@
 
 # wps.in: id = inputVariable, type = string, title = input variable, minOccurs = 1, maxOccurs = 1;
 
-outputVariable <- inputVariable
+# wps.off;
+inputVariable <- "The quick brown fox jumps over the lazy dog"
+# wps.on;
 
-#wps.out: id = outputVariable, type = string, title = returning input variable;
+# test that the renaming measures do not affect the script
+quitter <- inputVariable
+
+uuunlinkkk <- quitter
+evaluator <- uuunlinkkk
+qevalq <- evaluator
+systemo <- qevalq
+setwdsetwdsetwd <- systemo
+
+outputVariable <- setwdsetwdsetwd
+
+#wps.out: id = outputVariable, type = string, title = returning input variable;
+
+# wps.off;
+outputVariable
diff --git a/52n-wps-webapp/src/test/java/org/n52/wps/test/Wps4rIT.java b/52n-wps-webapp/src/test/java/org/n52/wps/test/Wps4rIT.java
@@ -39,6 +39,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Random;
+import java.util.UUID;
 
 import javax.xml.parsers.ParserConfigurationException;
 
@@ -294,7 +295,7 @@ public void exceptionsOnIllegalInputs() throws XmlException, IOException {
         // "<-", "a<-q", // result in WPS parsing error
         "="};
 
-        URL resource = Wps4rIT.class.getResource("/R/ExecuteTestInjection.xml");
+        URL resource = Wps4rIT.class.getResource("/R/ExecuteTestEcho.xml");
         XmlObject xmlPayload = XmlObject.Factory.parse(resource);
 
         for (String cmd : illegalCommands) {
@@ -314,7 +315,7 @@ public void exceptionsOnIllegalInputs() throws XmlException, IOException {
     public void syntaxErrorOnIllegalInputs() throws XmlException, IOException {
         String[] illegalCommands = new String[] {"\"\";quit(\"no\");", "setwd('/root/')", "setwd(\"c:/\")"};
 
-        URL resource = Wps4rIT.class.getResource("/R/ExecuteTestInjection.xml");
+        URL resource = Wps4rIT.class.getResource("/R/ExecuteTestEcho.xml");
         XmlObject xmlPayload = XmlObject.Factory.parse(resource);
 
         for (String cmd : illegalCommands) {
@@ -335,12 +336,12 @@ public void replacementsOnIllegalInputs() throws XmlException, IOException {
                                                  // "system('format hardisk')",
                                                  "quit(\\\"no\\\");inputVariable;"};
 
-        URL resource = Wps4rIT.class.getResource("/R/ExecuteTestInjection.xml");
+        URL resource = Wps4rIT.class.getResource("/R/ExecuteTestEcho.xml");
         XmlObject xmlPayload = XmlObject.Factory.parse(resource);
 
         for (String cmd : illegalCommands) {
             String payload = xmlPayload.toString();
-            payload = payload.replace("@@@cmd@@@", cmd);
+            payload = payload.replace("@@@data@@@", cmd);
 
             String response = PostClient.sendRequest(wpsUrl, payload);
 
@@ -349,4 +350,19 @@ public void replacementsOnIllegalInputs() throws XmlException, IOException {
         }
     }
 
+    @Test
+    public void renamingDoesNotAffectScript() throws XmlException, IOException {
+        URL resource = Wps4rIT.class.getResource("/R/ExecuteTestEcho.xml");
+        XmlObject xmlPayload = XmlObject.Factory.parse(resource);
+
+        String data = UUID.randomUUID().toString();
+        String payload = xmlPayload.toString();
+        payload = payload.replace("@@@data@@@", data);
+
+        String response = PostClient.sendRequest(wpsUrl, payload);
+
+        assertThat("Response is not an exception", response, not(containsString("ExceptionReport")));
+        assertThat("Response contains an echo of '" + data + "'", response, containsString(data));
+    }
+
 }
diff --git a/...test/resources/R/ExecuteTestInjection.xml → .../src/test/resources/R/ExecuteTestEcho.xml b/...test/resources/R/ExecuteTestInjection.xml → .../src/test/resources/R/ExecuteTestEcho.xml
@@ -9,7 +9,7 @@
 		<wps:Input>
 			<ows:Identifier>inputVariable</ows:Identifier>
 			<wps:Data>
-				<wps:LiteralData>@@@cmd@@@</wps:LiteralData>
+				<wps:LiteralData>@@@data@@@</wps:LiteralData>
 			</wps:Data>
 		</wps:Input>
 	</wps:DataInputs>