Strabon

changeset 998:8eca11e5f4a9

merge
author Babis Nikolaou <charnik@di.uoa.gr>
date Fri Apr 05 21:31:45 2013 +0300 (2013-04-05)
parents ac2df8371fd2 f0bfe1a16592
children 0a4b5f4aab1f
files testsuite/src/test/java/eu/earthobservatory/runtime/postgis/TemplateTest.java testsuite/src/test/java/eu/earthobservatory/runtime/postgis/TestStore.java testsuite/src/test/resources/TestStore.nt testsuite/src/test/resources/TestStore.rq testsuite/src/test/resources/TestStore.sr
line diff
     1.1 --- a/README	Fri Apr 05 21:31:22 2013 +0300
     1.2 +++ b/README	Fri Apr 05 21:31:45 2013 +0300
     1.3 @@ -216,8 +216,22 @@
     1.4     project, download any dependencies and build the project. 
     1.5  
     1.6  
     1.7 -	Storing stRDF graphs and evaluating stSPARQL queries
     1.8 -	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     1.9 +Tester Guide
    1.10 +~~~~~~~~~~~~
    1.11 +Assuming again that you are familiar with Maven and Junit these are the steps
    1.12 +you need to follow to test the functionality of Strabon:
    1.13 +
    1.14 +* Using Eclipse
    1.15 +
    1.16 +	If you want to create a new test:
    1.17 +
    1.18 +	1. Import Strabon into Eclipse as explained in the Developer Guide.
    1.19 +	2. Go to project strabon-testsuite.
    1.20 +	3. Create a Test class in the appropriate package.
    1.21 +
    1.22 +
    1.23 +Storing stRDF graphs and evaluating stSPARQL queries
    1.24 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    1.25  You can see some examples in the classes
    1.26  eu.earthobservatory.runtime.postgis.StoreOp and
    1.27  eu.earthobservatory.runtime.postgis.QueryOp.
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/testsuite/src/test/java/eu/earthobservatory/runtime/postgis/StoreTest.java	Fri Apr 05 21:31:45 2013 +0300
     2.3 @@ -0,0 +1,45 @@
     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 org.junit.After;
    2.16 +import org.junit.Before;
    2.17 +import org.junit.Test;
    2.18 +
    2.19 +/**
    2.20 + * A simple store test. It tests if the input dataset is stored and retrieved correctly.
    2.21 + * 
    2.22 + * @author Panayiotis Smeros <psmeros@di.uoa.gr
    2.23 + */
    2.24 +public class StoreTest
    2.25 +{	
    2.26 +	private final String datasetFile="/"+this.getClass().getSimpleName()+".nt";
    2.27 +	private final String queryFile="/"+this.getClass().getSimpleName()+".rq";
    2.28 +	private final String resultsFile="/"+this.getClass().getSimpleName()+".sr";
    2.29 +
    2.30 +	@Before
    2.31 +	public void before() throws Exception
    2.32 +	{
    2.33 +		Utils.createdb();
    2.34 +		Utils.storeDataset(datasetFile);
    2.35 +	}
    2.36 +	
    2.37 +	@Test
    2.38 +	public void test() throws Exception
    2.39 +	{
    2.40 +		Utils.testQuery(queryFile, resultsFile);
    2.41 +	}
    2.42 +	
    2.43 +	@After
    2.44 +	public void after() throws Exception
    2.45 +	{
    2.46 +		Utils.dropdb();
    2.47 +	}
    2.48 +}
     3.1 --- a/testsuite/src/test/java/eu/earthobservatory/runtime/postgis/TemplateTest.java	Fri Apr 05 21:31:22 2013 +0300
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,184 +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 static org.junit.Assert.assertEquals;
    3.16 -import java.io.BufferedReader;
    3.17 -import java.io.IOException;
    3.18 -import java.io.InputStream;
    3.19 -import java.io.InputStreamReader;
    3.20 -import java.sql.Connection;
    3.21 -import java.sql.DriverManager;
    3.22 -import java.sql.PreparedStatement;
    3.23 -import java.sql.ResultSet;
    3.24 -import java.sql.SQLException;
    3.25 -import java.util.ArrayList;
    3.26 -import java.util.Iterator;
    3.27 -import java.util.Properties;
    3.28 -import org.openrdf.query.MalformedQueryException;
    3.29 -import org.openrdf.query.QueryEvaluationException;
    3.30 -import org.openrdf.query.TupleQueryResultHandlerException;
    3.31 -import org.openrdf.repository.RepositoryException;
    3.32 -import org.openrdf.rio.RDFHandlerException;
    3.33 -import org.openrdf.rio.RDFParseException;
    3.34 -import eu.earthobservatory.runtime.generaldb.InvalidDatasetFormatFault;
    3.35 -import eu.earthobservatory.runtime.postgis.Strabon;
    3.36 -
    3.37 -/**
    3.38 - * A template class with useful methods for the tests.
    3.39 - * 
    3.40 - * @author Panayiotis Smeros <psmeros@di.uoa.gr>
    3.41 - */
    3.42 -public class TemplateTest
    3.43 -{
    3.44 -	public static final String dbPropertiesFile="/databases.properties";
    3.45 -	
    3.46 -	public static String databaseTemplateName = null;
    3.47 -	public static String defaultUser = null;
    3.48 -	public static String serverName = null;
    3.49 -	public static String username = null;
    3.50 -	public static String password = null;
    3.51 -	public static String port = null;
    3.52 -	
    3.53 -	public static Connection conn = null;
    3.54 -	public static String databaseName = null;
    3.55 -	
    3.56 -	private static Strabon strabon = null;
    3.57 -	
    3.58 -	public static void createdb() throws Exception
    3.59 -	{
    3.60 -		String url="";
    3.61 -		ArrayList<String> databases=new ArrayList<String>();
    3.62 -        PreparedStatement pst = null;
    3.63 -		
    3.64 -		//Read properties
    3.65 -		Properties properties = new Properties();
    3.66 -		InputStream propertiesStream =  TemplateTest.class.getResourceAsStream(dbPropertiesFile);
    3.67 -		properties.load(propertiesStream);
    3.68 -
    3.69 -		if((databaseTemplateName = System.getProperty("postgis.databaseTemplateName"))==null)
    3.70 -		{
    3.71 -			databaseTemplateName = properties.getProperty("postgis.databaseTemplateName");
    3.72 -		}
    3.73 -
    3.74 -		if((defaultUser = System.getProperty("postgis.defaultUser"))==null)
    3.75 -		{
    3.76 -			defaultUser = properties.getProperty("postgis.defaultUser");
    3.77 -		}
    3.78 -		
    3.79 -		if((serverName = System.getProperty("postgis.serverName"))==null)
    3.80 -		{
    3.81 -			serverName = properties.getProperty("postgis.serverName");
    3.82 -		}
    3.83 -		
    3.84 -		if((username = System.getProperty("postgis.username"))==null)
    3.85 -		{
    3.86 -			username = properties.getProperty("postgis.username");
    3.87 -		}
    3.88 -		
    3.89 -		if((password = System.getProperty("postgis.password"))==null)
    3.90 -		{
    3.91 -			password = properties.getProperty("postgis.password");
    3.92 -		}
    3.93 -
    3.94 -		if((port = System.getProperty("postgis.port"))==null)
    3.95 -		{
    3.96 -			port = properties.getProperty("postgis.port");
    3.97 -		}
    3.98 -		
    3.99 -		//Connect to server and create the temp database
   3.100 -		url = "jdbc:postgresql://"+serverName+":"+port+"/"+defaultUser;
   3.101 -		conn = DriverManager.getConnection(url, username, password);
   3.102 -		
   3.103 -        pst = conn.prepareStatement("SELECT * FROM pg_catalog.pg_database");
   3.104 -        ResultSet rs = pst.executeQuery();
   3.105 -
   3.106 -        while (rs.next())
   3.107 -        {
   3.108 -        	databases.add(rs.getString(1));
   3.109 -        }
   3.110 -        rs.close();
   3.111 -        pst.close();
   3.112 -   
   3.113 -        databaseName="teststrabon"+(int)(Math.random()*10000);
   3.114 -        while(databases.contains(databaseName))
   3.115 -        {
   3.116 -        	databaseName+="0";
   3.117 -        }
   3.118 -    
   3.119 -		pst = conn.prepareStatement("CREATE DATABASE "+databaseName+" TEMPLATE " + databaseTemplateName);
   3.120 -		pst.executeUpdate();
   3.121 -		pst.close();
   3.122 -		conn.close();
   3.123 -
   3.124 -		url = "jdbc:postgresql://"+serverName+":"+port+"/"+databaseName;
   3.125 -		conn = DriverManager.getConnection(url, username, password);
   3.126 -		
   3.127 -	    strabon = new Strabon(databaseName, username, password, Integer.parseInt(port), serverName, true);
   3.128 -	}
   3.129 -	
   3.130 -	public static void storeDataset(String datasetFile) throws RDFParseException, RepositoryException, RDFHandlerException, IOException, InvalidDatasetFormatFault
   3.131 -	{
   3.132 -	    if(datasetFile.endsWith(".nt"))
   3.133 -	    	strabon.storeInRepo(datasetFile, "NTRIPLES");
   3.134 -	    else if(datasetFile.endsWith(".nq"))
   3.135 -	    	strabon.storeInRepo(datasetFile, "NQUADS");
   3.136 -	}
   3.137 -	
   3.138 -	public static void testQuery(String queryFile, String resultsFile) throws IOException, MalformedQueryException, QueryEvaluationException, TupleQueryResultHandlerException
   3.139 -	{
   3.140 -		BufferedReader queryReader = new BufferedReader(new InputStreamReader(TemplateTest.class.getResourceAsStream(queryFile)));
   3.141 -		BufferedReader resultsReader = new BufferedReader(new InputStreamReader(TemplateTest.class.getResourceAsStream(resultsFile)));
   3.142 -		String query="";
   3.143 -		ArrayList<String> actualResults = new ArrayList<String>();
   3.144 -		ArrayList<String> expectedResults = new ArrayList<String>();
   3.145 -		
   3.146 -		while (queryReader.ready())
   3.147 -		{
   3.148 -			query+=queryReader.readLine()+"\n";
   3.149 -		}
   3.150 -		actualResults = (ArrayList<String>) strabon.query(query,strabon.getSailRepoConnection());
   3.151 -		
   3.152 -		while (resultsReader.ready())
   3.153 -		{
   3.154 -			expectedResults.add(resultsReader.readLine());
   3.155 -		}
   3.156 -		
   3.157 -		//Check if the actual result set is the same as the expected one
   3.158 -		assertEquals("Actual result set is not the same as the expected one.", expectedResults.size(), actualResults.size());
   3.159 -		Iterator<String> expectedResultsIterator = expectedResults.iterator();
   3.160 -		Iterator<String> actualResultsIterator = actualResults.iterator();
   3.161 -		
   3.162 -		while(expectedResultsIterator.hasNext() && actualResultsIterator.hasNext())
   3.163 -		{
   3.164 -			String eResults = expectedResultsIterator.next();
   3.165 -			String aResults = actualResultsIterator.next();	
   3.166 -			
   3.167 -			//Replace all the names of the variables with "?"
   3.168 -			aResults = aResults.replaceAll("[[A-Z][a-z][0-9]]*=", "?=");
   3.169 -			assertEquals("Actual result set is not the same as the expected one.", aResults, eResults);
   3.170 -		}
   3.171 -	}
   3.172 -	
   3.173 -	public static void dropdb() throws SQLException
   3.174 -	{
   3.175 -		strabon.close();
   3.176 -		
   3.177 -		//Drop the temp database
   3.178 -		conn.close();
   3.179 -		String url = "jdbc:postgresql://"+serverName+":"+port+"/"+defaultUser;
   3.180 -		conn = DriverManager.getConnection(url, username, password);
   3.181 -		
   3.182 -		PreparedStatement pst = conn.prepareStatement("DROP DATABASE "+databaseName);
   3.183 -		pst.executeUpdate();
   3.184 -		pst.close();
   3.185 -		conn.close();
   3.186 -	}
   3.187 -}
     4.1 --- a/testsuite/src/test/java/eu/earthobservatory/runtime/postgis/TestStore.java	Fri Apr 05 21:31:22 2013 +0300
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,45 +0,0 @@
     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 org.junit.AfterClass;
    4.16 -import org.junit.BeforeClass;
    4.17 -import org.junit.Test;
    4.18 -
    4.19 -/**
    4.20 - * A simple store test. It tests if the input dataset is stored and retrieved correctly.
    4.21 - * 
    4.22 - * @author Panayiotis Smeros <psmeros@di.uoa.gr
    4.23 - */
    4.24 -public class TestStore
    4.25 -{	
    4.26 -	private static final String datasetFile = "/TestStore.nt";
    4.27 -	private static final String queryFile = "/TestStore.rq";
    4.28 -	private static final String resultsFile = "/TestStore.sr";
    4.29 -
    4.30 -	@BeforeClass
    4.31 -	public static void beforeClass() throws Exception
    4.32 -	{
    4.33 -		TemplateTest.createdb();
    4.34 -		TemplateTest.storeDataset(datasetFile);
    4.35 -	}
    4.36 -	
    4.37 -	@Test
    4.38 -	public void test() throws Exception
    4.39 -	{
    4.40 -		TemplateTest.testQuery(queryFile, resultsFile);
    4.41 -	}
    4.42 -	
    4.43 -	@AfterClass
    4.44 -	public static void afterClass() throws Exception
    4.45 -	{
    4.46 -		TemplateTest.dropdb();
    4.47 -	}
    4.48 -}
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/testsuite/src/test/java/eu/earthobservatory/runtime/postgis/Utils.java	Fri Apr 05 21:31:45 2013 +0300
     5.3 @@ -0,0 +1,184 @@
     5.4 +/**
     5.5 + * This Source Code Form is subject to the terms of the Mozilla Public
     5.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this
     5.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/.
     5.8 + * 
     5.9 + * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team
    5.10 + * 
    5.11 + * http://www.strabon.di.uoa.gr/
    5.12 + */
    5.13 +package eu.earthobservatory.runtime.postgis;
    5.14 +
    5.15 +import static org.junit.Assert.assertEquals;
    5.16 +import java.io.BufferedReader;
    5.17 +import java.io.IOException;
    5.18 +import java.io.InputStream;
    5.19 +import java.io.InputStreamReader;
    5.20 +import java.sql.Connection;
    5.21 +import java.sql.DriverManager;
    5.22 +import java.sql.PreparedStatement;
    5.23 +import java.sql.ResultSet;
    5.24 +import java.sql.SQLException;
    5.25 +import java.util.ArrayList;
    5.26 +import java.util.Iterator;
    5.27 +import java.util.Properties;
    5.28 +import org.openrdf.query.MalformedQueryException;
    5.29 +import org.openrdf.query.QueryEvaluationException;
    5.30 +import org.openrdf.query.TupleQueryResultHandlerException;
    5.31 +import org.openrdf.repository.RepositoryException;
    5.32 +import org.openrdf.rio.RDFHandlerException;
    5.33 +import org.openrdf.rio.RDFParseException;
    5.34 +import eu.earthobservatory.runtime.generaldb.InvalidDatasetFormatFault;
    5.35 +import eu.earthobservatory.runtime.postgis.Strabon;
    5.36 +
    5.37 +/**
    5.38 + * A class with useful methods for the tests.
    5.39 + * 
    5.40 + * @author Panayiotis Smeros <psmeros@di.uoa.gr>
    5.41 + */
    5.42 +public class Utils
    5.43 +{
    5.44 +	private static final String dbPropertiesFile="/databases.properties";
    5.45 +	
    5.46 +	private static String databaseTemplateName = null;
    5.47 +	private static String defaultUser = null;
    5.48 +	private static String serverName = null;
    5.49 +	private static String username = null;
    5.50 +	private static String password = null;
    5.51 +	private static String port = null;
    5.52 +	
    5.53 +	private static Connection conn = null;
    5.54 +	private static String databaseName = null;
    5.55 +	
    5.56 +	private static Strabon strabon = null;
    5.57 +	
    5.58 +	public static void createdb() throws Exception
    5.59 +	{
    5.60 +		String url="";
    5.61 +		ArrayList<String> databases=new ArrayList<String>();
    5.62 +        PreparedStatement pst = null;
    5.63 +		
    5.64 +		//Read properties
    5.65 +		Properties properties = new Properties();
    5.66 +		InputStream propertiesStream =  Utils.class.getResourceAsStream(dbPropertiesFile);
    5.67 +		properties.load(propertiesStream);
    5.68 +
    5.69 +		if((databaseTemplateName = System.getProperty("postgis.databaseTemplateName"))==null)
    5.70 +		{
    5.71 +			databaseTemplateName = properties.getProperty("postgis.databaseTemplateName");
    5.72 +		}
    5.73 +
    5.74 +		if((defaultUser = System.getProperty("postgis.defaultUser"))==null)
    5.75 +		{
    5.76 +			defaultUser = properties.getProperty("postgis.defaultUser");
    5.77 +		}
    5.78 +		
    5.79 +		if((serverName = System.getProperty("postgis.serverName"))==null)
    5.80 +		{
    5.81 +			serverName = properties.getProperty("postgis.serverName");
    5.82 +		}
    5.83 +		
    5.84 +		if((username = System.getProperty("postgis.username"))==null)
    5.85 +		{
    5.86 +			username = properties.getProperty("postgis.username");
    5.87 +		}
    5.88 +		
    5.89 +		if((password = System.getProperty("postgis.password"))==null)
    5.90 +		{
    5.91 +			password = properties.getProperty("postgis.password");
    5.92 +		}
    5.93 +
    5.94 +		if((port = System.getProperty("postgis.port"))==null)
    5.95 +		{
    5.96 +			port = properties.getProperty("postgis.port");
    5.97 +		}
    5.98 +		
    5.99 +		//Connect to server and create the temp database
   5.100 +		url = "jdbc:postgresql://"+serverName+":"+port+"/"+defaultUser;
   5.101 +		conn = DriverManager.getConnection(url, username, password);
   5.102 +		
   5.103 +        pst = conn.prepareStatement("SELECT * FROM pg_catalog.pg_database");
   5.104 +        ResultSet rs = pst.executeQuery();
   5.105 +
   5.106 +        while (rs.next())
   5.107 +        {
   5.108 +        	databases.add(rs.getString(1));
   5.109 +        }
   5.110 +        rs.close();
   5.111 +        pst.close();
   5.112 +   
   5.113 +        databaseName="teststrabon"+(int)(Math.random()*10000);
   5.114 +        while(databases.contains(databaseName))
   5.115 +        {
   5.116 +        	databaseName+="0";
   5.117 +        }
   5.118 +    
   5.119 +		pst = conn.prepareStatement("CREATE DATABASE "+databaseName+" TEMPLATE " + databaseTemplateName);
   5.120 +		pst.executeUpdate();
   5.121 +		pst.close();
   5.122 +		conn.close();
   5.123 +
   5.124 +		url = "jdbc:postgresql://"+serverName+":"+port+"/"+databaseName;
   5.125 +		conn = DriverManager.getConnection(url, username, password);
   5.126 +		
   5.127 +	    strabon = new Strabon(databaseName, username, password, Integer.parseInt(port), serverName, true);
   5.128 +	}
   5.129 +	
   5.130 +	public static void storeDataset(String datasetFile) throws RDFParseException, RepositoryException, RDFHandlerException, IOException, InvalidDatasetFormatFault
   5.131 +	{
   5.132 +	    if(datasetFile.endsWith(".nt"))
   5.133 +	    	strabon.storeInRepo(datasetFile, "NTRIPLES");
   5.134 +	    else if(datasetFile.endsWith(".nq"))
   5.135 +	    	strabon.storeInRepo(datasetFile, "NQUADS");
   5.136 +	}
   5.137 +	
   5.138 +	public static void testQuery(String queryFile, String resultsFile) throws IOException, MalformedQueryException, QueryEvaluationException, TupleQueryResultHandlerException
   5.139 +	{
   5.140 +		BufferedReader queryReader = new BufferedReader(new InputStreamReader(Utils.class.getResourceAsStream(queryFile)));
   5.141 +		BufferedReader resultsReader = new BufferedReader(new InputStreamReader(Utils.class.getResourceAsStream(resultsFile)));
   5.142 +		String query="";
   5.143 +		ArrayList<String> actualResults = new ArrayList<String>();
   5.144 +		ArrayList<String> expectedResults = new ArrayList<String>();
   5.145 +		
   5.146 +		while (queryReader.ready())
   5.147 +		{
   5.148 +			query+=queryReader.readLine()+"\n";
   5.149 +		}
   5.150 +		actualResults = (ArrayList<String>) strabon.query(query,strabon.getSailRepoConnection());
   5.151 +		
   5.152 +		while (resultsReader.ready())
   5.153 +		{
   5.154 +			expectedResults.add(resultsReader.readLine());
   5.155 +		}
   5.156 +		
   5.157 +		//Check if the actual result set is the same as the expected one
   5.158 +		assertEquals("Actual result set is not the same as the expected one.", expectedResults.size(), actualResults.size());
   5.159 +		Iterator<String> expectedResultsIterator = expectedResults.iterator();
   5.160 +		Iterator<String> actualResultsIterator = actualResults.iterator();
   5.161 +		
   5.162 +		while(expectedResultsIterator.hasNext() && actualResultsIterator.hasNext())
   5.163 +		{
   5.164 +			String eResults = expectedResultsIterator.next();
   5.165 +			String aResults = actualResultsIterator.next();	
   5.166 +			
   5.167 +			//Replace all the names of the variables with "?"
   5.168 +			aResults = aResults.replaceAll("[[A-Z][a-z][0-9]]*=", "?=");
   5.169 +			assertEquals("Actual result set is not the same as the expected one.", aResults, eResults);
   5.170 +		}
   5.171 +	}
   5.172 +	
   5.173 +	public static void dropdb() throws SQLException
   5.174 +	{
   5.175 +		strabon.close();
   5.176 +		
   5.177 +		//Drop the temp database
   5.178 +		conn.close();
   5.179 +		String url = "jdbc:postgresql://"+serverName+":"+port+"/"+defaultUser;
   5.180 +		conn = DriverManager.getConnection(url, username, password);
   5.181 +		
   5.182 +		PreparedStatement pst = conn.prepareStatement("DROP DATABASE "+databaseName);
   5.183 +		pst.executeUpdate();
   5.184 +		pst.close();
   5.185 +		conn.close();
   5.186 +	}
   5.187 +}
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/testsuite/src/test/resources/StoreTest.nt	Fri Apr 05 21:31:45 2013 +0300
     6.3 @@ -0,0 +1,9 @@
     6.4 +<http://example.org/item1> <http://example.org/id> "1"^^<http://www.w3.org/2001/XMLSchema#int>.
     6.5 +<http://example.org/item1> <http://example.org/value> "10"^^<http://www.w3.org/2001/XMLSchema#int>.
     6.6 +<http://example.org/item1> <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry> "POINT(1 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>.
     6.7 +<http://example.org/item2> <http://example.org/id> "2"^^<http://www.w3.org/2001/XMLSchema#int>.
     6.8 +<http://example.org/item2> <http://example.org/value> "20"^^<http://www.w3.org/2001/XMLSchema#int>.
     6.9 +<http://example.org/item2> <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry> "POINT(2 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>.
    6.10 +<http://example.org/item3> <http://example.org/id> "3"^^<http://www.w3.org/2001/XMLSchema#int>.
    6.11 +<http://example.org/item3> <http://example.org/value> "30"^^<http://www.w3.org/2001/XMLSchema#int>.
    6.12 +<http://example.org/item3> <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry> "POINT(3 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>.
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/testsuite/src/test/resources/StoreTest.rq	Fri Apr 05 21:31:45 2013 +0300
     7.3 @@ -0,0 +1,3 @@
     7.4 +SELECT *
     7.5 +WHERE{?s ?p ?o}
     7.6 +ORDER BY ?s ?p ?o
     7.7 \ No newline at end of file
     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/testsuite/src/test/resources/StoreTest.sr	Fri Apr 05 21:31:45 2013 +0300
     8.3 @@ -0,0 +1,9 @@
     8.4 +[?=http://example.org/item1;?="1"^^<http://www.w3.org/2001/XMLSchema#int>;?=http://example.org/id]
     8.5 +[?=http://example.org/item1;?="10"^^<http://www.w3.org/2001/XMLSchema#int>;?=http://example.org/value]
     8.6 +[?=http://example.org/item1;?="POINT(1 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>;?=http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry]
     8.7 +[?=http://example.org/item2;?="2"^^<http://www.w3.org/2001/XMLSchema#int>;?=http://example.org/id]
     8.8 +[?=http://example.org/item2;?="20"^^<http://www.w3.org/2001/XMLSchema#int>;?=http://example.org/value]
     8.9 +[?=http://example.org/item2;?="POINT(2 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>;?=http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry]
    8.10 +[?=http://example.org/item3;?="3"^^<http://www.w3.org/2001/XMLSchema#int>;?=http://example.org/id]
    8.11 +[?=http://example.org/item3;?="30"^^<http://www.w3.org/2001/XMLSchema#int>;?=http://example.org/value]
    8.12 +[?=http://example.org/item3;?="POINT(3 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>;?=http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry]
    8.13 \ No newline at end of file
     9.1 --- a/testsuite/src/test/resources/TestStore.nt	Fri Apr 05 21:31:22 2013 +0300
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,9 +0,0 @@
     9.4 -<http://example.org/item1> <http://example.org/id> "1"^^<http://www.w3.org/2001/XMLSchema#int>.
     9.5 -<http://example.org/item1> <http://example.org/value> "10"^^<http://www.w3.org/2001/XMLSchema#int>.
     9.6 -<http://example.org/item1> <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry> "POINT(1 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>.
     9.7 -<http://example.org/item2> <http://example.org/id> "2"^^<http://www.w3.org/2001/XMLSchema#int>.
     9.8 -<http://example.org/item2> <http://example.org/value> "20"^^<http://www.w3.org/2001/XMLSchema#int>.
     9.9 -<http://example.org/item2> <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry> "POINT(2 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>.
    9.10 -<http://example.org/item3> <http://example.org/id> "3"^^<http://www.w3.org/2001/XMLSchema#int>.
    9.11 -<http://example.org/item3> <http://example.org/value> "30"^^<http://www.w3.org/2001/XMLSchema#int>.
    9.12 -<http://example.org/item3> <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry> "POINT(3 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>.
    10.1 --- a/testsuite/src/test/resources/TestStore.rq	Fri Apr 05 21:31:22 2013 +0300
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,3 +0,0 @@
    10.4 -SELECT *
    10.5 -WHERE{?s ?p ?o}
    10.6 -ORDER BY ?s ?p ?o
    10.7 \ No newline at end of file
    11.1 --- a/testsuite/src/test/resources/TestStore.sr	Fri Apr 05 21:31:22 2013 +0300
    11.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.3 @@ -1,9 +0,0 @@
    11.4 -[?=http://example.org/item1;?="1"^^<http://www.w3.org/2001/XMLSchema#int>;?=http://example.org/id]
    11.5 -[?=http://example.org/item1;?="10"^^<http://www.w3.org/2001/XMLSchema#int>;?=http://example.org/value]
    11.6 -[?=http://example.org/item1;?="POINT(1 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>;?=http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry]
    11.7 -[?=http://example.org/item2;?="2"^^<http://www.w3.org/2001/XMLSchema#int>;?=http://example.org/id]
    11.8 -[?=http://example.org/item2;?="20"^^<http://www.w3.org/2001/XMLSchema#int>;?=http://example.org/value]
    11.9 -[?=http://example.org/item2;?="POINT(2 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>;?=http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry]
   11.10 -[?=http://example.org/item3;?="3"^^<http://www.w3.org/2001/XMLSchema#int>;?=http://example.org/id]
   11.11 -[?=http://example.org/item3;?="30"^^<http://www.w3.org/2001/XMLSchema#int>;?=http://example.org/value]
   11.12 -[?=http://example.org/item3;?="POINT(3 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>;?=http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry]
   11.13 \ No newline at end of file