# HG changeset patch
# User Dimitrianos Savva <dimis@di.uoa.gr>
# Date 1404897719 -10800
# Node ID 13a7688d8430209c51ee4a1e1f66400a9aa24b80
# Parent  cd3fec856743609b80cd273e20c92a147be208a6
Replace class TemplateOrderByTest, with a protected variable in TemplateTest

diff -r cd3fec856743 -r 13a7688d8430 testsuite/src/test/java/eu/earthobservatory/testsuite/bugs/SpatialFunctionInOrderBy.java
--- a/testsuite/src/test/java/eu/earthobservatory/testsuite/bugs/SpatialFunctionInOrderBy.java	Tue Jul 01 18:48:46 2014 +0300
+++ b/testsuite/src/test/java/eu/earthobservatory/testsuite/bugs/SpatialFunctionInOrderBy.java	Wed Jul 09 12:21:59 2014 +0300
@@ -9,7 +9,7 @@
  */
 package eu.earthobservatory.testsuite.bugs;
 
-import eu.earthobservatory.testsuite.utils.TemplateOrderByTest;
+import eu.earthobservatory.testsuite.utils.TemplateTest;
 
 
 /**
@@ -17,4 +17,9 @@
  * 
  * @author Dimitrianos Savva <dimis@di.uoa.gr>
  */
-public class SpatialFunctionInOrderBy extends TemplateOrderByTest{}
+public class SpatialFunctionInOrderBy extends TemplateTest{
+	public SpatialFunctionInOrderBy() {
+		super();
+		this.orderResults=true;
+	}
+}
diff -r cd3fec856743 -r 13a7688d8430 testsuite/src/test/java/eu/earthobservatory/testsuite/utils/TemplateOrderByTest.java
--- a/testsuite/src/test/java/eu/earthobservatory/testsuite/utils/TemplateOrderByTest.java	Tue Jul 01 18:48:46 2014 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/**
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- * 
- * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team
- * 
- * http://www.strabon.di.uoa.gr/
- */
-package eu.earthobservatory.testsuite.utils;
-
-import java.io.File;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-/**
- * 4) checks if the results of the query are the expected considering ORDER of results
- * 	  If you don't explicitly use ORDER BY do NOT use this class. Use instead {@link TemplateTest}
- * @author Dimitrianos Savva <dimis@di.uoa.gr>
- */
-public abstract class TemplateOrderByTest extends TemplateTest
-{	
-	@Override
-	@Test
-	public void test() throws Exception
-	{
-		Iterator<String> queryFileIterator = queryFile.iterator();
-		Iterator<String> resultsFileIterator = resultsFile.iterator();
-		
-		while(queryFileIterator.hasNext() && resultsFileIterator.hasNext())
-		{
-			boolean take_into_account_order=true;
-			Utils.testQuery(queryFileIterator.next(), resultsFileIterator.next(),take_into_account_order);
-		}
-	}
-}
diff -r cd3fec856743 -r 13a7688d8430 testsuite/src/test/java/eu/earthobservatory/testsuite/utils/TemplateTest.java
--- a/testsuite/src/test/java/eu/earthobservatory/testsuite/utils/TemplateTest.java	Tue Jul 01 18:48:46 2014 +0300
+++ b/testsuite/src/test/java/eu/earthobservatory/testsuite/utils/TemplateTest.java	Wed Jul 09 12:21:59 2014 +0300
@@ -36,7 +36,7 @@
 	protected ArrayList<String> queryFile;
 	protected ArrayList<String> resultsFile;
 	protected Boolean inference;
-
+	protected Boolean orderResults;
 	
 	public TemplateTest()
 	{
@@ -74,6 +74,7 @@
 		}
 		
 		inference=false;
+		orderResults=false;
 	}
 
 	@Before
@@ -91,7 +92,7 @@
 		
 		while(queryFileIterator.hasNext() && resultsFileIterator.hasNext())
 		{
-			Utils.testQuery(queryFileIterator.next(), resultsFileIterator.next());
+			Utils.testQuery(queryFileIterator.next(), resultsFileIterator.next(),orderResults);
 		}
 	}
 	
diff -r cd3fec856743 -r 13a7688d8430 testsuite/src/test/java/eu/earthobservatory/testsuite/utils/Utils.java
--- a/testsuite/src/test/java/eu/earthobservatory/testsuite/utils/Utils.java	Tue Jul 01 18:48:46 2014 +0300
+++ b/testsuite/src/test/java/eu/earthobservatory/testsuite/utils/Utils.java	Wed Jul 09 12:21:59 2014 +0300
@@ -143,10 +143,6 @@
 	}
 	
 	
-	public static void testQuery(String queryFile, String resultsFile) throws IOException, MalformedQueryException, QueryEvaluationException, TupleQueryResultHandlerException, URISyntaxException, QueryResultParseException, UnsupportedQueryResultFormatException
-	{
-		testQuery(queryFile, resultsFile, false); //dimis
-	}
 	public static void testQuery(String queryFile, String resultsFile,boolean orderOn) throws IOException, MalformedQueryException, QueryEvaluationException, TupleQueryResultHandlerException, URISyntaxException, QueryResultParseException, UnsupportedQueryResultFormatException
 	{
 		ByteArrayOutputStream resultsStream = new ByteArrayOutputStream();