afs commented on code in PR #2199: URL: https://github.com/apache/jena/pull/2199#discussion_r1454090431
########## jena-arq/src/test/java/org/apache/jena/sparql/graph/TestGraphTxn.java: ########## @@ -0,0 +1,107 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.jena.sparql.graph; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.util.NoSuchElementException; + +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.sparql.sse.SSE; +import org.apache.jena.util.iterator.ExtendedIterator; +import org.junit.Test; + +public class TestGraphTxn { + + private static Node s = SSE.parseNode(":s"); + private static Node p = SSE.parseNode(":p"); + private static Node o1 = SSE.parseNode(":o1"); + private static Node o2 = SSE.parseNode(":o2"); + private static Triple triple1 = Triple.create(s, p, o1); + private static Triple triple2 = Triple.create(s, p, o2); + + @Test public void graphTxn_add_find_add_01() { + // jena-core graph transaction + Graph graph = GraphFactory.createTxnGraph(); + graph.getTransactionHandler().execute(()->graph.add(triple1)); + assertEquals(1, graph.size()); + ExtendedIterator<Triple> eIter = graph.find(); + assertTrue(eIter.hasNext()); + eIter.next(); + // After .next, Not yet closed + eIter.hasNext(); + // Now closed. + // The implementation, DatasetGraphInMemory doesn't require transactions. + graph.add(triple2); Review Comment: These aren't full test of the graph. `GraphTxn` is wrapper around `DatasetGraphInMemory.getDefaultGraph` so the general "graphness" is that of the wrapped graph. The tests are for the added features - the transactions, both old style jena-core and current transactionals, how they interact, and the support for `ExtendedIterator` as came up in #2197. ########## jena-arq/src/test/java/org/apache/jena/sparql/graph/TestGraphTxn.java: ########## @@ -0,0 +1,107 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.jena.sparql.graph; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.util.NoSuchElementException; + +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.sparql.sse.SSE; +import org.apache.jena.util.iterator.ExtendedIterator; +import org.junit.Test; + +public class TestGraphTxn { + + private static Node s = SSE.parseNode(":s"); + private static Node p = SSE.parseNode(":p"); + private static Node o1 = SSE.parseNode(":o1"); + private static Node o2 = SSE.parseNode(":o2"); + private static Triple triple1 = Triple.create(s, p, o1); + private static Triple triple2 = Triple.create(s, p, o2); + + @Test public void graphTxn_add_find_add_01() { + // jena-core graph transaction + Graph graph = GraphFactory.createTxnGraph(); + graph.getTransactionHandler().execute(()->graph.add(triple1)); + assertEquals(1, graph.size()); + ExtendedIterator<Triple> eIter = graph.find(); + assertTrue(eIter.hasNext()); + eIter.next(); + // After .next, Not yet closed + eIter.hasNext(); + // Now closed. + // The implementation, DatasetGraphInMemory doesn't require transactions. + graph.add(triple2); + } + + @Test public void graphTxn_add_find_add_02() { + // jena-core graph transaction + Graph graph = GraphFactory.createTxnGraph(); + graph.getTransactionHandler().execute(()->graph.add(triple1)); + assertEquals(1, graph.size()); + ExtendedIterator<Triple> eIter = graph.find(); + try { + assertTrue(eIter.hasNext()); + eIter.next(); + } finally { eIter.close(); } + // Now closed. + // The implementation, DatasetGraphInMemory doesn't require transactions. + graph.add(triple2); + } + + @Test public void graphSteram01() { + GraphTxn graph = GraphFactory.createTxnGraph(); + graph.add(triple2); + graph.stream().count(); Review Comment: `count` consumes and ends a stream. Any consuming terminal will do. It causes the stream to be completely read. Behind the scenes, a stream from a GraphTxn is provided by an iterator and that which should call `GraphTxn.IteratorTxn.close`. `close` ends the READ transaction. `graph.add` fails if the READ transaction of iteration `graph.find` is still active. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
