Updated test files for WCPS.

1 files changed, 227 insertions, 242 deletions

diff --git a/src/petascope/wcps/server/test/FullTestsOnline.java b/src/petascope/wcps/server/test/FullTestsOnline.java
index db248d6..1ffba4b 100644
--- a/src/petascope/wcps/server/test/FullTestsOnline.java
+++ b/src/petascope/wcps/server/test/FullTestsOnline.java
@@ -19,12 +19,9 @@
  *
  * Copyright 2009 Jacobs University Bremen, Peter Baumann.
  */
-
-
 package petascope.wcps.server.test;
 
 //~--- non-JDK imports --------------------------------------------------------
-
 import org.apache.commons.io.FileUtils;
 
 import petascope.wcps.server.cli.grammar;
@@ -41,7 +38,6 @@ import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.URLEncoder;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -64,36 +60,34 @@ import org.w3c.dom.Element;
  *
  * @author Andrei Aiordachioaie
  */
-public class FullTestsOnline
-{
-  public static String PetascopeURL = "http://localhost:8080/PetaScope/earthlook";
+public class FullTestsOnline {
+
+    public static String PetascopeURL = "http://localhost:8080/PetaScope/earthlook";
 //  public static String PetascopeURL = "http://localhost:8080/petascope/wcps/";
 //	public static String PetascopeURL = "http://kahlua.eecs.jacobs-university.de:8080/petascope/earthlook";
-
-	// Tests are read from this folder
-	static String folder = "test/testcases-wcps/";
-	// How many testFiles we have to run
-	int numTests = 0;
-	// Files are written in this folder
-	static String outputFolder = "test/tmp/";
-	// How many successes?
-	int passCount = 0;
-	// message for testFiles
-	String[][] errors;
-	// success code
-	boolean[] ok;
-	// partial success codes
-	boolean[][] partialOk;
-	// queries
-	String[] queries;
-	String[] testNames;
+    // Tests are read from this folder
+    static String folder = "test/testcases-wcps/";
+    // How many testFiles we have to run
+    int numTests = 0;
+    // Files are written in this folder
+    static String outputFolder = "test/tmp/";
+    // How many successes?
+    int passCount = 0;
+    // message for testFiles
+    String[][] errors;
+    // success code
+    boolean[] ok;
+    // partial success codes
+    boolean[][] partialOk;
+    // queries
+    String[] queries;
+    String[] testNames;
     // execution Times for XML queries
     long[] xmlTimes;
     // execution times for abstract sintax queries
     long[] asTimes;
 
-	public FullTestsOnline()
-	{
+    public FullTestsOnline() {
         System.out.println("===========================");
         System.out.println("    PetaScope Test Suite       ");
         System.out.println("===========================\n\n");
@@ -101,129 +95,119 @@ public class FullTestsOnline
         System.out.println("Reading test files from: " + folder);
         System.out.println("Writing output files to: " + outputFolder + "\n\n");
 
-		// Find out how many grammar testFiles we have to run
-		File dir = new File(folder);
-		TestFileFilter filter = new TestFileFilter();
-		testNames = dir.list(filter);
-		Arrays.sort(testNames);
-		numTests = testNames.length;
-//        numTests = 2;
-
-		ok = new boolean[numTests];
-		partialOk = new boolean[5][numTests];
-		errors = new String[5][numTests];
-		queries = new String[numTests];
+        // Find out how many grammar testFiles we have to run
+        File dir = new File(folder);
+        TestFileFilter filter = new TestFileFilter();
+        testNames = dir.list(filter);
+        Arrays.sort(testNames);
+        numTests = testNames.length;
+//        numTests = 1;
+
+        ok = new boolean[numTests];
+        partialOk = new boolean[5][numTests];
+        errors = new String[5][numTests];
+        queries = new String[numTests];
         xmlTimes = new long[numTests];
         asTimes = new long[numTests];
-	}
+    }
 
-	public void printResults()
-	{
-		HashMap strMap = new HashMap<Boolean, String>();
+    public void printResults() {
+        HashMap strMap = new HashMap<Boolean, String>();
 
-		strMap.put(true, "ok");
-		strMap.put(false, "failed");
+        strMap.put(true, "ok");
+        strMap.put(false, "failed");
 
-		System.out.println("\n \nRESULTS + EXECUTION TIMES\n");
+        System.out.println("\n \nRESULTS + EXECUTION TIMES\n");
 
-		for (int i = 0; i < numTests; i++)
-		{
-			String tname = testNames[i];
-			tname = tname.substring(0, tname.length() - 5);
+        for (int i = 0; i < numTests; i++) {
+            String tname = testNames[i];
+            tname = tname.substring(0, tname.length() - 5);
 
-			if ( ok[i] == true )
-			{
-                String time = (double) (asTimes[i]/10) / 100 + " sec";
-				System.out.println("*** Test '" + tname + "' ok (" + time + ")");
+            if (ok[i] == true) {
+                String time = (double) (asTimes[i] / 10) / 100 + " sec";
+                System.out.println("*** Test '" + tname + "' ok (" + time + ")");
 //              System.out.println("\t" + queries[i]);
-			}
-			else
-			{
-				System.out.println("*** Test '" + tname + "' FAILED");
-				System.out.println("\t * Abstract Syntax -> Xml: " + strMap.get(partialOk[1][i]));
-				if ( partialOk[1][i] == false )
-					System.out.println("\t\t" + errors[1][i]);
+            } else {
+                System.out.println("*** Test '" + tname + "' FAILED");
+                System.out.println("\t * Abstract Syntax -> Xml: " + strMap.get(partialOk[1][i]));
+                if (partialOk[1][i] == false) {
+                    System.out.println("\t\t" + errors[1][i]);
+                }
 //                System.out.println("\t * Xml -> RasQL: " + strMap.get(partialOk[2][i]));
 //                if (partialOk[2][i] == false)
 //                  System.out.println("\t\t" + errors[2][i]);
-				System.out.println("\t * Running Abstract Syntax query: " + strMap.get(partialOk[3][i]));
-				if ( partialOk[3][i] == false )
-					System.out.println("\t\t" + errors[3][i]);
-				System.out.println("\t * Running XML query: " + strMap.get(partialOk[4][i]));
-				if ( partialOk[4][i] == false )
-					System.out.println("\t\t" + errors[4][i]);
-			}
-		}
-		System.out.println("\n\nRESULTS\n");
-		System.out.println("Tested PetaScope implementation from: " + PetascopeURL);
-		System.out.println("Tests succeeded: " + String.valueOf(passCount));
-		System.out.println("Tests failed: " + String.valueOf(numTests - passCount));
-
-        System.out.println("\nWARNING: a test is considered to have passed when the web server does not report" +
-                " any erorrs. A human has to inspect the semantics of the result. For this, the first three lines" +
-                " of the output from the web service are printed for each test. For example, if a query involves" +
-                " encoding a coverage in JPEG format, the first line needs to look like \"����JFIF��C\"");
-	}
-
-	public void runAllTests()
-	{
-		String abstractQuery = "";
-		String xmlQuery = "";
-		String rasqlQuery = "";
-		String tname = "";
+                System.out.println("\t * Running Abstract Syntax query: " + strMap.get(partialOk[3][i]));
+                if (partialOk[3][i] == false) {
+                    System.out.println("\t\t" + errors[3][i]);
+                }
+                System.out.println("\t * Running XML query: " + strMap.get(partialOk[4][i]));
+                if (partialOk[4][i] == false) {
+                    System.out.println("\t\t" + errors[4][i]);
+                }
+            }
+        }
+        System.out.println("\n\nRESULTS\n");
+        System.out.println("Tested PetaScope implementation from: " + PetascopeURL);
+        System.out.println("Tests succeeded: " + String.valueOf(passCount));
+        System.out.println("Tests failed: " + String.valueOf(numTests - passCount));
+
+        System.out.println("\nWARNING: a test is considered to have passed when the web server does not report"
+                + " any erorrs. A human has to inspect the semantics of the result. For this, the first three lines"
+                + " of the output from the web service are printed for each test. For example, if a query involves"
+                + " encoding a coverage in JPEG format, the first line needs to look like \"����JFIF��C\"");
+    }
+
+    public void runAllTests() {
+        String abstractQuery = "";
+        String xmlQuery = "";
+        String rasqlQuery = "";
+        String tname = "";
         long start, end;        // for measuring time
 
-		for (int i = 0; i < numTests; i++)
-		{
-			ok[i] = false;
-			partialOk[1][i] = false;
-			partialOk[2][i] = true;
-			partialOk[3][i] = false;
-			partialOk[4][i] = false;
-			errors[1][i] = "";
-			errors[2][i] = "";
-			errors[3][i] = "";
-			errors[4][i] = "";
-
-			tname = testNames[i];
-			tname = tname.substring(0, tname.length() - 5);
+        for (int i = 0; i < numTests; i++) {
+            ok[i] = false;
+            partialOk[1][i] = false;
+            partialOk[2][i] = true;
+            partialOk[3][i] = false;
+            partialOk[4][i] = false;
+            errors[1][i] = "";
+            errors[2][i] = "";
+            errors[3][i] = "";
+            errors[4][i] = "";
+
+            tname = testNames[i];
+            tname = tname.substring(0, tname.length() - 5);
             File testFile = new File(folder + testNames[i]);
-			System.out.println("-------------------------------------------------");
-            System.out.println("\t\tTest '" + tname + "'...");
             System.out.println("-------------------------------------------------");
-			// First of all: read file contents
-			try
-			{
-				abstractQuery = FileUtils.readFileToString(testFile);
-				queries[i] = abstractQuery;
+            System.out.println("\tTest '" + tname + "'...");
+            System.out.println("-------------------------------------------------");
+            // First of all: read file contents
+            try {
+                abstractQuery = FileUtils.readFileToString(testFile);
+                queries[i] = abstractQuery;
                 System.out.println("*** Query :\n" + abstractQuery);
-			}
-			catch (IOException e)
-			{
-				errors[1][i] = "Could not read file " + testFile.getName();
-
-				continue;
-			}
-			// Step 1: Convert abstract syntax query to XML query, and save files
-			try
-			{
-				xmlQuery = grammar.convertAbstractQueryToXml(abstractQuery);
-				// Copy abstract syntax query to output folder
-				File abstractFile = new File(outputFolder + tname + ".test");
-
-				FileUtils.writeStringToFile(abstractFile, abstractQuery);
-				// Save XML query to a file in output folder
-				File xmlFile = new File(outputFolder + tname + ".xml");
-
-				FileUtils.writeStringToFile(xmlFile, xmlQuery);
-
-				partialOk[1][i] = true;
-			}
-			catch (Exception e)
-			{
-				errors[1][i] = e.getMessage();
-			}
-			// Step 2: Convert XML query to RasQL query, and save files
+            } catch (IOException e) {
+                errors[1][i] = "Could not read file " + testFile.getName();
+
+                continue;
+            }
+            // Step 1: Convert abstract syntax query to XML query, and save files
+            try {
+                xmlQuery = grammar.convertAbstractQueryToXml(abstractQuery);
+                // Copy abstract syntax query to output folder
+                File abstractFile = new File(outputFolder + tname + ".test");
+
+                FileUtils.writeStringToFile(abstractFile, abstractQuery);
+                // Save XML query to a file in output folder
+                File xmlFile = new File(outputFolder + tname + ".xml");
+
+                FileUtils.writeStringToFile(xmlFile, xmlQuery);
+
+                partialOk[1][i] = true;
+            } catch (Exception e) {
+                errors[1][i] = e.getMessage();
+            }
+            // Step 2: Convert XML query to RasQL query, and save files
 //			try
 //			{
 //				rasqlQuery = xml.convertXmlToRasql(xmlQuery);
@@ -237,158 +221,159 @@ public class FullTestsOnline
 //			{
 //				errors[2][i] = e.getMessage();
 //			}
-			// Step 3: Send abstract syntax query to PetaScope WCPS
-			try
-			{
+            // Step 3: Send abstract syntax query to PetaScope WCPS
+            try {
                 System.out.println("*** Results from abstract query :");
                 start = System.currentTimeMillis();
-				String err = runOneTest("query", abstractQuery);
+                String err = runOneTest("query", abstractQuery, "GET");
                 end = System.currentTimeMillis();
                 asTimes[i] = end - start;
 
-				if ( err == null )
-					partialOk[3][i] = true;
-				else
-					errors[3][i] = err;
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-			// Step 4: Send XML query to PetaScope WCPS
-			try
-			{
+                if (err == null) {
+                    partialOk[3][i] = true;
+                } else {
+                    errors[3][i] = err;
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            // Step 4: Send XML query to PetaScope WCPS
+            try {
                 System.out.println("*** Results from XML query :");
                 start = System.currentTimeMillis();
-				String err = runOneTest("request", xmlQuery);
+//                String err = runOneTest("request", xmlQuery, "POST");
+                String err = runOneTest("", xmlQuery, "POST");
                 end = System.currentTimeMillis();
-                xmlTimes[i] = end-start;
-
-				if ( err == null )
-					partialOk[4][i] = true;
-				else
-					errors[4][i] = err;
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-
-			// Wrap up
-			ok[i] = partialOk[1][i] && partialOk[2][i] && partialOk[3][i] && partialOk[4][i];
-			if ( ok[i] == true )
-				passCount++;
-		}
-	}
-
-	/**
-	 * Send an request to the WCPS server.
-	 * Returns a message on error and null otherwise.
-	 */
-	public String runOneTest(String param, String query) throws MalformedURLException, IOException
-	{
+                xmlTimes[i] = end - start;
+
+                if (err == null) {
+                    partialOk[4][i] = true;
+                } else {
+                    errors[4][i] = err;
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+            // Wrap up
+            ok[i] = partialOk[1][i] && partialOk[2][i] && partialOk[3][i] && partialOk[4][i];
+            if (ok[i] == true) {
+                passCount++;
+            }
+        }
+    }
+
+    /**
+     * Send an request to the WCPS server.
+     * Returns a message on error and null otherwise.
+     */
+    public String runOneTest(String param, String query, String method)
+            throws MalformedURLException, IOException {
 //      System.out.println("--------------------");
 //      System.out.println(query);
 //      System.out.println("\t--------------------");
 
-		// connect to the servlet
-		URL servlet = new URL(PetascopeURL);
-		HttpURLConnection conn = (HttpURLConnection) servlet.openConnection();
+        // connect to the servlet
+        URL servlet = new URL(PetascopeURL);
+        HttpURLConnection conn = (HttpURLConnection) servlet.openConnection();
 
-		// inform the connection that we will send output and accept input
-		conn.setDoInput(true);
-		conn.setDoOutput(true);
+        // inform the connection that we will send output and accept input
+        conn.setDoInput(true);
+        conn.setDoOutput(true);
 
-		// Don't use a cached version of URL connection.
-		conn.setUseCaches(false);
-		conn.setDefaultUseCaches(false);
+        // Don't use a cached version of URL connection.
+        conn.setUseCaches(false);
+        conn.setDefaultUseCaches(false);
 
-		// Send POST request
-		conn.setRequestMethod("POST");
+        // Default method is GET
+        if (method.equals("POST"))
+            conn.setRequestMethod(method);
 
-		// Specify the content type that we will send binary data
-		conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+        // For POST: We send binary data
+        if (method.equals("POST"))
+        {
+//            conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+//            query = URLEncoder.encode(query, "UTF-8");
+        }
 
-        String service = "service=WCPS&";
-		String data = service + param + "=" + URLEncoder.encode(query);
-		DataOutputStream out = new DataOutputStream(conn.getOutputStream());
+        if (param.equals("") == false)
+            param += "=";
 
-		out.writeBytes(data);
-		out.flush();
-		out.close();
+        String data = param + query;
+        DataOutputStream out = new DataOutputStream(conn.getOutputStream());
 
-		BufferedReader cgiOutput = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-		String line1 = cgiOutput.readLine();
-		String line2 = cgiOutput.readLine();
-		String line3 = cgiOutput.readLine();
+        out.writeBytes(data);
+        out.flush();
+        out.close();
 
-		System.out.println("\t" + line1);
-		System.out.println("\t" + line2);
-		System.out.println("\t" + line3);
+        BufferedReader cgiOutput = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+        String line1 = cgiOutput.readLine();
+        String line2 = cgiOutput.readLine();
+        String line3 = cgiOutput.readLine();
 
-		if ( (line1 != null) && (line2 != null) && (line3 != null) )
-		{
+        System.out.println("\t" + line1);
+        System.out.println("\t" + line2);
+        System.out.println("\t" + line3);
+
+        if ((line1 != null) && (line2 != null) && (line3 != null)) {
             StringBuffer output = new StringBuffer(line1 + line2 + line3);
-			while (cgiOutput.ready())
-				output.append(cgiOutput.readLine());
+            while (cgiOutput.ready()) {
+                output.append(cgiOutput.readLine());
+            }
 
             // Try to parse error message
-            if (line1.startsWith("<"))
-            {
+            if (line1.startsWith("<")) {
                 DocumentBuilder builder = null;
-                try
-                {
+                try {
                     DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance();
                     domFactory.setNamespaceAware(true);		// never forget this!
                     builder = domFactory.newDocumentBuilder();
                     Document doc = builder.parse(IOUtils.toInputStream(output.toString()));
                     Element rootElem = doc.getDocumentElement();
-                    if (rootElem.getNodeName().endsWith("ExceptionReport"))
+                    if (rootElem.getNodeName().endsWith("ExceptionReport")) {
                         return output.toString();
-                }
-                catch (Exception e)
-                {
+                    }
+                } catch (Exception e) {
                 }
             }
-			
-		}
+
+        }
 
         return null;
-	}
+    }
 
     /** Runs the full test suite on a deployed version of PetaScope.
      * If command-line arguments are not provided, default values are used. 
      *
      * @param args Can contain up to three parameters, in order: PetaScopeURL testFolder, outputFolder
      */
-	public static void main(String args[])
-	{
-        if (args.length >= 1)
+    public static void main(String args[]) {
+        if (args.length >= 1) {
             FullTestsOnline.PetascopeURL = args[0];
-        if (args.length >= 2)
+        }
+        if (args.length >= 2) {
             FullTestsOnline.folder = args[1];
-        if (args.length == 3)
+        }
+        if (args.length == 3) {
             FullTestsOnline.outputFolder = args[2];
+        }
 
-		FullTestsOnline tester = new FullTestsOnline();
-        
-		tester.runAllTests();
-		tester.printResults();
-	}
-
-	/* Accept all files with extension TEST. */
-	private class TestFileFilter implements FilenameFilter
-	{
-		@Override
-		public boolean accept(File dir, String name)
-		{
-			if ( name.endsWith("test") )
-			{
-				return true;
-			}
-
-			return false;
-		}
-	}
+        FullTestsOnline tester = new FullTestsOnline();
+
+        tester.runAllTests();
+        tester.printResults();
+    }
+
+    /* Accept all files with extension TEST. */
+    private class TestFileFilter implements FilenameFilter {
+
+        @Override
+        public boolean accept(File dir, String name) {
+            if (name.endsWith("test")) {
+                return true;
+            }
 
+            return false;
+        }
+    }
 }