You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2014/06/24 11:07:06 UTC
svn commit: r1605034 [14/16] - in /jena/trunk: jena-arq/src/main/java/arq/
jena-arq/src/main/java/arq/cmdline/
jena-arq/src/main/java/com/hp/hpl/jena/query/
jena-arq/src/main/java/com/hp/hpl/jena/sparql/
jena-arq/src/main/java/com/hp/hpl/jena/sparql/al...
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestObjects.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestObjects.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestObjects.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestObjects.java Tue Jun 24 09:06:50 2014
@@ -57,7 +57,7 @@ public class TestObjects extends Abstrac
protected Set<Statement> fill( final Model model )
{
- final Set<Statement> statements = new HashSet<Statement>();
+ final Set<Statement> statements = new HashSet<>();
for (int i = 0; i < TestObjects.numberSubjects; i += 1)
{
for (int j = 0; j < TestObjects.numberPredicates; j += 1)
@@ -80,7 +80,7 @@ public class TestObjects extends Abstrac
protected Set<Literal> literalsFor( final int predicate )
{
- final Set<Literal> result = new HashSet<Literal>();
+ final Set<Literal> result = new HashSet<>();
for (int i = 0; i < TestObjects.numberSubjects; i += 1)
{
result.add(model
@@ -92,7 +92,7 @@ public class TestObjects extends Abstrac
protected Set<Literal> literalsUpto( final int limit )
{
- final Set<Literal> result = new HashSet<Literal>();
+ final Set<Literal> result = new HashSet<>();
for (int i = 0; i < limit; i += 1)
{
result.add(model.createTypedLiteral(i));
@@ -102,7 +102,7 @@ public class TestObjects extends Abstrac
protected Set<String> predicateSet( final int limit )
{
- final Set<String> result = new HashSet<String>();
+ final Set<String> result = new HashSet<>();
for (int i = 0; i < limit; i += 1)
{
result.add(TestObjects.predicatePrefix + i + "/");
@@ -120,7 +120,7 @@ public class TestObjects extends Abstrac
protected Set<Resource> subjectSet( final int limit )
{
- final Set<Resource> result = new HashSet<Resource>();
+ final Set<Resource> result = new HashSet<>();
for (int i = 0; i < limit; i += 1)
{
result.add(ModelHelper.resource(TestObjects.subjectPrefix + i));
@@ -142,7 +142,7 @@ public class TestObjects extends Abstrac
final List<String> L = model.listNameSpaces().toList();
Assert.assertEquals(TestObjects.numberPredicates, L.size());
final Set<String> wanted = predicateSet(TestObjects.numberPredicates);
- Assert.assertEquals(wanted, new HashSet<String>(L));
+ Assert.assertEquals(wanted, new HashSet<>(L));
}
public void testListObjects()
@@ -162,7 +162,7 @@ public class TestObjects extends Abstrac
.property(TestObjects.predicatePrefix + "0/p")));
Assert.assertEquals(TestObjects.numberSubjects, L.size());
final Set<Literal> wanted = literalsFor(0);
- Assert.assertEquals(wanted, new HashSet<RDFNode>(L));
+ Assert.assertEquals(wanted, new HashSet<>(L));
}
public void testListObjectsOfPropertyBySubject()
@@ -177,7 +177,7 @@ public class TestObjects extends Abstrac
.listObjectsOfProperty(s, RDF.value));
Assert.assertEquals(size, L.size());
final Set<Literal> wanted = literalsUpto(size);
- Assert.assertEquals(wanted, new HashSet<RDFNode>(L));
+ Assert.assertEquals(wanted, new HashSet<>(L));
}
public void testListStatements()
@@ -185,7 +185,7 @@ public class TestObjects extends Abstrac
final Set<Statement> statements = fill(model);
final List<Statement> L = model.listStatements().toList();
Assert.assertEquals(statements.size(), L.size());
- Assert.assertEquals(statements, new HashSet<Statement>(L));
+ Assert.assertEquals(statements, new HashSet<>(L));
}
public void testListSubjects()
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRDFNodes.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRDFNodes.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRDFNodes.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRDFNodes.java Tue Jun 24 09:06:50 2014
@@ -134,7 +134,7 @@ public class TestRDFNodes extends Abstra
public void testRDFVisitor()
{
- final List<String> history = new ArrayList<String>();
+ final List<String> history = new ArrayList<>();
final Model m = ModelFactory.createDefaultModel();
final RDFNode S = m.createResource();
final RDFNode P = m.createProperty("eh:PP");
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRDFWriterMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRDFWriterMap.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRDFWriterMap.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRDFWriterMap.java Tue Jun 24 09:06:50 2014
@@ -42,7 +42,7 @@ public class TestRDFWriterMap extends Je
{
public static class RDFWriterMap implements RDFWriterF
{
- protected final Map<String, Class<RDFWriter>> map = new HashMap<String, Class<RDFWriter>>();
+ protected final Map<String, Class<RDFWriter>> map = new HashMap<>();
public RDFWriterMap( final boolean preloadDefaults )
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReifiedStatements.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReifiedStatements.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReifiedStatements.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReifiedStatements.java Tue Jun 24 09:06:50 2014
@@ -134,7 +134,7 @@ public class TestReifiedStatements exten
{
final int i = n - 1;
final Statement s = (Statement) statements[i][0];
- final int bits = ((Integer) statements[i][1]).intValue();
+ final int bits = (Integer) statements[i][1];
testCombinations(m, R, mask, statements, i);
m.add(s);
testCombinations(m, R, mask + bits, statements, i);
@@ -320,19 +320,16 @@ public class TestReifiedStatements exten
.createResource(TestReifiedStatements.anotherURI);
final Property PP = RR.as(Property.class);
final Object[][] statements = {
- { model.createStatement(RR, RDF.type, RDF.Statement),
- new Integer(1) },
- { model.createStatement(RR, RDF.subject, SS), new Integer(2) },
- { model.createStatement(RR, RDF.predicate, PP), new Integer(4) },
- { model.createStatement(RR, RDF.object, O), new Integer(8) },
- { model.createStatement(SS, PP, O), new Integer(16) },
- { model.createStatement(RR, PP, O), new Integer(32) },
- { model.createStatement(SS, RDF.subject, SS), new Integer(64) },
- { model.createStatement(SS, RDF.predicate, PP),
- new Integer(128) },
- { model.createStatement(SS, RDF.object, O), new Integer(256) },
- { model.createStatement(SS, RDF.type, RDF.Statement),
- new Integer(512) } };
+ { model.createStatement(RR, RDF.type, RDF.Statement), 1 },
+ { model.createStatement(RR, RDF.subject, SS), 2 },
+ { model.createStatement(RR, RDF.predicate, PP), 4 },
+ { model.createStatement(RR, RDF.object, O), 8 },
+ { model.createStatement(SS, PP, O), 16 },
+ { model.createStatement(RR, PP, O), 32 },
+ { model.createStatement(SS, RDF.subject, SS), 64 },
+ { model.createStatement(SS, RDF.predicate, PP), 128 },
+ { model.createStatement(SS, RDF.object, O), 256 },
+ { model.createStatement(SS, RDF.type, RDF.Statement), 512 } };
testCombinations(model, RR, 0, statements, statements.length);
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRemoveSPO.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRemoveSPO.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRemoveSPO.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRemoveSPO.java Tue Jun 24 09:06:50 2014
@@ -48,7 +48,7 @@ public class TestRemoveSPO extends Abstr
public void testRemoveSPOCallsGraphDeleteTriple()
{
- final List<Triple> deleted = new ArrayList<Triple>();
+ final List<Triple> deleted = new ArrayList<>();
final Graph base = new WrappedGraph(model.getGraph()) {
@Override
public void delete( final Triple t )
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResourceFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResourceFactory.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResourceFactory.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResourceFactory.java Tue Jun 24 09:06:50 2014
@@ -178,7 +178,7 @@ public class TestResourceFactory extends
public void testCreateTypedLiteralObject()
{
- final Literal l = ResourceFactory.createTypedLiteral(new Integer(22));
+ final Literal l = ResourceFactory.createTypedLiteral( 22 );
Assert.assertEquals("22", l.getLexicalForm());
Assert.assertEquals("", l.getLanguage());
Assert.assertEquals(XSDDatatype.XSDint, l.getDatatype());
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResources.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResources.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResources.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResources.java Tue Jun 24 09:06:50 2014
@@ -85,7 +85,7 @@ public class TestResources extends Abstr
protected Set<Object> setOf( final Object x )
{
- final Set<Object> result = new HashSet<Object>();
+ final Set<Object> result = new HashSet<>();
result.add(x);
return result;
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSelectorUse.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSelectorUse.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSelectorUse.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSelectorUse.java Tue Jun 24 09:06:50 2014
@@ -99,10 +99,10 @@ public class TestSelectorUse extends Abs
final StmtIterator it6 = model.listStatements(new SimpleSelector(null,
null, tvStrings[1], langs[1]));
final List<Statement> L6 = GraphTestBase.iteratorToList(it6);
- for (int i = 0; i < L6.size(); i += 1)
- {
- Assert.assertEquals(langs[1], L6.get(i).getLanguage());
- }
+ for ( Statement aL6 : L6 )
+ {
+ Assert.assertEquals( langs[1], aL6.getLanguage() );
+ }
Assert.assertEquals(2, L6.size());
}
@@ -121,10 +121,10 @@ public class TestSelectorUse extends Abs
final StmtIterator it3 = model.listStatements(new SimpleSelector(null,
predicate[1], (RDFNode) null));
final List<Statement> L3 = GraphTestBase.iteratorToList(it3);
- for (int i = 0; i < L3.size(); i += 1)
- {
- Assert.assertEquals(predicate[1], L3.get(i).getPredicate());
- }
+ for ( Statement aL3 : L3 )
+ {
+ Assert.assertEquals( predicate[1], aL3.getPredicate() );
+ }
Assert.assertEquals(num * 7, L3.size());
}
@@ -141,10 +141,10 @@ public class TestSelectorUse extends Abs
final StmtIterator it5 = model.listStatements(new SimpleSelector(null,
null, model.createTypedLiteral(false)));
final List<Statement> L5 = GraphTestBase.iteratorToList(it5);
- for (int i = 0; i < L5.size(); i += 1)
- {
- Assert.assertEquals(false, L5.get(i).getBoolean());
- }
+ for ( Statement aL5 : L5 )
+ {
+ Assert.assertEquals( false, aL5.getBoolean() );
+ }
Assert.assertEquals(2, L5.size());
}
@@ -153,10 +153,10 @@ public class TestSelectorUse extends Abs
final StmtIterator it2 = model.listStatements(new SimpleSelector(
subject[0], null, (RDFNode) null));
final List<Statement> L2 = GraphTestBase.iteratorToList(it2);
- for (int i = 0; i < L2.size(); i += 1)
- {
- Assert.assertEquals(subject[0], L2.get(i).getSubject());
- }
+ for ( Statement aL2 : L2 )
+ {
+ Assert.assertEquals( subject[0], aL2.getSubject() );
+ }
Assert.assertEquals(num * 7, L2.size());
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSeqMethods.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSeqMethods.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSeqMethods.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestSeqMethods.java Tue Jun 24 09:06:50 2014
@@ -159,21 +159,21 @@ public class TestSeqMethods extends Abst
seq.add(i);
}
//
- final List<RDFNode> retained = new ArrayList<RDFNode>();
+ final List<RDFNode> retained = new ArrayList<>();
//
final NodeIterator nIter = seq.iterator();
- for (int i = 0; i < num; i += 1)
- {
- final RDFNode x = nIter.nextNode();
- if (retain[i])
- {
- retained.add(x);
- }
- else
- {
- nIter.remove();
- }
- }
+ for ( boolean aRetain : retain )
+ {
+ final RDFNode x = nIter.nextNode();
+ if ( aRetain )
+ {
+ retained.add( x );
+ }
+ else
+ {
+ nIter.remove();
+ }
+ }
//
Assert.assertFalse(nIter.hasNext());
Assert.assertEquals(retained, seq.iterator().toList());
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/helpers/ModelHelper.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/helpers/ModelHelper.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/helpers/ModelHelper.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/helpers/ModelHelper.java Tue Jun 24 09:06:50 2014
@@ -128,7 +128,7 @@ public class ModelHelper extends GraphTe
*/
public static Statement [] statements( Model m, String facts )
{
- ArrayList<Statement> sl = new ArrayList<Statement>();
+ ArrayList<Statement> sl = new ArrayList<>();
StringTokenizer st = new StringTokenizer( facts, ";" );
while (st.hasMoreTokens()) sl.add( statement( m, st.nextToken() ) );
return sl.toArray( new Statement[sl.size()] );
@@ -143,7 +143,7 @@ public class ModelHelper extends GraphTe
*/
public static Resource [] resources( Model m, String items )
{
- ArrayList<Resource> rl = new ArrayList<Resource>();
+ ArrayList<Resource> rl = new ArrayList<>();
StringTokenizer st = new StringTokenizer( items );
while (st.hasMoreTokens()) rl.add( resource( m, st.nextToken() ) );
return rl.toArray( new Resource[rl.size()] );
@@ -156,7 +156,7 @@ public class ModelHelper extends GraphTe
*/
public static Set<Resource> resourceSet( String items )
{
- Set<Resource> result = new HashSet<Resource>();
+ Set<Resource> result = new HashSet<>();
StringTokenizer st = new StringTokenizer( items );
while (st.hasMoreTokens()) result.add( resource( st.nextToken() ) );
return result;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/helpers/RecordingModelListener.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/helpers/RecordingModelListener.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/helpers/RecordingModelListener.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/helpers/RecordingModelListener.java Tue Jun 24 09:06:50 2014
@@ -35,7 +35,7 @@ import org.junit.Assert;
*/
public class RecordingModelListener implements ModelChangedListener
{
- List<Object> history = new ArrayList<Object>();
+ List<Object> history = new ArrayList<>();
@Override
public void addedStatement( final Statement s )
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/DebugOWL.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/DebugOWL.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/DebugOWL.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/DebugOWL.java Tue Jun 24 09:06:50 2014
@@ -18,8 +18,6 @@
package com.hp.hpl.jena.reasoner.rulesys.test;
-import java.util.Iterator;
-
import com.hp.hpl.jena.graph.*;
import com.hp.hpl.jena.graph.compose.Union;
//import com.hp.hpl.jena.rdf.model.*;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/OWLUnitTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/OWLUnitTest.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/OWLUnitTest.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/OWLUnitTest.java Tue Jun 24 09:06:50 2014
@@ -205,14 +205,18 @@ public class OWLUnitTest extends TestCas
for (int i = 0; i < reasonerFactories.length; i++) {
String rName = reasonerNames[i];
ReasonerFactory rf = reasonerFactories[i];
- for (int j = 0; j < testDefs.length; j++) {
- TestDef test = testDefs[j];
- if (test.applicableTo(rf)) {
- if (test.spec instanceof String) {
- suite.addTest(new OWLUnitTest((String)test.spec, rName, rf));
- } else if (test.spec instanceof OWLConsistencyTest) {
- OWLConsistencyTest oct = (OWLConsistencyTest)test.spec;
- suite.addTest(new OWLConsistencyTest(oct, rName, rf));
+ for ( TestDef test : testDefs )
+ {
+ if ( test.applicableTo( rf ) )
+ {
+ if ( test.spec instanceof String )
+ {
+ suite.addTest( new OWLUnitTest( (String) test.spec, rName, rf ) );
+ }
+ else if ( test.spec instanceof OWLConsistencyTest )
+ {
+ OWLConsistencyTest oct = (OWLConsistencyTest) test.spec;
+ suite.addTest( new OWLConsistencyTest( oct, rName, rf ) );
}
}
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBackchainer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBackchainer.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBackchainer.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBackchainer.java Tue Jun 24 09:06:50 2014
@@ -230,8 +230,9 @@ public class TestBackchainer extends Tes
*/
public void testListData() {
Graph data = Factory.createGraphMem();
- for (int i = 0; i < dataElts.length; i++) {
- data.add(dataElts[i]);
+ for ( Triple dataElt : dataElts )
+ {
+ data.add( dataElt );
}
Graph schema = Factory.createGraphMem();
schema.add(new Triple(c, p, c));
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBasicLP.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBasicLP.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBasicLP.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBasicLP.java Tue Jun 24 09:06:50 2014
@@ -105,8 +105,9 @@ public class TestBasicLP extends TestCa
public InfGraph makeInfGraph(List<Rule> rules, Graph data, Node[] tabled) {
FBRuleReasoner reasoner = new FBRuleReasoner(rules);
FBRuleInfGraph infgraph = (FBRuleInfGraph) reasoner.bind(data);
- for (int i = 0; i < tabled.length; i++) {
- infgraph.setTabled(tabled[i]);
+ for ( Node aTabled : tabled )
+ {
+ infgraph.setTabled( aTabled );
}
return infgraph;
}
@@ -1062,8 +1063,9 @@ public class TestBasicLP extends TestCa
new Triple(a, ty, C1)
};
Graph data = Factory.createGraphMem();
- for (int i = 0; i < triples.length; i++) {
- data.add(triples[i]);
+ for ( Triple triple : triples )
+ {
+ data.add( triple );
}
InfGraph infgraph = makeInfGraph(rules, data, tabled);
ExtendedIterator<Triple> it = infgraph.find(a, ty, null);
@@ -1319,8 +1321,9 @@ public class TestBasicLP extends TestCa
private void doTest(String ruleSrc, Triple[] triples, TripleMatch query, Object[] results) {
List<Rule> rules = Rule.parseRules(ruleSrc);
Graph data = Factory.createGraphMem();
- for (int i = 0; i < triples.length; i++) {
- data.add(triples[i]);
+ for ( Triple triple : triples )
+ {
+ data.add( triple );
}
InfGraph infgraph = makeInfGraph(rules, data);
TestUtil.assertIteratorValues(this, infgraph.find(query), results);
@@ -1337,8 +1340,9 @@ public class TestBasicLP extends TestCa
private void doTest(String ruleSrc, Node[] tabled, Triple[] triples, TripleMatch query, Object[] results) {
List<Rule> rules = Rule.parseRules(ruleSrc);
Graph data = Factory.createGraphMem();
- for (int i = 0; i < triples.length; i++) {
- data.add(triples[i]);
+ for ( Triple triple : triples )
+ {
+ data.add( triple );
}
InfGraph infgraph = makeInfGraph(rules, data, tabled);
TestUtil.assertIteratorValues(this, infgraph.find(query), results);
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBasics.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBasics.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBasics.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBasics.java Tue Jun 24 09:06:50 2014
@@ -122,14 +122,18 @@ public class TestBasics extends TestCase
"(foo(?A) eg:p ?B) <- (?a, eg:p, ?B)." ,
"(foo(?A) eg:p ?B) -> (?a, eg:p, ?B)."
};
- for (int i = 0; i < testBadRules.length; i++) {
+ for ( String testBadRule : testBadRules )
+ {
boolean foundError = false;
- try {
- Rule r = Rule.parseRule(testBadRules[i]);
- } catch (Rule.ParserException e) {
+ try
+ {
+ Rule r = Rule.parseRule( testBadRule );
+ }
+ catch ( Rule.ParserException e )
+ {
foundError = true;
}
- assertTrue("Failed to find illegal rule", foundError);
+ assertTrue( "Failed to find illegal rule", foundError );
}
}
@@ -200,7 +204,7 @@ public class TestBasics extends TestCase
public void testClauseMaching() {
BindingStack env = new BindingStack();
env.reset(MAX_VARS);
- List<Rule> rules = new ArrayList<Rule>();
+ List<Rule> rules = new ArrayList<>();
BasicForwardRuleInfGraph inf = new BasicForwardRuleInfGraph(
new BasicForwardRuleReasoner(rules), rules, null);
TriplePattern p1 = new TriplePattern(
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBugs.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBugs.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBugs.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBugs.java Tue Jun 24 09:06:50 2014
@@ -402,8 +402,8 @@ public class TestBugs extends TestCase {
// System.out.println( prompt );
OntClass r = m.getOntClass( NS + "Reiseliv" );
- List<OntClass> q = new ArrayList<OntClass>();
- Set<OntClass> seen = new HashSet<OntClass>();
+ List<OntClass> q = new ArrayList<>();
+ Set<OntClass> seen = new HashSet<>();
q.add( r );
while (!q.isEmpty()) {
@@ -432,13 +432,15 @@ public class TestBugs extends TestCase {
}
}
- for (Iterator<OntClass> k = seen.iterator(); k.hasNext(); ) {
- Resource res = k.next();
+ for ( OntClass res : seen )
+ {
boolean isExpected = false;
- for (int j = 0; !isExpected && j < expected.length; j++) {
+ for ( int j = 0; !isExpected && j < expected.length; j++ )
+ {
isExpected = expected[j].equals( res );
}
- if (!isExpected) {
+ if ( !isExpected )
+ {
// System.out.println( "Got unexpected result " + res );
}
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestCapabilities.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestCapabilities.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestCapabilities.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestCapabilities.java Tue Jun 24 09:06:50 2014
@@ -62,12 +62,12 @@ public class TestCapabilities extends Te
{ReasonerRegistry.getRDFSSimpleReasoner(), Boolean.TRUE},
};
Model data = ModelFactory.createDefaultModel();
- for (int i = 0; i < testSpec.length; i++) {
- Object[] test = testSpec[i];
- Reasoner r = (Reasoner)test[0];
- Boolean safe = (Boolean)test[1];
- InfGraph ig = r.bind(data.getGraph());
- assertEquals(r.toString(), safe.booleanValue(), ig.getCapabilities().findContractSafe());
+ for ( Object[] test : testSpec )
+ {
+ Reasoner r = (Reasoner) test[0];
+ Boolean safe = (Boolean) test[1];
+ InfGraph ig = r.bind( data.getGraph() );
+ assertEquals( r.toString(), safe.booleanValue(), ig.getCapabilities().findContractSafe() );
}
}
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestGenericRuleReasonerConfig.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestGenericRuleReasonerConfig.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestGenericRuleReasonerConfig.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestGenericRuleReasonerConfig.java Tue Jun 24 09:06:50 2014
@@ -89,7 +89,7 @@ public class TestGenericRuleReasonerConf
;
Resource r = resourceInModel( modelString );
GenericRuleReasoner grr = new GenericRuleReasoner( null, r );
- assertEquals( rules, new HashSet<Rule>( grr.getRules() ) );
+ assertEquals( rules, new HashSet<>( grr.getRules() ) );
}
public void testLoadsMultipleRuleSetsViaRuleSetNode()
@@ -104,19 +104,19 @@ public class TestGenericRuleReasonerConf
String whereB = "file:testing/modelspecs/extra.rules";
Resource r = resourceInModel( "x <ns>:ruleSet _a; _a <ns>:ruleSetURL <whereA>; _a <ns>:ruleSetURL <whereB>".replaceAll( "<ns>", ns ).replaceAll( "<whereA>", whereA ).replaceAll( "<whereB>", whereB ) );
GenericRuleReasoner grr = new GenericRuleReasoner( null, r );
- assertEquals( rulesFromTwoPlaces( whereA, whereB ), new HashSet<Rule>( grr.getRules() ) );
+ assertEquals( rulesFromTwoPlaces( whereA, whereB ), new HashSet<>( grr.getRules() ) );
}
private Set<Rule> rulesFromTwoStrings( String ruleA, String ruleB )
{
- Set<Rule> rules = new HashSet<Rule>( Rule.parseRules( ruleA ) );
+ Set<Rule> rules = new HashSet<>( Rule.parseRules( ruleA ) );
rules.addAll( Rule.parseRules( ruleB ) );
return rules;
}
private Set<Rule> rulesFromTwoPlaces( String whereA, String whereB )
{
- Set<Rule> rules = new HashSet<Rule>();
+ Set<Rule> rules = new HashSet<>();
rules.addAll( Rule.rulesFromURL( whereA ) );
rules.addAll( Rule.rulesFromURL( whereB ) );
return rules;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestLPDerivation.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestLPDerivation.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestLPDerivation.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestLPDerivation.java Tue Jun 24 09:06:50 2014
@@ -76,8 +76,9 @@ public class TestLPDerivation extends Te
public static InfGraph makeInfGraph(List<Rule> rules, Graph data, Node[] tabled) {
FBRuleReasoner reasoner = new FBRuleReasoner(rules);
FBRuleInfGraph infgraph = (FBRuleInfGraph) reasoner.bind(data);
- for (int i = 0; i < tabled.length; i++) {
- infgraph.setTabled(tabled[i]);
+ for ( Node aTabled : tabled )
+ {
+ infgraph.setTabled( aTabled );
}
// infgraph.setTraceOn(true);
infgraph.setDerivationLogging(true);
@@ -96,8 +97,9 @@ public class TestLPDerivation extends Te
private void doTest(String ruleSrc, Node[] tabled, Triple[] triples, TripleMatch query, Triple[] matches, int rulenumber) {
List<Rule> rules = Rule.parseRules(ruleSrc);
Graph data = Factory.createGraphMem();
- for (int i = 0; i < triples.length; i++) {
- data.add(triples[i]);
+ for ( Triple triple : triples )
+ {
+ data.add( triple );
}
InfGraph infgraph = makeInfGraph(rules, data, tabled);
ExtendedIterator<Triple> results = infgraph.find(query);
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestRETE.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestRETE.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestRETE.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestRETE.java Tue Jun 24 09:06:50 2014
@@ -235,8 +235,9 @@ public class TestRETE extends TestCase
RETEEngine engine = new RETEEngine(infgraph, ruleList);
infgraph.prepare();
engine.init(true, new FGraph(Factory.createGraphMem()));
- for (int i = 0; i < adds.length; i++) {
- engine.addTriple(adds[i], true);
+ for ( Triple add : adds )
+ {
+ engine.addTriple( add, true );
}
engine.runAll();
TestUtil.assertIteratorValues(this, infgraph.find(null, null, null), expected);
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestSetRules.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestSetRules.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestSetRules.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestSetRules.java Tue Jun 24 09:06:50 2014
@@ -54,7 +54,7 @@ public class TestSetRules extends ModelT
private static class MockFactory implements ReasonerFactory
{
- List<String> done = new ArrayList<String>();
+ List<String> done = new ArrayList<>();
static final Model capabilities = modelWithStatements( "this isA Capability" );
static final String uri = "eg:mockURI";
static final Reasoner reasoner = new GenericRuleReasoner( rules );
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/WebOntTestHarness.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/WebOntTestHarness.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/WebOntTestHarness.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/WebOntTestHarness.java Tue Jun 24 09:06:50 2014
@@ -203,29 +203,40 @@ public class WebOntTestHarness {
System.out.print("Loading manifests "); System.out.flush();
Model testDefs = ModelFactory.createDefaultModel();
int count = 0;
- for (int idir = 0; idir < TEST_DIRS.length; idir++) {
- File dir = new File(BASE_TESTDIR + TEST_DIRS[idir]);
- String[] manifests = dir.list(new FilenameFilter() {
- @Override
- public boolean accept(File df, String name) {
- if (name.startsWith("Manifest") && name.endsWith(".rdf")) {
- return includeModified || ! name.endsWith("-mod.rdf");
- } else {
- return false;
- }
+ for ( String TEST_DIR : TEST_DIRS )
+ {
+ File dir = new File( BASE_TESTDIR + TEST_DIR );
+ String[] manifests = dir.list( new FilenameFilter()
+ {
+ @Override
+ public boolean accept( File df, String name )
+ {
+ if ( name.startsWith( "Manifest" ) && name.endsWith( ".rdf" ) )
+ {
+ return includeModified || !name.endsWith( "-mod.rdf" );
}
- });
- for (int im = 0; im < manifests.length; im++) {
- String manifest = manifests[im];
- File mf = new File(dir, manifest);
- try {
- testDefs.read(new FileInputStream(mf), "file:" + mf);
- count ++;
- if (count % 8 == 0) {
- System.out.print("."); System.out.flush();
+ else
+ {
+ return false;
}
- } catch (FileNotFoundException e) {
- System.out.println("File not readable - " + e);
+ }
+ } );
+ for ( String manifest : manifests )
+ {
+ File mf = new File( dir, manifest );
+ try
+ {
+ testDefs.read( new FileInputStream( mf ), "file:" + mf );
+ count++;
+ if ( count % 8 == 0 )
+ {
+ System.out.print( "." );
+ System.out.flush();
+ }
+ }
+ catch ( FileNotFoundException e )
+ {
+ System.out.println( "File not readable - " + e );
}
}
}
@@ -299,8 +310,9 @@ public class WebOntTestHarness {
* Run all tests in the given list.
*/
public void runTests(List<Resource> tests) {
- for (Iterator<Resource> i = tests.iterator(); i.hasNext(); ) {
- runTest( i.next() );
+ for ( Resource test : tests )
+ {
+ runTest( test );
}
}
@@ -471,7 +483,7 @@ public class WebOntTestHarness {
*/
public void comprehensionAxioms(Model premises, Model conclusions) {
// Comprehend all restriction declarations and note them in a map
- Map<Resource, Resource> comprehension = new HashMap<Resource, Resource>();
+ Map<Resource, Resource> comprehension = new HashMap<>();
StmtIterator ri = conclusions.listStatements(null, RDF.type, OWL.Restriction);
while (ri.hasNext()) {
Resource restriction = ri.nextStatement().getSubject();
@@ -498,20 +510,22 @@ public class WebOntTestHarness {
// Rewrite queries of the form (X intersectionOf Y) to the form
// (X equivalentClass ?CC) (?CC intersectionOf Y)
StmtIterator ii = conclusions.listStatements(null, OWL.intersectionOf, (RDFNode)null);
- List<Statement> intersections = new ArrayList<Statement>();
+ List<Statement> intersections = new ArrayList<>();
while (ii.hasNext()) {
intersections.add(ii.nextStatement());
}
- for (Iterator<Statement> i = intersections.iterator(); i.hasNext(); ) {
- Statement is = i.next();
+ for ( Statement is : intersections )
+ {
// Declare in the premises that such an intersection exists
- Resource comp = premises.createResource()
- .addProperty(RDF.type, OWL.Class)
- .addProperty(OWL.intersectionOf, mapList(premises, (Resource)is.getObject(), comprehension));
+ Resource comp =
+ premises.createResource().addProperty( RDF.type, OWL.Class ).addProperty( OWL.intersectionOf,
+ mapList( premises,
+ (Resource) is.getObject(),
+ comprehension ) );
// Rewrite the conclusions to be a test for equivalence between the class being
// queried and the comprehended interesection
- conclusions.remove(is);
- conclusions.add(is.getSubject(), OWL.equivalentClass, comp);
+ conclusions.remove( is );
+ conclusions.add( is.getSubject(), OWL.equivalentClass, comp );
}
// Comprehend any oneOf lists
StmtIterator io = conclusions.listStatements(null, OWL.oneOf, (RDFNode)null);
@@ -546,7 +560,7 @@ public class WebOntTestHarness {
/** Return a list of all tests of the given type, according to the current filters */
public List<Resource> findTestsOfType(Resource testType) {
- ArrayList<Resource> result = new ArrayList<Resource>();
+ ArrayList<Resource> result = new ArrayList<>();
StmtIterator si = testDefinitions.listStatements(null, RDF.type, testType);
while (si.hasNext()) {
Resource test = si.nextStatement().getSubject();
@@ -557,17 +571,21 @@ public class WebOntTestHarness {
accept = status.getString().equals(STATUS_FLAGS[0]);
} else {
accept = false;
- for (int i = 0; i < STATUS_FLAGS.length; i++) {
- if (status.getString().equals(STATUS_FLAGS[i])) {
+ for ( String STATUS_FLAG : STATUS_FLAGS )
+ {
+ if ( status.getString().equals( STATUS_FLAG ) )
+ {
accept = true;
break;
}
}
}
// Check for blocked tests
- for (int i = 0; i < BLOCKED_TESTS.length; i++) {
- if (BLOCKED_TESTS[i].equals(test.toString())) {
- accept = false;
+ for ( String BLOCKED_TEST : BLOCKED_TESTS )
+ {
+ if ( BLOCKED_TEST.equals( test.toString() ) )
+ {
+ accept = false;
}
}
// End of filter tests
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/Matcher.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/Matcher.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/Matcher.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/Matcher.java Tue Jun 24 09:06:50 2014
@@ -57,14 +57,14 @@ public class Matcher
/*package*/ static List<Triple> bnodes2vars(Graph graph)
{
- Map<Node, Node> bnodeMapping = new HashMap<Node, Node>();
+ Map<Node, Node> bnodeMapping = new HashMap<>();
Allocator allocator = new AllocatorBlankVar() ;
List<Triple> pattern = remap(bnodeMapping, graph, allocator) ;
return pattern ;
}
private static Iterator<Map<Node, Node>> match(List<Triple> pattern, Graph graph, boolean bindAny) {
- List<Map<Node, Node>> solutions = new ArrayList<Map<Node, Node>>() ;
+ List<Map<Node, Node>> solutions = new ArrayList<>() ;
solutions.add(new HashMap<Node, Node>()) ; // Root binding.
return solve(solutions, pattern, graph, bindAny) ;
}
@@ -80,7 +80,7 @@ public class Matcher
}
Triple step = pattern.get(0) ;
- List<Map<Node, Node>> solutions2 = new ArrayList<Map<Node, Node>>() ;
+ List<Map<Node, Node>> solutions2 = new ArrayList<>() ;
for ( Map<Node, Node> binding : solutions )
{
@@ -106,7 +106,7 @@ public class Matcher
private static Map<Node, Node> bind(Triple step, Triple t, Map<Node, Node> bindings, boolean bindAny)
{
log("Bind: %s :: %s",step,t) ;
- HashMap<Node, Node> newBinding = new HashMap<Node, Node>() ;
+ HashMap<Node, Node> newBinding = new HashMap<>() ;
newBinding.putAll(bindings) ;
if ( ! process(newBinding, t.getSubject(), step.getSubject(), bindAny ))
return null ;
@@ -148,7 +148,7 @@ public class Matcher
private static List<Triple> remap(Map<Node, Node> bnodeMapping, List<Triple>triples, Allocator alloc)
{
- List<Triple> pattern = new ArrayList<Triple>() ;
+ List<Triple> pattern = new ArrayList<>() ;
for ( Triple t : triples )
{
Triple t2 = remap(bnodeMapping, t, alloc) ;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/ReasonerTester.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/ReasonerTester.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/ReasonerTester.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/ReasonerTester.java Tue Jun 24 09:06:50 2014
@@ -105,7 +105,7 @@ public class ReasonerTester {
protected Model testManifest;
/** A cache of loaded source files, map from source name to Model */
- protected Map<String, Model> sourceCache = new HashMap<String, Model>();
+ protected Map<String, Model> sourceCache = new HashMap<>();
protected static Logger logger = LoggerFactory.getLogger(ReasonerTester.class);
@@ -195,9 +195,12 @@ public class ReasonerTester {
* @throws RDFException if the test can't be found or fails internally
*/
public boolean runTests(ReasonerFactory reasonerF, TestCase testcase, Resource configuration) throws IOException {
- for (Iterator<String> i = listTests().iterator(); i.hasNext(); ) {
- String test = i.next();
- if (!runTest(test, reasonerF, testcase, configuration)) return false;
+ for ( String test : listTests() )
+ {
+ if ( !runTest( test, reasonerF, testcase, configuration ) )
+ {
+ return false;
+ }
}
return true;
}
@@ -211,9 +214,12 @@ public class ReasonerTester {
* @throws RDFException if the test can't be found or fails internally
*/
public boolean runTests(Reasoner reasoner, TestCase testcase) throws IOException {
- for (Iterator<String> i = listTests().iterator(); i.hasNext(); ) {
- String test = i.next();
- if (!runTest(test, reasoner, testcase)) return false;
+ for ( String test : listTests() )
+ {
+ if ( !runTest( test, reasoner, testcase ) )
+ {
+ return false;
+ }
}
return true;
}
@@ -222,7 +228,7 @@ public class ReasonerTester {
* Return a list of all test names defined in the manifest for this test harness.
*/
public List<String> listTests() {
- List<String> testList = new ArrayList<String>();
+ List<String> testList = new ArrayList<>();
ResIterator tests = testManifest.listResourcesWithProperty(RDF.type, testClass);
while (tests.hasNext()) {
testList.add(tests.next().toString());
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestCurrentRDFWG.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestCurrentRDFWG.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestCurrentRDFWG.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestCurrentRDFWG.java Tue Jun 24 09:06:50 2014
@@ -18,20 +18,22 @@
package com.hp.hpl.jena.reasoner.test;
-import com.hp.hpl.jena.reasoner.rulesys.RDFSRuleReasonerFactory;
-import com.hp.hpl.jena.reasoner.*;
-import com.hp.hpl.jena.rdf.model.*;
-import com.hp.hpl.jena.shared.impl.JenaParameters;
-import com.hp.hpl.jena.vocabulary.*;
+import java.io.IOException ;
-import java.io.IOException;
-import java.util.Iterator;
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import junit.framework.TestCase ;
+import junit.framework.TestSuite ;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
+
+import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.rdf.model.ModelFactory ;
+import com.hp.hpl.jena.rdf.model.Resource ;
+import com.hp.hpl.jena.reasoner.ReasonerFactory ;
+import com.hp.hpl.jena.reasoner.rulesys.RDFSRuleReasonerFactory ;
+import com.hp.hpl.jena.shared.impl.JenaParameters ;
+import com.hp.hpl.jena.vocabulary.OWLResults ;
+import com.hp.hpl.jena.vocabulary.RDFS ;
+import com.hp.hpl.jena.vocabulary.ReasonerVocabulary ;
/**
* Test the default RDFS reasoner against the current set of working group tests
@@ -102,9 +104,9 @@ public class TestCurrentRDFWG extends Re
private static void constructRDFWGtests(TestSuite suite, ReasonerFactory rf, Resource config) throws IOException {
JenaParameters.enableWhitespaceCheckingOfTypedLiterals = true;
WGReasonerTester tester = new WGReasonerTester("Manifest.rdf", TEST_DIR);
- for (Iterator<String> i = tester.listTests().iterator(); i.hasNext(); ) {
- String test = i.next();
- suite.addTest(new TestReasonerWG(tester, test, rf, config));
+ for ( String test : tester.listTests() )
+ {
+ suite.addTest( new TestReasonerWG( tester, test, rf, config ) );
}
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestRDFSReasoners.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestRDFSReasoners.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestRDFSReasoners.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestRDFSReasoners.java Tue Jun 24 09:06:50 2014
@@ -110,9 +110,9 @@ public class TestRDFSReasoners extends R
private static void constructQuerytests(TestSuite suite, String manifest, ReasonerFactory rf, Resource config) throws IOException {
ReasonerTester tester = new ReasonerTester(manifest);
Reasoner r = rf.create(config);
- for (Iterator<String> i = tester.listTests().iterator(); i.hasNext(); ) {
- String test = i.next();
- suite.addTest(new TestReasonerFromManifest(tester, test, r));
+ for ( String test : tester.listTests() )
+ {
+ suite.addTest( new TestReasonerFromManifest( tester, test, r ) );
}
}
@@ -121,9 +121,9 @@ public class TestRDFSReasoners extends R
*/
private static void constructRDFWGtests(TestSuite suite, ReasonerFactory rf, Resource config) throws IOException {
WGReasonerTester tester = new WGReasonerTester("Manifest.rdf");
- for (Iterator<String> i = tester.listTests().iterator(); i.hasNext(); ) {
- String test = i.next();
- suite.addTest(new TestReasonerWG(tester, test, rf, config));
+ for ( String test : tester.listTests() )
+ {
+ suite.addTest( new TestReasonerWG( tester, test, rf, config ) );
}
}
@@ -133,9 +133,9 @@ public class TestRDFSReasoners extends R
*/
public static void constructQuerytests(TestSuite suite, String manifest, Reasoner reasoner) throws IOException {
ReasonerTester tester = new ReasonerTester(manifest);
- for (Iterator<String> i = tester.listTests().iterator(); i.hasNext(); ) {
- String test = i.next();
- suite.addTest(new TestReasonerFromManifest(tester, test, reasoner));
+ for ( String test : tester.listTests() )
+ {
+ suite.addTest( new TestReasonerFromManifest( tester, test, reasoner ) );
}
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestReasoners.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestReasoners.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestReasoners.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestReasoners.java Tue Jun 24 09:06:50 2014
@@ -266,7 +266,7 @@ public class TestReasoners extends TestC
for (ResIterator i = im.listSubjects(); i.hasNext();) {
Resource base = i.nextResource();
- List<RDFNode> directLinks = new ArrayList<RDFNode>();
+ List<RDFNode> directLinks = new ArrayList<>();
for (NodeIterator j = im.listObjectsOfProperty(base, dp); j.hasNext(); ) {
directLinks.add(j.next());
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestUtil.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestUtil.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestUtil.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestUtil.java Tue Jun 24 09:06:50 2014
@@ -106,7 +106,7 @@ public class TestUtil {
* @return normalized version of src
*/
public static String normalizeWhiteSpace(String src) {
- StringBuffer result = new StringBuffer(src.length());
+ StringBuilder result = new StringBuilder(src.length());
boolean inWhitespaceBlock = false;
for (int i = 0; i < src.length(); i++) {
char c = src.charAt(i);
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/WGReasonerTester.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/WGReasonerTester.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/WGReasonerTester.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/WGReasonerTester.java Tue Jun 24 09:06:50 2014
@@ -24,11 +24,10 @@ import java.io.IOException ;
import java.io.InputStream ;
import java.net.URL ;
import java.util.ArrayList ;
-import java.util.Iterator ;
import java.util.List ;
-import org.junit.Assert ;
import junit.framework.TestCase ;
+import org.junit.Assert ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
@@ -211,9 +210,12 @@ public class WGReasonerTester {
* @throws RDFException if the test can't be found or fails internally
*/
public boolean runTests(ReasonerFactory reasonerF, TestCase testcase, Resource configuration) throws IOException {
- for (Iterator<String> i = listTests().iterator(); i.hasNext(); ) {
- String test = i.next();
- if (!runTest(test, reasonerF, testcase, configuration)) return false;
+ for ( String test : listTests() )
+ {
+ if ( !runTest( test, reasonerF, testcase, configuration ) )
+ {
+ return false;
+ }
}
return true;
}
@@ -222,7 +224,7 @@ public class WGReasonerTester {
* Return a list of all test names defined in the manifest for this test harness.
*/
public List<String> listTests() {
- List<String> testList = new ArrayList<String>();
+ List<String> testList = new ArrayList<>();
ResIterator tests = testManifest.listResourcesWithProperty(RDF.type, PositiveEntailmentTest);
while (tests.hasNext()) {
testList.add(tests.next().toString());
@@ -291,9 +293,13 @@ public class WGReasonerTester {
}
// Skip the test designed for only non-datatype aware processors
- for (int i = 0; i < blockedTests.length; i++) {
- if (test.getURI().equals(blockedTests[i])) return NOT_APPLICABLE;
- }
+ for ( String blockedTest : blockedTests )
+ {
+ if ( test.getURI().equals( blockedTest ) )
+ {
+ return NOT_APPLICABLE;
+ }
+ }
// Load up the premise documents
Model premises = ModelFactory.createDefaultModel();
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/AbstractTestPrefixMapping.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/AbstractTestPrefixMapping.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/AbstractTestPrefixMapping.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/AbstractTestPrefixMapping.java Tue Jun 24 09:06:50 2014
@@ -68,15 +68,17 @@ public abstract class AbstractTestPrefix
public void testCheckNames()
{
PrefixMapping ns = getMapping();
- for (int i = 0; i < badNames.length; i += 1)
+ for ( String bad : badNames )
{
- String bad = badNames[i];
- try
- {
- ns.setNsPrefix( bad, crispURI );
- fail( "'" + bad + "' is an illegal prefix and should be trapped" );
+ try
+ {
+ ns.setNsPrefix( bad, crispURI );
+ fail( "'" + bad + "' is an illegal prefix and should be trapped" );
+ }
+ catch ( PrefixMapping.IllegalPrefixException e )
+ {
+ pass();
}
- catch (PrefixMapping.IllegalPrefixException e) { pass(); }
}
}
@@ -200,21 +202,15 @@ public abstract class AbstractTestPrefix
ns.setNsPrefix( "crisp", crispURI );
ns.setNsPrefix( "rope", ropeURI );
/* */
- for (int i = 0; i < dontChange.length; i += 1)
- assertEquals
- (
- "should be unchanged",
- dontChange[i],
- ns.expandPrefix( dontChange[i] )
- );
+ for ( String aDontChange : dontChange )
+ {
+ assertEquals( "should be unchanged", aDontChange, ns.expandPrefix( aDontChange ) );
+ }
/* */
- for (int i = 0; i < expansions.length; i += 1)
- assertEquals
- (
- "should expand correctly",
- expansions[i][1],
- ns.expandPrefix( expansions[i][0] )
- );
+ for ( String[] expansion : expansions )
+ {
+ assertEquals( "should expand correctly", expansion[1], ns.expandPrefix( expansion[0] ) );
+ }
}
public void testUseEasyPrefix()
@@ -308,7 +304,7 @@ public abstract class AbstractTestPrefix
public void testAddMap()
{
PrefixMapping b = getMapping();
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put( "crisp", crispURI );
map.put( "rope", ropeURI );
b.setNsPrefix( "butter", butterURI );
@@ -440,11 +436,10 @@ public abstract class AbstractTestPrefix
protected void fill( PrefixMapping pm, String settings )
{
List<String> L = listOfStrings( settings );
- for (int i = 0; i < L.size(); i += 1)
+ for ( String setting : L )
{
- String setting = L.get(i);
- int eq = setting.indexOf( '=' );
- pm.setNsPrefix( setting.substring( 0, eq ), setting.substring( eq + 1 ) );
+ int eq = setting.indexOf( '=' );
+ pm.setNsPrefix( setting.substring( 0, eq ), setting.substring( eq + 1 ) );
}
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/test/JenaTestBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/test/JenaTestBase.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/test/JenaTestBase.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/test/JenaTestBase.java Tue Jun 24 09:06:50 2014
@@ -84,7 +84,7 @@ public class JenaTestBase extends TestCa
*/
public static List<String> listOfStrings( String s )
{
- List<String> result = new ArrayList<String>();
+ List<String> result = new ArrayList<>();
StringTokenizer st = new StringTokenizer( s );
while (st.hasMoreTokens()) result.add( st.nextToken() );
return result;
@@ -96,7 +96,7 @@ public class JenaTestBase extends TestCa
*/
public static Set<String> setOfStrings( String s )
{
- Set<String> result = new HashSet<String>();
+ Set<String> result = new HashSet<>();
StringTokenizer st = new StringTokenizer( s );
while (st.hasMoreTokens()) result.add( st.nextToken() );
return result;
@@ -107,7 +107,7 @@ public class JenaTestBase extends TestCa
*/
public static <T> List<T> listOfOne( T x )
{
- List<T> result = new ArrayList<T>();
+ List<T> result = new ArrayList<>();
result.add( x );
return result;
}
@@ -117,7 +117,7 @@ public class JenaTestBase extends TestCa
*/
public static <T> Set<T> setOfOne( T x )
{
- Set<T> result = new HashSet<T>();
+ Set<T> result = new HashSet<>();
result.add( x );
return result;
}
@@ -127,7 +127,7 @@ public class JenaTestBase extends TestCa
<code>R</code>. Neither <code>L</code> nor <code>R</code> is updated.
*/
public static <T> List<T> append( List<? extends T> L, List<? extends T> R )
- { List<T> result = new ArrayList<T>( L );
+ { List<T> result = new ArrayList<>( L );
result.addAll( R );
return result; }
@@ -182,7 +182,13 @@ public class JenaTestBase extends TestCa
{
if (subClass == superClass || subClass.getSuperclass() == superClass) return true;
Class<?> [] is = subClass.getInterfaces();
- for (int i = 0; i < is.length; i += 1) if (hasAsParent( is[i], superClass )) return true;
+ for ( Class<?> i1 : is )
+ {
+ if ( hasAsParent( i1, superClass ) )
+ {
+ return true;
+ }
+ }
return false;
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestCache.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestCache.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestCache.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestCache.java Tue Jun 24 09:06:50 2014
@@ -72,7 +72,7 @@ public class TestCache extends TestCase
String k1 = "one";
String k2 = k1;
String k3 = k2;
- Integer v1 = new Integer(-1);
+ Integer v1 = -1;
Integer v2 = v1;
Integer v3 = v2;
c1.put(k1, v1);
@@ -90,7 +90,7 @@ public class TestCache extends TestCase
assertEquals("should be the expected object", o, v2);
k3 = "T" + i;
- v3 = new Integer(i);
+ v3 = i;
c1.put(k3,v3);
}
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestCollectionFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestCollectionFactory.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestCollectionFactory.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestCollectionFactory.java Tue Jun 24 09:06:50 2014
@@ -38,17 +38,17 @@ public class TestCollectionFactory exten
public void testHashMapExists()
{
- assertInstanceOf( Map.class, CollectionFactory.<Object, Object>createHashedMap() );
+ assertInstanceOf( Map.class, CollectionFactory.createHashedMap() );
}
public void testHashMapSized()
{
- assertInstanceOf( Map.class, CollectionFactory.<Object, Object>createHashedMap( 42 ) );
+ assertInstanceOf( Map.class, CollectionFactory.createHashedMap( 42 ) );
}
public void testHashMapCopy()
{
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put( "here", "Bristol" );
map.put( "there", "Oxford" );
Map<String, String> copy = CollectionFactory.createHashedMap( map );
@@ -62,7 +62,7 @@ public class TestCollectionFactory exten
public void testHashSetCopy()
{
- Set<String> s = new HashSet<String>();
+ Set<String> s = new HashSet<>();
s.add( "jelly" );
s.add( "concrete" );
Set<String> copy = CollectionFactory.createHashedSet( s );
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestIteratorCollection.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestIteratorCollection.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestIteratorCollection.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestIteratorCollection.java Tue Jun 24 09:06:50 2014
@@ -47,7 +47,7 @@ public class TestIteratorCollection exte
public void testSingletonToSingleSet()
{
- assertEquals( oneSet( "single" ), iteratorToSet( new SingletonIterator<String>( "single" ) ) );
+ assertEquals( oneSet( "single" ), iteratorToSet( new SingletonIterator<>( "single" ) ) );
}
public void testLotsToSet()
@@ -77,12 +77,12 @@ public class TestIteratorCollection exte
public void testEmptyToEmptyList()
{
- assertEquals( new ArrayList<Object>(), IteratorCollection.iteratorToList( NullIterator.instance() ) );
+ assertEquals( new ArrayList<>(), IteratorCollection.iteratorToList( NullIterator.instance() ) );
}
public void testSingletonToSingletonList()
{
- assertEquals( oneList( "just one" ), IteratorCollection.iteratorToList( new SingletonIterator<String>( "just one" ) ) );
+ assertEquals( oneList( "just one" ), IteratorCollection.iteratorToList( new SingletonIterator<>( "just one" ) ) );
}
public void testLotsToList()
@@ -111,21 +111,24 @@ public class TestIteratorCollection exte
protected Set<Object> oneSet( Object x )
{
- Set<Object> result = new HashSet<Object>();
+ Set<Object> result = new HashSet<>();
result.add( x );
return result;
}
protected Set<Object> setLots( Object [] elements )
{
- Set<Object> result = new HashSet<Object>();
- for (int i = 0; i < elements.length; i += 1) result.add( elements[i] );
+ Set<Object> result = new HashSet<>();
+ for ( Object element : elements )
+ {
+ result.add( element );
+ }
return result;
}
protected List<Object> oneList( Object x )
{
- List<Object> result = new ArrayList<Object>();
+ List<Object> result = new ArrayList<>();
result.add( x );
return result;
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestMonitors.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestMonitors.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestMonitors.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestMonitors.java Tue Jun 24 09:06:50 2014
@@ -76,8 +76,8 @@ public class TestMonitors extends TestCa
base.add(t3);
// Test changes from empty
- List<Triple> additions = new ArrayList<Triple>();
- List<Triple> deletions = new ArrayList<Triple>();
+ List<Triple> additions = new ArrayList<>();
+ List<Triple> deletions = new ArrayList<>();
monitor.snapshot(additions, deletions);
TestUtil.assertIteratorValues(this, additions.iterator(), new Object[] {t1, t2, t3});
TestUtil.assertIteratorValues(this, deletions.iterator(), new Object[] {});
@@ -112,8 +112,8 @@ public class TestMonitors extends TestCa
listener.has(new Object[]{});
// Test changes from empty
- List<Triple> additions = new ArrayList<Triple>();
- List<Triple> deletions = new ArrayList<Triple>();
+ List<Triple> additions = new ArrayList<>();
+ List<Triple> deletions = new ArrayList<>();
monitor.snapshot(additions, deletions);
TestUtil.assertIteratorValues(this, additions.iterator(), new Object[] {t1, t2, t3});
TestUtil.assertIteratorValues(this, deletions.iterator(), new Object[] {});
@@ -162,8 +162,8 @@ public class TestMonitors extends TestCa
base.add(s3);
// Test changes from empty
- List<Statement> additions = new ArrayList<Statement>();
- List<Statement> deletions = new ArrayList<Statement>();
+ List<Statement> additions = new ArrayList<>();
+ List<Statement> deletions = new ArrayList<>();
monitor.snapshot(additions, deletions);
TestUtil.assertIteratorValues(this, additions.iterator(), new Object[] {s1, s2, s3});
TestUtil.assertIteratorValues(this, deletions.iterator(), new Object[] {});
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestOneToManyMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestOneToManyMap.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestOneToManyMap.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestOneToManyMap.java Tue Jun 24 09:06:50 2014
@@ -67,23 +67,23 @@ public class TestOneToManyMap
public void testConstruct0() {
// the types of these maps
- OneToManyMap<String, Integer> map0 = new OneToManyMap<String, Integer>();
+ OneToManyMap<String, Integer> map0 = new OneToManyMap<>();
assertNotNull( map0 );
assertTrue( map0.isEmpty() );
- OneToManyMap<String, Integer> map1 = new OneToManyMap<String, Integer>( map0 );
+ OneToManyMap<String, Integer> map1 = new OneToManyMap<>( map0 );
assertNotNull( map1 );
assertTrue( map1.isEmpty() );
}
public void testConstruct1() {
- OneToManyMap<String, String> map0 = new OneToManyMap<String, String>();
+ OneToManyMap<String, String> map0 = new OneToManyMap<>();
map0.put( s0, s1 );
assertTrue( map0.contains( s0, s1 ) );
- OneToManyMap<String, String> map1 = new OneToManyMap<String, String>( map0 );
+ OneToManyMap<String, String> map1 = new OneToManyMap<>( map0 );
assertTrue( map0.contains( s0, s1 ) );
map0.put( s0, s2 );
@@ -93,7 +93,7 @@ public class TestOneToManyMap
}
public void testClear() {
- OneToManyMap<String, String> map0 = new OneToManyMap<String, String>();
+ OneToManyMap<String, String> map0 = new OneToManyMap<>();
map0.put( s0, s1 );
assertTrue( map0.contains( s0, s1 ) );
@@ -105,7 +105,7 @@ public class TestOneToManyMap
}
public void testContainsKey() {
- OneToManyMap<String, String> map0 = new OneToManyMap<String, String>();
+ OneToManyMap<String, String> map0 = new OneToManyMap<>();
assertFalse( map0.containsKey( s0 ) );
assertFalse( map0.containsKey( s1 ) );
map0.put( s0, s1 );
@@ -114,7 +114,7 @@ public class TestOneToManyMap
}
public void testContainsValue() {
- OneToManyMap<String, String> map0 = new OneToManyMap<String, String>();
+ OneToManyMap<String, String> map0 = new OneToManyMap<>();
assertFalse( map0.containsValue( s0 ) );
assertFalse( map0.containsValue( s1 ) );
assertFalse( map0.containsValue( s2 ) );
@@ -129,7 +129,7 @@ public class TestOneToManyMap
}
public void testContains() {
- OneToManyMap<String, String> map0 = new OneToManyMap<String, String>();
+ OneToManyMap<String, String> map0 = new OneToManyMap<>();
assertFalse( map0.contains( s0, s1 ) );
assertFalse( map0.contains( s0, s2 ) );
assertFalse( map0.contains( s1, s2 ) );
@@ -144,7 +144,7 @@ public class TestOneToManyMap
}
public void testEntrySet() {
- OneToManyMap<String, String> map0 = new OneToManyMap<String, String>();
+ OneToManyMap<String, String> map0 = new OneToManyMap<>();
map0.put( s0, s1 );
map0.put( s0, s2 );
map0.put( s3, s4 );
@@ -152,19 +152,23 @@ public class TestOneToManyMap
boolean s0s1 = false;
boolean s0s2 = false;
boolean s3s4 = false;
-
- for (Iterator<Map.Entry<String, String>> i = map0.entrySet().iterator(); i.hasNext(); ) {
- Map.Entry<String, String> e = i.next();
- if (e.getKey().equals( s0 ) && e.getValue().equals( s1 )) {
+
+ for ( Map.Entry<String, String> e : map0.entrySet() )
+ {
+ if ( e.getKey().equals( s0 ) && e.getValue().equals( s1 ) )
+ {
s0s1 = true;
}
- else if (e.getKey().equals( s0 ) && e.getValue().equals( s2 )) {
+ else if ( e.getKey().equals( s0 ) && e.getValue().equals( s2 ) )
+ {
s0s2 = true;
}
- else if (e.getKey().equals( s3 ) && e.getValue().equals( s4 )) {
+ else if ( e.getKey().equals( s3 ) && e.getValue().equals( s4 ) )
+ {
s3s4 = true;
}
- else {
+ else
+ {
throw new IllegalArgumentException( "unexpected: " + e );
}
}
@@ -175,15 +179,15 @@ public class TestOneToManyMap
}
public void testEquals() {
- OneToManyMap<String, String> map0 = new OneToManyMap<String, String>();
+ OneToManyMap<String, String> map0 = new OneToManyMap<>();
map0.put( s0, s1 );
map0.put( s0, s2 );
map0.put( s3, s4 );
- OneToManyMap<String, String> map1 = new OneToManyMap<String, String>();
+ OneToManyMap<String, String> map1 = new OneToManyMap<>();
map1.put( s3, s4 );
map1.put( s0, s1 );
map1.put( s0, s2 );
- OneToManyMap<String, String> map2 = new OneToManyMap<String, String>();
+ OneToManyMap<String, String> map2 = new OneToManyMap<>();
map2.put( s0, s2 );
map2.put( s3, s4 );
@@ -196,7 +200,7 @@ public class TestOneToManyMap
}
public void testGet() {
- OneToManyMap<String, String> map0 = new OneToManyMap<String, String>();
+ OneToManyMap<String, String> map0 = new OneToManyMap<>();
assertNull( map0.get( s0 ));
map0.put( s0, s1 );
assertEquals( s1, map0.get( s0 ));
@@ -206,7 +210,7 @@ public class TestOneToManyMap
}
public void testGetAll() {
- OneToManyMap<String, String> map0 = new OneToManyMap<String, String>();
+ OneToManyMap<String, String> map0 = new OneToManyMap<>();
Iterator<String> i = map0.getAll(s0);
assertNotNull( i );
assertFalse( i.hasNext() );
@@ -239,8 +243,8 @@ public class TestOneToManyMap
}
public void testKeySet() {
- OneToManyMap<String, String> map0 = new OneToManyMap<String, String>();
- Set<String> keys = new HashSet<String>();
+ OneToManyMap<String, String> map0 = new OneToManyMap<>();
+ Set<String> keys = new HashSet<>();
assertEquals( keys, map0.keySet() );
map0.put( s0, s1 );
@@ -253,37 +257,37 @@ public class TestOneToManyMap
}
public void testPutAll0() {
- OneToManyMap<String, String> map0 = new OneToManyMap<String, String>();
+ OneToManyMap<String, String> map0 = new OneToManyMap<>();
map0.put( s0, s1 );
map0.put( s0, s2 );
map0.put( s3, s4 );
- OneToManyMap<String, String> map1 = new OneToManyMap<String, String>();
+ OneToManyMap<String, String> map1 = new OneToManyMap<>();
map1.put( s0, s2 );
map1.put( s3, s4 );
map1.put( s0, s1 );
- OneToManyMap<String, String> map2 = new OneToManyMap<String, String>();
+ OneToManyMap<String, String> map2 = new OneToManyMap<>();
map2.putAll( map1 );
assertEquals( map0, map2 );
}
public void testPutAll1() {
- OneToManyMap<String, String> map0 = new OneToManyMap<String, String>();
+ OneToManyMap<String, String> map0 = new OneToManyMap<>();
map0.put( s0, s1 );
map0.put( s3, s4 );
- Map<String, String> map1 = new HashMap<String, String>();
+ Map<String, String> map1 = new HashMap<>();
map1.put( s3, s4 );
map1.put( s0, s1 );
- OneToManyMap<String, String> map2 = new OneToManyMap<String, String>();
+ OneToManyMap<String, String> map2 = new OneToManyMap<>();
map2.putAll( map1 );
assertEquals( map0, map2 );
}
public void testRemove0() {
- OneToManyMap<String, String> map0 = new OneToManyMap<String, String>();
+ OneToManyMap<String, String> map0 = new OneToManyMap<>();
map0.put( s0, s1 );
map0.put( s3, s4 );
@@ -294,7 +298,7 @@ public class TestOneToManyMap
}
public void testRemove1() {
- OneToManyMap<String, String> map0 = new OneToManyMap<String, String>();
+ OneToManyMap<String, String> map0 = new OneToManyMap<>();
map0.put( s0, s1 );
map0.put( s0, s2 );
map0.put( s3, s4 );
@@ -309,7 +313,7 @@ public class TestOneToManyMap
}
public void testSize() {
- OneToManyMap<String, String> map0 = new OneToManyMap<String, String>();
+ OneToManyMap<String, String> map0 = new OneToManyMap<>();
assertEquals( 0, map0.size() );
map0.put( s0, s1 );
assertEquals( 1, map0.size() );
@@ -326,8 +330,8 @@ public class TestOneToManyMap
}
public void testValues() {
- OneToManyMap<String, String> map0 = new OneToManyMap<String, String>();
- Set<String> vals = new HashSet<String>();
+ OneToManyMap<String, String> map0 = new OneToManyMap<>();
+ Set<String> vals = new HashSet<>();
assertEquals( vals, map0.values() );
map0.put( s0, s1 );
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestPrintUtil.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestPrintUtil.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestPrintUtil.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/TestPrintUtil.java Tue Jun 24 09:06:50 2014
@@ -54,7 +54,7 @@ public class TestPrintUtil extends TestC
PrintUtil.removePrefix("p");
assertEquals(uri, PrintUtil.print(r));
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("p", NS);
PrintUtil.registerPrefixMap(map);
assertEquals(shortform, PrintUtil.print(r));
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestAndThen.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestAndThen.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestAndThen.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestAndThen.java Tue Jun 24 09:06:50 2014
@@ -58,9 +58,9 @@ public class TestAndThen extends ModelTe
public void testClosingConcatenationClosesRemainingIterators()
{
- LoggingClosableIterator<String> L = new LoggingClosableIterator<String>( iteratorOfStrings( "only" ) );
- LoggingClosableIterator<String> M = new LoggingClosableIterator<String>( iteratorOfStrings( "single" ) );
- LoggingClosableIterator<String> R = new LoggingClosableIterator<String>( iteratorOfStrings( "it" ) );
+ LoggingClosableIterator<String> L = new LoggingClosableIterator<>( iteratorOfStrings( "only" ) );
+ LoggingClosableIterator<String> M = new LoggingClosableIterator<>( iteratorOfStrings( "single" ) );
+ LoggingClosableIterator<String> R = new LoggingClosableIterator<>( iteratorOfStrings( "it" ) );
ExtendedIterator<String> cat = L.andThen( M ).andThen( R );
cat.next();
cat.close();
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestFilters.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestFilters.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestFilters.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestFilters.java Tue Jun 24 09:06:50 2014
@@ -40,7 +40,7 @@ public class TestFilters extends ModelTe
public void testFilterAnyAcceptsThings()
{
assertTrue( Filter.any().accept( "hello" ) );
- assertTrue( Filter.any().accept( new Integer( 17 ) ) );
+ assertTrue( Filter.any().accept( 17 ) );
assertTrue( Filter.any().accept( node( "frodo" ) ) );
assertTrue( Filter.any().accept( node( "_cheshire" ) ) );
assertTrue( Filter.any().accept( node( "17" ) ) );
@@ -105,14 +105,14 @@ public class TestFilters extends ModelTe
public void testFilterDropIterator()
{
Iterator<String> i = iteratorOfStrings( "there's an a in some animals" );
- Iterator<String> it = new FilterDropIterator<String>( containsA, i );
+ Iterator<String> it = new FilterDropIterator<>( containsA, i );
assertEquals( listOfStrings( "there's in some" ), iteratorToList( it ) );
}
public void testFilterKeepIterator()
{
Iterator<String> i = iteratorOfStrings( "there's an a in some animals" );
- Iterator<String> it = new FilterKeepIterator<String>( containsA, i );
+ Iterator<String> it = new FilterKeepIterator<>( containsA, i );
assertEquals( listOfStrings( "an a animals" ), iteratorToList( it ) );
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestMapIterators.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestMapIterators.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestMapIterators.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestMapIterators.java Tue Jun 24 09:06:50 2014
@@ -36,8 +36,8 @@ public class TestMapIterators extends Mo
public String map1( String o )
{ return null; }
};
- LoggingClosableIterator<String> base = new LoggingClosableIterator<String>( null );
- Map1Iterator<String, String> mit = new Map1Iterator<String, String>( map, base );
+ LoggingClosableIterator<String> base = new LoggingClosableIterator<>( null );
+ Map1Iterator<String, String> mit = new Map1Iterator<>( map, base );
mit.close();
assertTrue( "base must have been closed by closing map", base.isClosed() );
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestNullIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestNullIterator.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestNullIterator.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestNullIterator.java Tue Jun 24 09:06:50 2014
@@ -43,7 +43,7 @@ public class TestNullIterator extends Mo
public void testAndThenReturnsArgument()
{
- ExtendedIterator<Object> it = new NiceIterator<Object>();
+ ExtendedIterator<Object> it = new NiceIterator<>();
assertSame( it, NullIterator.instance().andThen( it ) );
}
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestResourceUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestResourceUtils.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestResourceUtils.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestResourceUtils.java Tue Jun 24 09:06:50 2014
@@ -74,9 +74,9 @@ public class TestResourceUtils
d.addProperty( RDFS.subClassOf, c );
d.addProperty( RDFS.subClassOf, a );
- List<Resource> abcd = Arrays.asList( new Resource[] {a,b,c,d} );
- List<Resource> bcd = Arrays.asList( new Resource[] {b,c,d} );
- List<Resource> cd = Arrays.asList( new Resource[] {c,d} );
+ List<Resource> abcd = Arrays.asList( a,b,c,d );
+ List<Resource> bcd = Arrays.asList( b,c,d );
+ List<Resource> cd = Arrays.asList( c,d );
assertEquals( "Wrong number of remaining resources", 1, ResourceUtils.maximalLowerElements( abcd, RDFS.subClassOf, true ).size() );
assertEquals( "Result should be a", a, ResourceUtils.maximalLowerElements( abcd, RDFS.subClassOf, true ).iterator().next() );
@@ -187,13 +187,13 @@ public class TestResourceUtils
d.addProperty( RDFS.subClassOf, d );
e.addProperty( RDFS.subClassOf, e );
- List<Resource> abcde = Arrays.asList( new Resource[] {a,b,c,d,e} );
- List<Resource> ab = Arrays.asList( new Resource[] {a,b} );
- List<Resource> cde = Arrays.asList( new Resource[] {c,d,e} );
- List<Resource> abde = Arrays.asList( new Resource[] {a,b,d,e} );
- List<Resource> de = Arrays.asList( new Resource[] {d,e} );
+ List<Resource> abcde = Arrays.asList( a,b,c,d,e );
+ List<Resource> ab = Arrays.asList( a,b );
+ List<Resource> cde = Arrays.asList( c,d,e );
+ List<Resource> abde = Arrays.asList( a,b,d,e );
+ List<Resource> de = Arrays.asList( d,e );
- List<Resource> in = new ArrayList<Resource>();
+ List<Resource> in = new ArrayList<>();
in.addAll( abcde );
List<Resource> out = null;
assertTrue( in.equals( abcde ) );