Author: reto
Date: Thu Jun 17 20:13:29 2010
New Revision: 955725
URL: http://svn.apache.org/viewvc?rev=955725&view=rev
Log:
CLEREZZA-239: adapted tests
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/test/java/org/apache/clerezza/rdf/core/serializedform/ParserTest.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/test/java/org/apache/clerezza/rdf/core/serializedform/TestServiceManagedProvider.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.parser/src/test/java/org/apache/clerezza/rdf/jena/parser/JenaParserProviderTest.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.rdfjson/src/test/java/org/apache/clerezza/rdf/rdfjson/parser/RdfJsonParserProviderTest.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.rdfjson/src/test/java/org/apache/clerezza/rdf/rdfjson/serializer/RdfJsonSerializerProviderTest.java
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/test/java/org/apache/clerezza/rdf/core/serializedform/ParserTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/test/java/org/apache/clerezza/rdf/core/serializedform/ParserTest.java?rev=955725&r1=955724&r2=955725&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/test/java/org/apache/clerezza/rdf/core/serializedform/ParserTest.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/test/java/org/apache/clerezza/rdf/core/serializedform/ParserTest.java
Thu Jun 17 20:13:29 2010
@@ -72,7 +72,7 @@ public class ParserTest {
static class ParsingProviderA implements ParsingProvider {
@Override
- public Graph parse(InputStream serializedGraph, String
formatIdentifier) {
+ public Graph parse(InputStream serializedGraph, String
formatIdentifier, UriRef baseUri) {
providerAInvoked = true;
return null;
}
@@ -81,7 +81,7 @@ public class ParserTest {
static class ParsingProviderB implements ParsingProvider {
@Override
- public Graph parse(InputStream serializedGraph, String
formatIdentifier) {
+ public Graph parse(InputStream serializedGraph, String
formatIdentifier, UriRef baseUri) {
providerBInvoked = true;
return null;
}
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/test/java/org/apache/clerezza/rdf/core/serializedform/TestServiceManagedProvider.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/test/java/org/apache/clerezza/rdf/core/serializedform/TestServiceManagedProvider.java?rev=955725&r1=955724&r2=955725&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/test/java/org/apache/clerezza/rdf/core/serializedform/TestServiceManagedProvider.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/test/java/org/apache/clerezza/rdf/core/serializedform/TestServiceManagedProvider.java
Thu Jun 17 20:13:29 2010
@@ -16,34 +16,35 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.clerezza.rdf.core.serializedform;
-
-import java.io.InputStream;
-import org.junit.Assert;
-import org.junit.Test;
-import org.apache.clerezza.rdf.core.Graph;
-
-/**
- * This class is listed in
- * META-INF/services/org.apache.clerezza.serializedform.ParsingProvider
- *
- * @author reto
- */
-...@supportedformat("application/x-test+rdf")
-public class TestServiceManagedProvider implements ParsingProvider {
-
- private static boolean parseInvoked;
-
- @Override
- public Graph parse(InputStream serializedGraph, String
formatIdentifier) {
- parseInvoked = true;
- return null;
- }
-
- @Test
- public void registerOneProvider() {
- Parser parser = Parser.getInstance();
- parser.parse(null, "application/x-test+rdf");
- Assert.assertTrue(parseInvoked);
- }
-}
+package org.apache.clerezza.rdf.core.serializedform;
+
+import java.io.InputStream;
+import org.junit.Assert;
+import org.junit.Test;
+import org.apache.clerezza.rdf.core.Graph;
+import org.apache.clerezza.rdf.core.UriRef;
+
+/**
+ * This class is listed in
+ * META-INF/services/org.apache.clerezza.serializedform.ParsingProvider
+ *
+ * @author reto
+ */
+...@supportedformat("application/x-test+rdf")
+public class TestServiceManagedProvider implements ParsingProvider {
+
+ private static boolean parseInvoked;
+
+ @Override
+ public Graph parse(InputStream serializedGraph, String
formatIdentifier, UriRef baseUri) {
+ parseInvoked = true;
+ return null;
+ }
+
+ @Test
+ public void registerOneProvider() {
+ Parser parser = Parser.getInstance();
+ parser.parse(null, "application/x-test+rdf");
+ Assert.assertTrue(parseInvoked);
+ }
+}
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.parser/src/test/java/org/apache/clerezza/rdf/jena/parser/JenaParserProviderTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.parser/src/test/java/org/apache/clerezza/rdf/jena/parser/JenaParserProviderTest.java?rev=955725&r1=955724&r2=955725&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.parser/src/test/java/org/apache/clerezza/rdf/jena/parser/JenaParserProviderTest.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.parser/src/test/java/org/apache/clerezza/rdf/jena/parser/JenaParserProviderTest.java
Thu Jun 17 20:13:29 2010
@@ -42,8 +42,8 @@ public class JenaParserProviderTest {
ParsingProvider provider = new JenaParserProvider();
InputStream nTriplesIn =
getClass().getResourceAsStream("test-04.nt");
InputStream turtleIn =
getClass().getResourceAsStream("test-04.ttl");
- Graph graphFromNTriples = provider.parse(nTriplesIn,
"text/rdf+nt");
- Graph graphFromTurtle = provider.parse(turtleIn, "text/turtle");
+ Graph graphFromNTriples = provider.parse(nTriplesIn,
"text/rdf+nt", null);
+ Graph graphFromTurtle = provider.parse(turtleIn, "text/turtle",
null);
//due to http://issues.trialox.org/jira/browse/RDF-6 we cannot
just check
//that the two graphs are equals
Assert.assertEquals(graphFromNTriples.size(),
graphFromTurtle.size());
@@ -62,8 +62,8 @@ public class JenaParserProviderTest {
ParsingProvider provider = new JenaParserProvider();
InputStream nTriplesIn =
getClass().getResourceAsStream("test-04.nt");
InputStream rdfIn =
getClass().getResourceAsStream("test-04.rdf");
- Graph graphFromNTriples = provider.parse(nTriplesIn,
"text/rdf+nt");
- Graph graphFromTurtle = provider.parse(rdfIn,
"application/rdf+xml");
+ Graph graphFromNTriples = provider.parse(nTriplesIn,
"text/rdf+nt", null);
+ Graph graphFromTurtle = provider.parse(rdfIn,
"application/rdf+xml", null);
//due to http://issues.trialox.org/jira/browse/RDF-6 we cannot
just check
//that the two graphs are equals
Assert.assertEquals(graphFromNTriples.size(),
graphFromTurtle.size());
@@ -79,8 +79,8 @@ public class JenaParserProviderTest {
ParsingProvider provider = new JenaParserProvider();
InputStream nTriplesIn =
getClass().getResourceAsStream("test-04.nt");
InputStream turtleIn =
getClass().getResourceAsStream("test-04.ttl");
- Graph graphFromNTriples = provider.parse(nTriplesIn,
"text/rdf+nt");
- Graph graphFromTurtle = provider.parse(turtleIn,
"text/turtle;charset=UTF-");
+ Graph graphFromNTriples = provider.parse(nTriplesIn,
"text/rdf+nt", null);
+ Graph graphFromTurtle = provider.parse(turtleIn,
"text/turtle;charset=UTF-", null);
//due to http://issues.trialox.org/jira/browse/RDF-6 we cannot
just check
//that the two graphs are equals
Assert.assertEquals(graphFromNTriples.size(),
graphFromTurtle.size());
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.rdfjson/src/test/java/org/apache/clerezza/rdf/rdfjson/parser/RdfJsonParserProviderTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.rdfjson/src/test/java/org/apache/clerezza/rdf/rdfjson/parser/RdfJsonParserProviderTest.java?rev=955725&r1=955724&r2=955725&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.rdfjson/src/test/java/org/apache/clerezza/rdf/rdfjson/parser/RdfJsonParserProviderTest.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.rdfjson/src/test/java/org/apache/clerezza/rdf/rdfjson/parser/RdfJsonParserProviderTest.java
Thu Jun 17 20:13:29 2010
@@ -41,7 +41,7 @@ public class RdfJsonParserProviderTest {
public void testParser() {
ParsingProvider provider = new RdfJsonParsingProvider();
InputStream jsonIn =
getClass().getResourceAsStream("test.json");
- Graph graphFromJsonRdf = provider.parse(jsonIn,
"application/rdf+json");
+ Graph graphFromJsonRdf = provider.parse(jsonIn,
"application/rdf+json", null);
Assert.assertEquals(graphFromJsonRdf.size(), 6);
Iterator<Triple> triples = graphFromJsonRdf.filter(new
UriRef("http://base/child1";), null, null);
while(triples.hasNext()) {
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.rdfjson/src/test/java/org/apache/clerezza/rdf/rdfjson/serializer/RdfJsonSerializerProviderTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.rdfjson/src/test/java/org/apache/clerezza/rdf/rdfjson/serializer/RdfJsonSerializerProviderTest.java?rev=955725&r1=955724&r2=955725&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.rdfjson/src/test/java/org/apache/clerezza/rdf/rdfjson/serializer/RdfJsonSerializerProviderTest.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.rdfjson/src/test/java/org/apache/clerezza/rdf/rdfjson/serializer/RdfJsonSerializerProviderTest.java
Thu Jun 17 20:13:29 2010
@@ -80,7 +80,7 @@ public class RdfJsonSerializerProviderTe
ByteArrayInputStream jsonIn = new
ByteArrayInputStream(serializedGraph
.toByteArray());
Graph graphFromJsonRdf = parsingProvider.parse(jsonIn,
- "application/rdf+json");
+ "application/rdf+json", null);
Assert.assertEquals(graphFromJsonRdf.size(), 6);
}
