[Bigdata-commit] SF.net SVN: bigdata:[8566] branches/SESAME_2_7

[<mrp...@us...>]

Revision: 8566
          http://sourceforge.net/p/bigdata/code/8566
Author:   mrpersonick
Date:     2014-07-17 14:10:21 +0000 (Thu, 17 Jul 2014)
Log Message:
-----------
trying to get the tests to compile and run in ant

Modified Paths:
--------------
    branches/SESAME_2_7/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLUpdateTest.java
    branches/SESAME_2_7/bigdata-sails/src/test/org/openrdf/repository/RepositoryConnectionTest.java
    branches/SESAME_2_7/build.xml

Modified: branches/SESAME_2_7/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLUpdateTest.java
===================================================================
--- branches/SESAME_2_7/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLUpdateTest.java	2014-07-17 13:01:23 UTC (rev 8565)
+++ branches/SESAME_2_7/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLUpdateTest.java	2014-07-17 14:10:21 UTC (rev 8566)
@@ -19,24 +19,14 @@
  */
 package org.openrdf.query.parser.sparql;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.io.IOException;
 import java.io.InputStream;
 
 import junit.framework.TestCase;
-import junit.framework.TestCase2;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.openrdf.model.BNode;
 import org.openrdf.model.Literal;
 import org.openrdf.model.Resource;
@@ -60,6 +50,8 @@
 import org.openrdf.repository.RepositoryResult;
 import org.openrdf.rio.RDFFormat;
 import org.openrdf.rio.RDFParseException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.bigdata.rdf.store.BD;
 

Modified: branches/SESAME_2_7/bigdata-sails/src/test/org/openrdf/repository/RepositoryConnectionTest.java
===================================================================
--- branches/SESAME_2_7/bigdata-sails/src/test/org/openrdf/repository/RepositoryConnectionTest.java	2014-07-17 13:01:23 UTC (rev 8565)
+++ branches/SESAME_2_7/bigdata-sails/src/test/org/openrdf/repository/RepositoryConnectionTest.java	2014-07-17 14:10:21 UTC (rev 8566)
@@ -198,8 +198,6 @@
 
 	protected Literal mboxBob;
 
-	protected Literal Александър;
-
 	public RepositoryConnectionTest(String name) {
 	    super(name);
 	}
@@ -233,8 +231,6 @@
 		mboxAlice = vf.createLiteral("al...@ex...");
 		mboxBob = vf.createLiteral("bo...@ex...");
 
-		Александър = vf.createLiteral("Александър");
-
 		unknownContext = new URIImpl("urn:unknownContext");
 
 		context1 = vf.createURI("urn:x-local:graph1");
@@ -598,44 +594,6 @@
 		}
 	}
 
-//	@Test
-//	public void testPrepareSeRQLQuery()
-//		throws Exception
-//	{
-//
-//		StringBuilder queryBuilder = new StringBuilder();
-//		queryBuilder.append(" SELECT ?person");
-//		queryBuilder.append(" FROM {person} foaf:name {").append(Александър.getLabel()).append("}");
-//		queryBuilder.append(" USING NAMESPACE foaf = <" + FOAF_NS + ">");
-//
-//		try {
-//			testCon.prepareQuery(QueryLanguage.SERQL, queryBuilder.toString());
-//		}
-//		catch (UnsupportedOperationException e) {
-//			fail(UNSUPPORTED_OP + e.getMessage());
-//		}
-//		catch (ClassCastException e) {
-//			fail(UNEXPECTED_TYPE + e.getMessage());
-//		}
-//
-//		queryBuilder = new StringBuilder();
-//		queryBuilder.append(" (SELECT person");
-//		queryBuilder.append(" FROM {person} foaf:name {").append(Александър.getLabel()).append("}");
-//		queryBuilder.append(") UNION ");
-//		queryBuilder.append("(SELECT x FROM {x} p {y} )");
-//		queryBuilder.append(" USING NAMESPACE foaf = <" + FOAF_NS + ">");
-//
-//		try {
-//			testCon.prepareQuery(QueryLanguage.SERQL, queryBuilder.toString());
-//		}
-//		catch (UnsupportedOperationException e) {
-//			fail(UNSUPPORTED_OP + e.getMessage());
-//		}
-//		catch (ClassCastException e) {
-//			fail(UNEXPECTED_TYPE + e.getMessage());
-//		}
-//	}
-
 	@Test
 	public void testPrepareSPARQLQuery()
 		throws Exception
