1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/testsuite/src/test/java/eu/earthobservatory/runtime/postgis/StoreTest.java	Fri Apr 05 20:26:25 2013 +0300
     1.3 @@ -0,0 +1,45 @@
     1.4 +/**
     1.5 + * This Source Code Form is subject to the terms of the Mozilla Public
     1.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this
     1.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/.
     1.8 + * 
     1.9 + * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team
    1.10 + * 
    1.11 + * http://www.strabon.di.uoa.gr/
    1.12 + */
    1.13 +package eu.earthobservatory.runtime.postgis;
    1.14 +
    1.15 +import org.junit.After;
    1.16 +import org.junit.Before;
    1.17 +import org.junit.Test;
    1.18 +
    1.19 +/**
    1.20 + * A simple store test. It tests if the input dataset is stored and retrieved correctly.
    1.21 + * 
    1.22 + * @author Panayiotis Smeros <psmeros@di.uoa.gr
    1.23 + */
    1.24 +public class StoreTest
    1.25 +{	
    1.26 +	private final String datasetFile="/"+this.getClass().getSimpleName()+".nt";
    1.27 +	private final String queryFile="/"+this.getClass().getSimpleName()+".rq";
    1.28 +	private final String resultsFile="/"+this.getClass().getSimpleName()+".sr";
    1.29 +
    1.30 +	@Before
    1.31 +	public void before() throws Exception
    1.32 +	{
    1.33 +		Utils.createdb();
    1.34 +		Utils.storeDataset(datasetFile);
    1.35 +	}
    1.36 +	
    1.37 +	@Test
    1.38 +	public void test() throws Exception
    1.39 +	{
    1.40 +		Utils.testQuery(queryFile, resultsFile);
    1.41 +	}
    1.42 +	
    1.43 +	@After
    1.44 +	public void after() throws Exception
    1.45 +	{
    1.46 +		Utils.dropdb();
    1.47 +	}
    1.48 +}

     2.1 --- a/testsuite/src/test/java/eu/earthobservatory/runtime/postgis/TemplateTest.java	Fri Apr 05 11:59:56 2013 +0300
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,184 +0,0 @@
     2.4 -/**
     2.5 - * This Source Code Form is subject to the terms of the Mozilla Public
     2.6 - * License, v. 2.0. If a copy of the MPL was not distributed with this
     2.7 - * file, You can obtain one at http://mozilla.org/MPL/2.0/.
     2.8 - * 
     2.9 - * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team
    2.10 - * 
    2.11 - * http://www.strabon.di.uoa.gr/
    2.12 - */
    2.13 -package eu.earthobservatory.runtime.postgis;
    2.14 -
    2.15 -import static org.junit.Assert.assertEquals;
    2.16 -import java.io.BufferedReader;
    2.17 -import java.io.IOException;
    2.18 -import java.io.InputStream;
    2.19 -import java.io.InputStreamReader;
    2.20 -import java.sql.Connection;
    2.21 -import java.sql.DriverManager;
    2.22 -import java.sql.PreparedStatement;
    2.23 -import java.sql.ResultSet;
    2.24 -import java.sql.SQLException;
    2.25 -import java.util.ArrayList;
    2.26 -import java.util.Iterator;
    2.27 -import java.util.Properties;
    2.28 -import org.openrdf.query.MalformedQueryException;
    2.29 -import org.openrdf.query.QueryEvaluationException;
    2.30 -import org.openrdf.query.TupleQueryResultHandlerException;
    2.31 -import org.openrdf.repository.RepositoryException;
    2.32 -import org.openrdf.rio.RDFHandlerException;
    2.33 -import org.openrdf.rio.RDFParseException;
    2.34 -import eu.earthobservatory.runtime.generaldb.InvalidDatasetFormatFault;
    2.35 -import eu.earthobservatory.runtime.postgis.Strabon;
    2.36 -
    2.37 -/**
    2.38 - * A template class with useful methods for the tests.
    2.39 - * 
    2.40 - * @author Panayiotis Smeros <psmeros@di.uoa.gr>
    2.41 - */
    2.42 -public class TemplateTest
    2.43 -{
    2.44 -	public static final String dbPropertiesFile="/databases.properties";
    2.45 -	
    2.46 -	public static String databaseTemplateName = null;
    2.47 -	public static String defaultUser = null;
    2.48 -	public static String serverName = null;
    2.49 -	public static String username = null;
    2.50 -	public static String password = null;
    2.51 -	public static String port = null;
    2.52 -	
    2.53 -	public static Connection conn = null;
    2.54 -	public static String databaseName = null;
    2.55 -	
    2.56 -	private static Strabon strabon = null;
    2.57 -	
    2.58 -	public static void createdb() throws Exception
    2.59 -	{
    2.60 -		String url="";
    2.61 -		ArrayList<String> databases=new ArrayList<String>();
    2.62 -        PreparedStatement pst = null;
    2.63 -		
    2.64 -		//Read properties
    2.65 -		Properties properties = new Properties();
    2.66 -		InputStream propertiesStream =  TemplateTest.class.getResourceAsStream(dbPropertiesFile);
    2.67 -		properties.load(propertiesStream);
    2.68 -
    2.69 -		if((databaseTemplateName = System.getProperty("postgis.databaseTemplateName"))==null)
    2.70 -		{
    2.71 -			databaseTemplateName = properties.getProperty("postgis.databaseTemplateName");
    2.72 -		}
    2.73 -
    2.74 -		if((defaultUser = System.getProperty("postgis.defaultUser"))==null)
    2.75 -		{
    2.76 -			defaultUser = properties.getProperty("postgis.defaultUser");
    2.77 -		}
    2.78 -		
    2.79 -		if((serverName = System.getProperty("postgis.serverName"))==null)
    2.80 -		{
    2.81 -			serverName = properties.getProperty("postgis.serverName");
    2.82 -		}
    2.83 -		
    2.84 -		if((username = System.getProperty("postgis.username"))==null)
    2.85 -		{
    2.86 -			username = properties.getProperty("postgis.username");
    2.87 -		}
    2.88 -		
    2.89 -		if((password = System.getProperty("postgis.password"))==null)
    2.90 -		{
    2.91 -			password = properties.getProperty("postgis.password");
    2.92 -		}
    2.93 -
    2.94 -		if((port = System.getProperty("postgis.port"))==null)
    2.95 -		{
    2.96 -			port = properties.getProperty("postgis.port");
    2.97 -		}
    2.98 -		
    2.99 -		//Connect to server and create the temp database
   2.100 -		url = "jdbc:postgresql://"+serverName+":"+port+"/"+defaultUser;
   2.101 -		conn = DriverManager.getConnection(url, username, password);
   2.102 -		
   2.103 -        pst = conn.prepareStatement("SELECT * FROM pg_catalog.pg_database");
   2.104 -        ResultSet rs = pst.executeQuery();
   2.105 -
   2.106 -        while (rs.next())
   2.107 -        {
   2.108 -        	databases.add(rs.getString(1));
   2.109 -        }
   2.110 -        rs.close();
   2.111 -        pst.close();
   2.112 -   
   2.113 -        databaseName="teststrabon"+(int)(Math.random()*10000);
   2.114 -        while(databases.contains(databaseName))
   2.115 -        {
   2.116 -        	databaseName+="0";
   2.117 -        }
   2.118 -    
   2.119 -		pst = conn.prepareStatement("CREATE DATABASE "+databaseName+" TEMPLATE " + databaseTemplateName);
   2.120 -		pst.executeUpdate();
   2.121 -		pst.close();
   2.122 -		conn.close();
   2.123 -
   2.124 -		url = "jdbc:postgresql://"+serverName+":"+port+"/"+databaseName;
   2.125 -		conn = DriverManager.getConnection(url, username, password);
   2.126 -		
   2.127 -	    strabon = new Strabon(databaseName, username, password, Integer.parseInt(port), serverName, true);
   2.128 -	}
   2.129 -	
   2.130 -	public static void storeDataset(String datasetFile) throws RDFParseException, RepositoryException, RDFHandlerException, IOException, InvalidDatasetFormatFault
   2.131 -	{
   2.132 -	    if(datasetFile.endsWith(".nt"))
   2.133 -	    	strabon.storeInRepo(datasetFile, "NTRIPLES");
   2.134 -	    else if(datasetFile.endsWith(".nq"))
   2.135 -	    	strabon.storeInRepo(datasetFile, "NQUADS");
   2.136 -	}
   2.137 -	
   2.138 -	public static void testQuery(String queryFile, String resultsFile) throws IOException, MalformedQueryException, QueryEvaluationException, TupleQueryResultHandlerException
   2.139 -	{
   2.140 -		BufferedReader queryReader = new BufferedReader(new InputStreamReader(TemplateTest.class.getResourceAsStream(queryFile)));
   2.141 -		BufferedReader resultsReader = new BufferedReader(new InputStreamReader(TemplateTest.class.getResourceAsStream(resultsFile)));
   2.142 -		String query="";
   2.143 -		ArrayList<String> actualResults = new ArrayList<String>();
   2.144 -		ArrayList<String> expectedResults = new ArrayList<String>();
   2.145 -		
   2.146 -		while (queryReader.ready())
   2.147 -		{
   2.148 -			query+=queryReader.readLine()+"\n";
   2.149 -		}
   2.150 -		actualResults = (ArrayList<String>) strabon.query(query,strabon.getSailRepoConnection());
   2.151 -		
   2.152 -		while (resultsReader.ready())
   2.153 -		{
   2.154 -			expectedResults.add(resultsReader.readLine());
   2.155 -		}
   2.156 -		
   2.157 -		//Check if the actual result set is the same as the expected one
   2.158 -		assertEquals("Actual result set is not the same as the expected one.", expectedResults.size(), actualResults.size());
   2.159 -		Iterator<String> expectedResultsIterator = expectedResults.iterator();
   2.160 -		Iterator<String> actualResultsIterator = actualResults.iterator();
   2.161 -		
   2.162 -		while(expectedResultsIterator.hasNext() && actualResultsIterator.hasNext())
   2.163 -		{
   2.164 -			String eResults = expectedResultsIterator.next();
   2.165 -			String aResults = actualResultsIterator.next();	
   2.166 -			
   2.167 -			//Replace all the names of the variables with "?"
   2.168 -			aResults = aResults.replaceAll("[[A-Z][a-z][0-9]]*=", "?=");
   2.169 -			assertEquals("Actual result set is not the same as the expected one.", aResults, eResults);
   2.170 -		}
   2.171 -	}
   2.172 -	
   2.173 -	public static void dropdb() throws SQLException
   2.174 -	{
   2.175 -		strabon.close();
   2.176 -		
   2.177 -		//Drop the temp database
   2.178 -		conn.close();
   2.179 -		String url = "jdbc:postgresql://"+serverName+":"+port+"/"+defaultUser;
   2.180 -		conn = DriverManager.getConnection(url, username, password);
   2.181 -		
   2.182 -		PreparedStatement pst = conn.prepareStatement("DROP DATABASE "+databaseName);
   2.183 -		pst.executeUpdate();
   2.184 -		pst.close();
   2.185 -		conn.close();
   2.186 -	}
   2.187 -}

     3.1 --- a/testsuite/src/test/java/eu/earthobservatory/runtime/postgis/TestStore.java	Fri Apr 05 11:59:56 2013 +0300
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,45 +0,0 @@
     3.4 -/**
     3.5 - * This Source Code Form is subject to the terms of the Mozilla Public
     3.6 - * License, v. 2.0. If a copy of the MPL was not distributed with this
     3.7 - * file, You can obtain one at http://mozilla.org/MPL/2.0/.
     3.8 - * 
     3.9 - * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team
    3.10 - * 
    3.11 - * http://www.strabon.di.uoa.gr/
    3.12 - */
    3.13 -package eu.earthobservatory.runtime.postgis;
    3.14 -
    3.15 -import org.junit.AfterClass;
    3.16 -import org.junit.BeforeClass;
    3.17 -import org.junit.Test;
    3.18 -
    3.19 -/**
    3.20 - * A simple store test. It tests if the input dataset is stored and retrieved correctly.
    3.21 - * 
    3.22 - * @author Panayiotis Smeros <psmeros@di.uoa.gr
    3.23 - */
    3.24 -public class TestStore
    3.25 -{	
    3.26 -	private static final String datasetFile = "/TestStore.nt";
    3.27 -	private static final String queryFile = "/TestStore.rq";
    3.28 -	private static final String resultsFile = "/TestStore.sr";
    3.29 -
    3.30 -	@BeforeClass
    3.31 -	public static void beforeClass() throws Exception
    3.32 -	{
    3.33 -		TemplateTest.createdb();
    3.34 -		TemplateTest.storeDataset(datasetFile);
    3.35 -	}
    3.36 -	
    3.37 -	@Test
    3.38 -	public void test() throws Exception
    3.39 -	{
    3.40 -		TemplateTest.testQuery(queryFile, resultsFile);
    3.41 -	}
    3.42 -	
    3.43 -	@AfterClass
    3.44 -	public static void afterClass() throws Exception
    3.45 -	{
    3.46 -		TemplateTest.dropdb();
    3.47 -	}
    3.48 -}

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/testsuite/src/test/java/eu/earthobservatory/runtime/postgis/Utils.java	Fri Apr 05 20:26:25 2013 +0300
     4.3 @@ -0,0 +1,184 @@
     4.4 +/**
     4.5 + * This Source Code Form is subject to the terms of the Mozilla Public
     4.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this
     4.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/.
     4.8 + * 
     4.9 + * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team
    4.10 + * 
    4.11 + * http://www.strabon.di.uoa.gr/
    4.12 + */
    4.13 +package eu.earthobservatory.runtime.postgis;
    4.14 +
    4.15 +import static org.junit.Assert.assertEquals;
    4.16 +import java.io.BufferedReader;
    4.17 +import java.io.IOException;
    4.18 +import java.io.InputStream;
    4.19 +import java.io.InputStreamReader;
    4.20 +import java.sql.Connection;
    4.21 +import java.sql.DriverManager;
    4.22 +import java.sql.PreparedStatement;
    4.23 +import java.sql.ResultSet;
    4.24 +import java.sql.SQLException;
    4.25 +import java.util.ArrayList;
    4.26 +import java.util.Iterator;
    4.27 +import java.util.Properties;
    4.28 +import org.openrdf.query.MalformedQueryException;
    4.29 +import org.openrdf.query.QueryEvaluationException;
    4.30 +import org.openrdf.query.TupleQueryResultHandlerException;
    4.31 +import org.openrdf.repository.RepositoryException;
    4.32 +import org.openrdf.rio.RDFHandlerException;
    4.33 +import org.openrdf.rio.RDFParseException;
    4.34 +import eu.earthobservatory.runtime.generaldb.InvalidDatasetFormatFault;
    4.35 +import eu.earthobservatory.runtime.postgis.Strabon;
    4.36 +
    4.37 +/**
    4.38 + * A class with useful methods for the tests.
    4.39 + * 
    4.40 + * @author Panayiotis Smeros <psmeros@di.uoa.gr>
    4.41 + */
    4.42 +public class Utils
    4.43 +{
    4.44 +	private static final String dbPropertiesFile="/databases.properties";
    4.45 +	
    4.46 +	private static String databaseTemplateName = null;
    4.47 +	private static String defaultUser = null;
    4.48 +	private static String serverName = null;
    4.49 +	private static String username = null;
    4.50 +	private static String password = null;
    4.51 +	private static String port = null;
    4.52 +	
    4.53 +	private static Connection conn = null;
    4.54 +	private static String databaseName = null;
    4.55 +	
    4.56 +	private static Strabon strabon = null;
    4.57 +	
    4.58 +	public static void createdb() throws Exception
    4.59 +	{
    4.60 +		String url="";
    4.61 +		ArrayList<String> databases=new ArrayList<String>();
    4.62 +        PreparedStatement pst = null;
    4.63 +		
    4.64 +		//Read properties
    4.65 +		Properties properties = new Properties();
    4.66 +		InputStream propertiesStream =  Utils.class.getResourceAsStream(dbPropertiesFile);
    4.67 +		properties.load(propertiesStream);
    4.68 +
    4.69 +		if((databaseTemplateName = System.getProperty("postgis.databaseTemplateName"))==null)
    4.70 +		{
    4.71 +			databaseTemplateName = properties.getProperty("postgis.databaseTemplateName");
    4.72 +		}
    4.73 +
    4.74 +		if((defaultUser = System.getProperty("postgis.defaultUser"))==null)
    4.75 +		{
    4.76 +			defaultUser = properties.getProperty("postgis.defaultUser");
    4.77 +		}
    4.78 +		
    4.79 +		if((serverName = System.getProperty("postgis.serverName"))==null)
    4.80 +		{
    4.81 +			serverName = properties.getProperty("postgis.serverName");
    4.82 +		}
    4.83 +		
    4.84 +		if((username = System.getProperty("postgis.username"))==null)
    4.85 +		{
    4.86 +			username = properties.getProperty("postgis.username");
    4.87 +		}
    4.88 +		
    4.89 +		if((password = System.getProperty("postgis.password"))==null)
    4.90 +		{
    4.91 +			password = properties.getProperty("postgis.password");
    4.92 +		}
    4.93 +
    4.94 +		if((port = System.getProperty("postgis.port"))==null)
    4.95 +		{
    4.96 +			port = properties.getProperty("postgis.port");
    4.97 +		}
    4.98 +		
    4.99 +		//Connect to server and create the temp database
   4.100 +		url = "jdbc:postgresql://"+serverName+":"+port+"/"+defaultUser;
   4.101 +		conn = DriverManager.getConnection(url, username, password);
   4.102 +		
   4.103 +        pst = conn.prepareStatement("SELECT * FROM pg_catalog.pg_database");
   4.104 +        ResultSet rs = pst.executeQuery();
   4.105 +
   4.106 +        while (rs.next())
   4.107 +        {
   4.108 +        	databases.add(rs.getString(1));
   4.109 +        }
   4.110 +        rs.close();
   4.111 +        pst.close();
   4.112 +   
   4.113 +        databaseName="teststrabon"+(int)(Math.random()*10000);
   4.114 +        while(databases.contains(databaseName))
   4.115 +        {
   4.116 +        	databaseName+="0";
   4.117 +        }
   4.118 +    
   4.119 +		pst = conn.prepareStatement("CREATE DATABASE "+databaseName+" TEMPLATE " + databaseTemplateName);
   4.120 +		pst.executeUpdate();
   4.121 +		pst.close();
   4.122 +		conn.close();
   4.123 +
   4.124 +		url = "jdbc:postgresql://"+serverName+":"+port+"/"+databaseName;
   4.125 +		conn = DriverManager.getConnection(url, username, password);
   4.126 +		
   4.127 +	    strabon = new Strabon(databaseName, username, password, Integer.parseInt(port), serverName, true);
   4.128 +	}
   4.129 +	
   4.130 +	public static void storeDataset(String datasetFile) throws RDFParseException, RepositoryException, RDFHandlerException, IOException, InvalidDatasetFormatFault
   4.131 +	{
   4.132 +	    if(datasetFile.endsWith(".nt"))
   4.133 +	    	strabon.storeInRepo(datasetFile, "NTRIPLES");
   4.134 +	    else if(datasetFile.endsWith(".nq"))
   4.135 +	    	strabon.storeInRepo(datasetFile, "NQUADS");
   4.136 +	}
   4.137 +	
   4.138 +	public static void testQuery(String queryFile, String resultsFile) throws IOException, MalformedQueryException, QueryEvaluationException, TupleQueryResultHandlerException
   4.139 +	{
   4.140 +		BufferedReader queryReader = new BufferedReader(new InputStreamReader(Utils.class.getResourceAsStream(queryFile)));
   4.141 +		BufferedReader resultsReader = new BufferedReader(new InputStreamReader(Utils.class.getResourceAsStream(resultsFile)));
   4.142 +		String query="";
   4.143 +		ArrayList<String> actualResults = new ArrayList<String>();
   4.144 +		ArrayList<String> expectedResults = new ArrayList<String>();
   4.145 +		
   4.146 +		while (queryReader.ready())
   4.147 +		{
   4.148 +			query+=queryReader.readLine()+"\n";
   4.149 +		}
   4.150 +		actualResults = (ArrayList<String>) strabon.query(query,strabon.getSailRepoConnection());
   4.151 +		
   4.152 +		while (resultsReader.ready())
   4.153 +		{
   4.154 +			expectedResults.add(resultsReader.readLine());
   4.155 +		}
   4.156 +		
   4.157 +		//Check if the actual result set is the same as the expected one
   4.158 +		assertEquals("Actual result set is not the same as the expected one.", expectedResults.size(), actualResults.size());
   4.159 +		Iterator<String> expectedResultsIterator = expectedResults.iterator();
   4.160 +		Iterator<String> actualResultsIterator = actualResults.iterator();
   4.161 +		
   4.162 +		while(expectedResultsIterator.hasNext() && actualResultsIterator.hasNext())
   4.163 +		{
   4.164 +			String eResults = expectedResultsIterator.next();
   4.165 +			String aResults = actualResultsIterator.next();	
   4.166 +			
   4.167 +			//Replace all the names of the variables with "?"
   4.168 +			aResults = aResults.replaceAll("[[A-Z][a-z][0-9]]*=", "?=");
   4.169 +			assertEquals("Actual result set is not the same as the expected one.", aResults, eResults);
   4.170 +		}
   4.171 +	}
   4.172 +	
   4.173 +	public static void dropdb() throws SQLException
   4.174 +	{
   4.175 +		strabon.close();
   4.176 +		
   4.177 +		//Drop the temp database
   4.178 +		conn.close();
   4.179 +		String url = "jdbc:postgresql://"+serverName+":"+port+"/"+defaultUser;
   4.180 +		conn = DriverManager.getConnection(url, username, password);
   4.181 +		
   4.182 +		PreparedStatement pst = conn.prepareStatement("DROP DATABASE "+databaseName);
   4.183 +		pst.executeUpdate();
   4.184 +		pst.close();
   4.185 +		conn.close();
   4.186 +	}
   4.187 +}

     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/testsuite/src/test/resources/StoreTest.nt	Fri Apr 05 20:26:25 2013 +0300
     5.3 @@ -0,0 +1,9 @@
     5.4 +<http://example.org/item1> <http://example.org/id> "1"^^<http://www.w3.org/2001/XMLSchema#int>.
     5.5 +<http://example.org/item1> <http://example.org/value> "10"^^<http://www.w3.org/2001/XMLSchema#int>.
     5.6 +<http://example.org/item1> <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry> "POINT(1 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>.
     5.7 +<http://example.org/item2> <http://example.org/id> "2"^^<http://www.w3.org/2001/XMLSchema#int>.
     5.8 +<http://example.org/item2> <http://example.org/value> "20"^^<http://www.w3.org/2001/XMLSchema#int>.
     5.9 +<http://example.org/item2> <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry> "POINT(2 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>.
    5.10 +<http://example.org/item3> <http://example.org/id> "3"^^<http://www.w3.org/2001/XMLSchema#int>.
    5.11 +<http://example.org/item3> <http://example.org/value> "30"^^<http://www.w3.org/2001/XMLSchema#int>.
    5.12 +<http://example.org/item3> <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry> "POINT(3 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>.

     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/testsuite/src/test/resources/StoreTest.rq	Fri Apr 05 20:26:25 2013 +0300
     6.3 @@ -0,0 +1,3 @@
     6.4 +SELECT *
     6.5 +WHERE{?s ?p ?o}
     6.6 +ORDER BY ?s ?p ?o
     6.7 \ No newline at end of file

     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/testsuite/src/test/resources/StoreTest.sr	Fri Apr 05 20:26:25 2013 +0300
     7.3 @@ -0,0 +1,9 @@
     7.4 +[?=http://example.org/item1;?="1"^^<http://www.w3.org/2001/XMLSchema#int>;?=http://example.org/id]
     7.5 +[?=http://example.org/item1;?="10"^^<http://www.w3.org/2001/XMLSchema#int>;?=http://example.org/value]
     7.6 +[?=http://example.org/item1;?="POINT(1 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>;?=http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry]
     7.7 +[?=http://example.org/item2;?="2"^^<http://www.w3.org/2001/XMLSchema#int>;?=http://example.org/id]
     7.8 +[?=http://example.org/item2;?="20"^^<http://www.w3.org/2001/XMLSchema#int>;?=http://example.org/value]
     7.9 +[?=http://example.org/item2;?="POINT(2 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>;?=http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry]
    7.10 +[?=http://example.org/item3;?="3"^^<http://www.w3.org/2001/XMLSchema#int>;?=http://example.org/id]
    7.11 +[?=http://example.org/item3;?="30"^^<http://www.w3.org/2001/XMLSchema#int>;?=http://example.org/value]
    7.12 +[?=http://example.org/item3;?="POINT(3 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>;?=http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry]
    7.13 \ No newline at end of file

     8.1 --- a/testsuite/src/test/resources/TestStore.nt	Fri Apr 05 11:59:56 2013 +0300
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,9 +0,0 @@
     8.4 -<http://example.org/item1> <http://example.org/id> "1"^^<http://www.w3.org/2001/XMLSchema#int>.
     8.5 -<http://example.org/item1> <http://example.org/value> "10"^^<http://www.w3.org/2001/XMLSchema#int>.
     8.6 -<http://example.org/item1> <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry> "POINT(1 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>.
     8.7 -<http://example.org/item2> <http://example.org/id> "2"^^<http://www.w3.org/2001/XMLSchema#int>.
     8.8 -<http://example.org/item2> <http://example.org/value> "20"^^<http://www.w3.org/2001/XMLSchema#int>.
     8.9 -<http://example.org/item2> <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry> "POINT(2 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>.
    8.10 -<http://example.org/item3> <http://example.org/id> "3"^^<http://www.w3.org/2001/XMLSchema#int>.
    8.11 -<http://example.org/item3> <http://example.org/value> "30"^^<http://www.w3.org/2001/XMLSchema#int>.
    8.12 -<http://example.org/item3> <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry> "POINT(3 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>.

     9.1 --- a/testsuite/src/test/resources/TestStore.rq	Fri Apr 05 11:59:56 2013 +0300
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,3 +0,0 @@
     9.4 -SELECT *
     9.5 -WHERE{?s ?p ?o}
     9.6 -ORDER BY ?s ?p ?o
     9.7 \ No newline at end of file

    10.1 --- a/testsuite/src/test/resources/TestStore.sr	Fri Apr 05 11:59:56 2013 +0300
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,9 +0,0 @@
    10.4 -[?=http://example.org/item1;?="1"^^<http://www.w3.org/2001/XMLSchema#int>;?=http://example.org/id]
    10.5 -[?=http://example.org/item1;?="10"^^<http://www.w3.org/2001/XMLSchema#int>;?=http://example.org/value]
    10.6 -[?=http://example.org/item1;?="POINT(1 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>;?=http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry]
    10.7 -[?=http://example.org/item2;?="2"^^<http://www.w3.org/2001/XMLSchema#int>;?=http://example.org/id]
    10.8 -[?=http://example.org/item2;?="20"^^<http://www.w3.org/2001/XMLSchema#int>;?=http://example.org/value]
    10.9 -[?=http://example.org/item2;?="POINT(2 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>;?=http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry]
   10.10 -[?=http://example.org/item3;?="3"^^<http://www.w3.org/2001/XMLSchema#int>;?=http://example.org/id]
   10.11 -[?=http://example.org/item3;?="30"^^<http://www.w3.org/2001/XMLSchema#int>;?=http://example.org/value]
   10.12 -[?=http://example.org/item3;?="POINT(3 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>;?=http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry]
   10.13 \ No newline at end of file