Author: rwesten
Date: Tue Aug 14 08:56:50 2012
New Revision: 1372786
URL: http://svn.apache.org/viewvc?rev=1372786&view=rev
Log:
fix for CLEREZZA-714: the getTriples(UriRef) method now correctly calls
getGraph(UriRef) if the {union-grpah} URI is parsed. Also added an assertion to
the unit tests that explicitly checks the getTriples does correctly return the
union graph.
Modified:
incubator/clerezza/trunk/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java
incubator/clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java
Modified:
incubator/clerezza/trunk/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java?rev=1372786&r1=1372785&r2=1372786&view=diff
==============================================================================
---
incubator/clerezza/trunk/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java
(original)
+++
incubator/clerezza/trunk/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java
Tue Aug 14 08:56:50 2012
@@ -553,9 +553,9 @@ public class SingleTdbDatasetTcProvider
throw new IllegalArgumentException("The parsed Graph UriRef MUST
NOT be NULL!");
}
synchronized (dataset) {
- if(graphNames.contains(name)){
+ if(graphNames.contains(name) || name.equals(defaultGraphName)){
return getGraph(name);
- } else if(mGraphNames.contains(name) ||
name.equals(defaultGraphName)){
+ } else if(mGraphNames.contains(name)){
return getMGraph(name);
} else {
throw new NoSuchEntityException(name);
Modified:
incubator/clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java?rev=1372786&r1=1372785&r2=1372786&view=diff
==============================================================================
---
incubator/clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java
(original)
+++
incubator/clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java
Tue Aug 14 08:56:50 2012
@@ -122,6 +122,10 @@ public class SingleTdbDatasetTcProviderT
//now get the union graph
Graph data = provider.getGraph(UNION_GRAPH_NAME);
+ Assert.assertNotNull(data);
+ //CLEREZZA-714: getTriples need to correctly return the UnionGraph
+ data = (Graph)provider.getTriples(UNION_GRAPH_NAME);
+ Assert.assertNotNull(data);
//NOTE: Jena TDB does not support getSize for the union graph
// int expectedTripleCount = persons.size()+orgdata.size();
// Assert.assertEquals("Uniongraph has "+data.size()
