Author: reto
Date: Thu Jan 20 13:47:13 2011
New Revision: 1061301
URL: http://svn.apache.org/viewvc?rev=1061301&view=rev
Log:
simplified by removing work-around for now fixed issue
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java?rev=1061301&r1=1061300&r2=1061301&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java
Thu Jan 20 13:47:13 2011
@@ -96,17 +96,8 @@ public class TestJenaSerializerProvider
InputStream in = new
ByteArrayInputStream(serializedGraph.toByteArray());
Graph deserializedGraph = parse(in, "TURTLE");
- // due to http://issues.trialox.org/jira/browse/RDF-6 we cannot
just
- // check
- // that the two graphs are equals
- Assert.assertEquals(deserializedGraph.size(),
mGraph.getGraph().size());
- Assert.assertEquals(deserializedGraph.hashCode(),
mGraph.getGraph()
- .hashCode());
- // isomorphism delegated to jena
- JenaGraph jenaGraphFromNTriples = new
JenaGraph(deserializedGraph);
- JenaGraph jenaGraphFromTurtle = new
JenaGraph(mGraph.getGraph());
- Assert.assertTrue(jenaGraphFromNTriples
- .isIsomorphicWith(jenaGraphFromTurtle));
+ Assert.assertEquals(mGraph.getGraph(), deserializedGraph);
+
}
@@ -125,16 +116,7 @@ public class TestJenaSerializerProvider
InputStream in = new
ByteArrayInputStream(serializedGraph.toByteArray());
Graph deserializedGraph = parse(in, "RDF/XML-ABBREV");
- // due to http://issues.trialox.org/jira/browse/RDF-6 we cannot
just
- // check that the two graphs are equals
- Assert.assertEquals(deserializedGraph.size(),
mGraph.getGraph().size());
- Assert.assertEquals(deserializedGraph.hashCode(),
mGraph.getGraph()
- .hashCode());
- // isomorphism delegated to jena
- JenaGraph jenaGraphFromNTriples = new
JenaGraph(deserializedGraph);
- JenaGraph jenaGraphFromTurtle = new
JenaGraph(mGraph.getGraph());
- Assert.assertTrue(jenaGraphFromNTriples
- .isIsomorphicWith(jenaGraphFromTurtle));
+ Assert.assertEquals(mGraph.getGraph(), deserializedGraph);
}
/*
@@ -150,16 +132,7 @@ public class TestJenaSerializerProvider
InputStream in = new
ByteArrayInputStream(serializedGraph.toByteArray());
Graph deserializedGraph = parse(in, "N-TRIPLE");
- // due to http://issues.trialox.org/jira/browse/RDF-6 we cannot
just
- // check that the two graphs are equals
- Assert.assertEquals(deserializedGraph.size(),
mGraph.getGraph().size());
- Assert.assertEquals(deserializedGraph.hashCode(),
mGraph.getGraph()
- .hashCode());
- // isomorphism delegated to jena
- JenaGraph jenaGraphFromNTriples = new
JenaGraph(deserializedGraph);
- JenaGraph jenaGraphFromTurtle = new
JenaGraph(mGraph.getGraph());
- Assert.assertTrue(jenaGraphFromNTriples
- .isIsomorphicWith(jenaGraphFromTurtle));
+ Assert.assertEquals(mGraph.getGraph(), deserializedGraph);
}
/*
@@ -175,16 +148,7 @@ public class TestJenaSerializerProvider
InputStream in = new
ByteArrayInputStream(serializedGraph.toByteArray());
Graph deserializedGraph = parse(in, "N3");
- // due to http://issues.trialox.org/jira/browse/RDF-6 we cannot
just
- // check that the two graphs are equals
- Assert.assertEquals(deserializedGraph.size(),
mGraph.getGraph().size());
- Assert.assertEquals(deserializedGraph.hashCode(),
mGraph.getGraph()
- .hashCode());
- // isomorphism delegated to jena
- JenaGraph jenaGraphFromNTriples = new
JenaGraph(deserializedGraph);
- JenaGraph jenaGraphFromTurtle = new
JenaGraph(mGraph.getGraph());
- Assert.assertTrue(jenaGraphFromNTriples
- .isIsomorphicWith(jenaGraphFromTurtle));
+ Assert.assertEquals(mGraph.getGraph(), deserializedGraph);
}
private Graph parse(InputStream serializedGraph, String jenaFormat) {