@@ -676,30 +634,6 @@
 	}
 
 	@Test
-	public void testSimpleTupleQueryUnicode()
-		throws Exception
-	{
-		testCon.add(alexander, name, Александър);
-		StringBuilder queryBuilder = new StringBuilder(128);
-        queryBuilder.append(" prefix foaf: <" + FOAF_NS + ">");
-        queryBuilder.append(" SELECT ?person");
-        queryBuilder.append(" where { ?person foaf:name \"").append(Александър.getLabel()).append("\"}");
-		TupleQueryResult result = testCon.prepareTupleQuery(QueryLanguage.SPARQL, queryBuilder.toString()).evaluate();
-		try {
-			assertThat(result, is(notNullValue()));
-			assertThat(result.hasNext(), is(equalTo(true)));
-			while (result.hasNext()) {
-				BindingSet solution = result.next();
-				assertThat(solution.hasBinding(PERSON), is(equalTo(true)));
-				assertThat(solution.getValue(PERSON), is(equalTo((Value)alexander)));
-			}
-		}
-		finally {
-			result.close();
-		}
-	}
-
-	@Test
 	public void testPreparedTupleQuery()
 		throws Exception
 	{
@@ -770,37 +704,6 @@
 	}
 
 	@Test
-	public void testPreparedTupleQueryUnicode()
-		throws Exception
-	{
-		testCon.add(alexander, name, Александър);
-
-		StringBuilder queryBuilder = new StringBuilder();
-        queryBuilder.append(" prefix foaf: <" + FOAF_NS + ">");
-        queryBuilder.append(" SELECT ?person");
-        queryBuilder.append(" where { ?person foaf:name ?name }");
-
-		TupleQuery query = testCon.prepareTupleQuery(QueryLanguage.SPARQL, queryBuilder.toString());
-		query.setBinding(NAME, Александър);
-
-		TupleQueryResult result = query.evaluate();
-
-		try {
-			assertThat(result, is(notNullValue()));
-			assertThat(result.hasNext(), is(equalTo(true)));
-
-			while (result.hasNext()) {
-				BindingSet solution = result.next();
-				assertThat(solution.hasBinding(PERSON), is(equalTo(true)));
-				assertThat(solution.getValue(PERSON), is(equalTo((Value)alexander)));
-			}
-		}
-		finally {
-			result.close();
-		}
-	}
-
-	@Test
 	public void testSimpleGraphQuery()
 		throws Exception
 	{

Modified: branches/SESAME_2_7/build.xml
===================================================================
--- branches/SESAME_2_7/build.xml	2014-07-17 13:01:23 UTC (rev 8565)
+++ branches/SESAME_2_7/build.xml	2014-07-17 14:10:21 UTC (rev 8566)
@@ -1792,7 +1792,8 @@
       <!-- is available, change the corresponding property value set  -->
       <!-- below.                                                     -->
 
-      <property name="junit.jar" location="${bigdata.lib}/junit-3.8.1.jar" />
+      <property name="junit.jar" location="${bigdata.lib}/junit-4.11.jar" />
+      <property name="hamcrest.jar" location="${bigdata.lib}/hamcrest-core-1.3.jar" />
       <property name="junit-ext.jar" location="${bigdata.lib}/junit-ext-1.1-b3-dev.jar" />
       <property name="sesame-sparql-test.jar" location="${bigdata-sails.lib}/sesame-sparql-testsuite-${sesame.version}.jar" />
       <property name="sesame-store-test.jar" location="${bigdata-sails.lib}/sesame-store-testsuite-${sesame.version}.jar" />
@@ -1809,7 +1810,7 @@
 
         <!-- TODO ${path.separator}${dist.lib}/bigdata-gas.jar -->
       <property name="javac.test.classpath"
-         value="${classes.dir}${path.separator}${junit.jar}${path.separator}${junit-ext.jar}${path.separator}${sesame-sparql-test.jar}${path.separator}${sesame-store-test.jar}${path.separator}${sesame-rio-test.jar}${path.separator}${dist.lib}/classserver.jar${path.separator}${dist.lib}/highscalelib.jar${path.separator}${dist.lib}/dsiutils.jar${path.separator}${dist.lib}/lgplutils.jar${path.separator}${dist.lib}/fastutil.jar${path.separator}${dist.lib}/bigdata-ganglia.jar${path.separator}${dist.lib}/icu4j.jar${path.separator}${dist.lib}/icu4j-charset.jar${path.separator}${dist.lib}/log4j.jar${path.separator}${dist.lib}/lucene-analyzer.jar${path.separator}${dist.lib}/lucene-core.jar${path.separator}${path.separator}${dist.lib}/openrdf-sesame.jar${path.separator}${dist.lib}/slf4j.jar${path.separator}${dist.lib}/jsk-lib.jar${path.separator}${dist.lib}/jsk-platform.jar${path.separator}${dist.lib}/nxparser.jar${path.separator}${dist.lib}/zookeeper.jar${path.separator}${dist.lib}/jetty-continuation.jar${path.separator}${dist.lib}/jetty-http.jar${path.separator}${dist.lib}/jetty-io.jar${path.separator}${dist.lib}/jetty-jmx.jar${path.separator}${dist.lib}/jetty-jndi.jar${path.separator}${dist.lib}/jetty-server.jar${path.separator}${dist.lib}/jetty-util.jar${path.separator}${dist.lib}/jetty-webapp.jar${path.separator}${dist.lib}/jetty-servlet.jar${path.separator}${dist.lib}/jetty-security.jar${path.separator}${dist.lib}/jetty-xml.jar${path.separator}${dist.lib}/jetty-rewrite.jar${path.separator}${dist.lib}/jetty-client.jar${path.separator}${dist.lib}/jetty-proxy.jar${path.separator}${dist.lib}/servlet-api.jar${path.separator}${dist.lib}/commons-codec.jar${path.separator}${dist.lib}/commons-fileupload.jar${path.separator}${dist.lib}/commons-io.jar${path.separator}${dist.lib}/commons-logging.jar${path.separator}${dist.lib}/httpclient.jar${path.separator}${dist.lib}/httpclient-cache.jar${path.separator}${dist.lib}/httpcore.jar${path.separator}${dist.lib}/httpmime.jar${path.separator}${dist.lib}/blueprints-core.jar${path.separator}${blueprints-test.jar}${path.separator}${jettison.jar}" />
+         value="${classes.dir}${path.separator}${junit.jar}${path.separator}${hamcrest.jar}${path.separator}${junit-ext.jar}${path.separator}${sesame-sparql-test.jar}${path.separator}${sesame-store-test.jar}${path.separator}${sesame-rio-test.jar}${path.separator}${dist.lib}/classserver.jar${path.separator}${dist.lib}/highscalelib.jar${path.separator}${dist.lib}/dsiutils.jar${path.separator}${dist.lib}/lgplutils.jar${path.separator}${dist.lib}/fastutil.jar${path.separator}${dist.lib}/bigdata-ganglia.jar${path.separator}${dist.lib}/icu4j.jar${path.separator}${dist.lib}/icu4j-charset.jar${path.separator}${dist.lib}/log4j.jar${path.separator}${dist.lib}/lucene-analyzer.jar${path.separator}${dist.lib}/lucene-core.jar${path.separator}${path.separator}${dist.lib}/openrdf-sesame.jar${path.separator}${dist.lib}/slf4j.jar${path.separator}${dist.lib}/jsk-lib.jar${path.separator}${dist.lib}/jsk-platform.jar${path.separator}${dist.lib}/nxparser.jar${path.separator}${dist.lib}/zookeeper.jar${path.separator}${dist.lib}/jetty-continuation.jar${path.separator}${dist.lib}/jetty-http.jar${path.separator}${dist.lib}/jetty-io.jar${path.separator}${dist.lib}/jetty-jmx.jar${path.separator}${dist.lib}/jetty-jndi.jar${path.separator}${dist.lib}/jetty-server.jar${path.separator}${dist.lib}/jetty-util.jar${path.separator}${dist.lib}/jetty-webapp.jar${path.separator}${dist.lib}/jetty-servlet.jar${path.separator}${dist.lib}/jetty-security.jar${path.separator}${dist.lib}/jetty-xml.jar${path.separator}${dist.lib}/jetty-rewrite.jar${path.separator}${dist.lib}/jetty-client.jar${path.separator}${dist.lib}/jetty-proxy.jar${path.separator}${dist.lib}/servlet-api.jar${path.separator}${dist.lib}/commons-codec.jar${path.separator}${dist.lib}/commons-fileupload.jar${path.separator}${dist.lib}/commons-io.jar${path.separator}${dist.lib}/commons-logging.jar${path.separator}${dist.lib}/httpclient.jar${path.separator}${dist.lib}/httpclient-cache.jar${path.separator}${dist.lib}/httpcore.jar${path.separator}${dist.lib}/httpmime.jar${path.separator}${dist.lib}/blueprints-core.jar${path.separator}${blueprints-test.jar}${path.separator}${jettison.jar}" />
             
         <echo>javac
 </echo>
@@ -2145,6 +2146,7 @@
 
       <path id="run.class.path.id">
         <pathelement location="${junit.jar}" />
+        <pathelement location="${hamcrest.jar}" />
         <pathelement location="${bigdata-test.jar}" />
         <pathelement location="${junit-ext.jar}" />
         <pathelement location="${sesame-sparql-test.jar}" />
@@ -2202,7 +2204,7 @@
       </path>
 
       <property name="run.class.path"
-         value="${junit.jar}${path.separator}${bigdata-test.jar}${path.separator}${junit-ext.jar}${path.separator}${sesame-sparql-test.jar}${path.separator}${sesame-store-test.jar}${path.separator}${sesame-rio-test.jar}${path.separator}${dist.lib}/bigdata.jar${path.separator}${dist.lib}/colt.jar${path.separator}${dist.lib}/highscalelib.jar${path.separator}${dist.lib}/dsiutils.jar${path.separator}${dist.lib}/lgplutils.jar${path.separator}${dist.lib}/fastutil.jar${path.separator}${dist.lib}/bigdata-ganglia.jar${path.separator}${dist.lib}/bigdata-gas${path.separator}${dist.lib}/icu4j.jar${path.separator}${dist.lib}/icu4j-charset.jar${path.separator}${dist.lib}/jsk-lib.jar${path.separator}${dist.lib}/jsk-platform.jar${path.separator}${dist.lib}/log4j.jar${path.separator}${dist.lib}/lucene-analyzer.jar${path.separator}${dist.lib}/lucene-core.jar${path.separator}${dist.lib}/openrdf-sesame.jar${path.separator}${dist.lib}/slf4j.jar${path.separator}${dist.lib}/slf4j-log4j.jar${path.separator}${dist.lib}/nxparser.jar${path.separator}${dist.lib}/zookeeper.jar${path.separator}${dist.lib}/jetty-continuation.jar${path.separator}${dist.lib}/jetty-http.jar${path.separator}${dist.lib}/jetty-io.jar${path.separator}${dist.lib}/jetty-jmx.jar${path.separator}${dist.lib}/jetty-jndi.jar${path.separator}${dist.lib}/jetty-server.jar${path.separator}${dist.lib}/jetty-util.jar${path.separator}${dist.lib}/jetty-webapp.jar${path.separator}${dist.lib}/jetty-servlet.jar${path.separator}${dist.lib}/jetty-security.jar${path.separator}${dist.lib}/jetty-xml.jar${path.separator}${dist.lib}/jetty-rewrite.jar${path.separator}${dist.lib}/jetty-client.jar${path.separator}${dist.lib}/jetty-proxy.jar${path.separator}${dist.lib}/servlet-api.jar${path.separator}${dist.lib}/commons-codec.jar${path.separator}${dist.lib}/commons-fileupload.jar${path.separator}${dist.lib}/commons-io.jar${path.separator}${dist.lib}/commons-logging.jar${path.separator}${dist.lib}/httpclient.jar${path.separator}${dist.lib}/httpclient-cache.jar${path.separator}${dist.lib}/httpcore.jar${path.separator}${dist.lib}/httpmime.jar${path.separator}${dist.lib}/blueprints-core.jar${path.separator}${blueprints-test.jar}${path.separator}${jettison.jar}" />
+         value="${junit.jar}${path.separator}${hamcrest.jar}${path.separator}${bigdata-test.jar}${path.separator}${junit-ext.jar}${path.separator}${sesame-sparql-test.jar}${path.separator}${sesame-store-test.jar}${path.separator}${sesame-rio-test.jar}${path.separator}${dist.lib}/bigdata.jar${path.separator}${dist.lib}/colt.jar${path.separator}${dist.lib}/highscalelib.jar${path.separator}${dist.lib}/dsiutils.jar${path.separator}${dist.lib}/lgplutils.jar${path.separator}${dist.lib}/fastutil.jar${path.separator}${dist.lib}/bigdata-ganglia.jar${path.separator}${dist.lib}/bigdata-gas${path.separator}${dist.lib}/icu4j.jar${path.separator}${dist.lib}/icu4j-charset.jar${path.separator}${dist.lib}/jsk-lib.jar${path.separator}${dist.lib}/jsk-platform.jar${path.separator}${dist.lib}/log4j.jar${path.separator}${dist.lib}/lucene-analyzer.jar${path.separator}${dist.lib}/lucene-core.jar${path.separator}${dist.lib}/openrdf-sesame.jar${path.separator}${dist.lib}/slf4j.jar${path.separator}${dist.lib}/slf4j-log4j.jar${path.separator}${dist.lib}/nxparser.jar${path.separator}${dist.lib}/zookeeper.jar${path.separator}${dist.lib}/jetty-continuation.jar${path.separator}${dist.lib}/jetty-http.jar${path.separator}${dist.lib}/jetty-io.jar${path.separator}${dist.lib}/jetty-jmx.jar${path.separator}${dist.lib}/jetty-jndi.jar${path.separator}${dist.lib}/jetty-server.jar${path.separator}${dist.lib}/jetty-util.jar${path.separator}${dist.lib}/jetty-webapp.jar${path.separator}${dist.lib}/jetty-servlet.jar${path.separator}${dist.lib}/jetty-security.jar${path.separator}${dist.lib}/jetty-xml.jar${path.separator}${dist.lib}/jetty-rewrite.jar${path.separator}${dist.lib}/jetty-client.jar${path.separator}${dist.lib}/jetty-proxy.jar${path.separator}${dist.lib}/servlet-api.jar${path.separator}${dist.lib}/commons-codec.jar${path.separator}${dist.lib}/commons-fileupload.jar${path.separator}${dist.lib}/commons-io.jar${path.separator}${dist.lib}/commons-logging.jar${path.separator}${dist.lib}/httpclient.jar${path.separator}${dist.lib}/httpclient-cache.jar${path.separator}${dist.lib}/httpcore.jar${path.separator}${dist.lib}/httpmime.jar${path.separator}${dist.lib}/blueprints-core.jar${path.separator}${blueprints-test.jar}${path.separator}${jettison.jar}" />
         
       <echo>    classpath:    ${run.class.path}
 </echo>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.