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 2013/01/08 20:07:29 UTC
svn commit: r1430447 [5/10] - in /jena/branches/streaming-update: ./
apache-jena/ apache-jena/bat/ apache-jena/bin/ jena-arq/
jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/ jena-core/
jena-core/src/main/java/com/hp/hpl/jena/assembler/ jena-core/s...
Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/BasicForwardRuleInfGraph.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/BasicForwardRuleInfGraph.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/BasicForwardRuleInfGraph.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/BasicForwardRuleInfGraph.java Tue Jan 8 19:07:23 2013
@@ -18,18 +18,23 @@
package com.hp.hpl.jena.reasoner.rulesys;
-import com.hp.hpl.jena.reasoner.*;
-import com.hp.hpl.jena.reasoner.rulesys.impl.*;
-import com.hp.hpl.jena.shared.ReificationStyle;
-import com.hp.hpl.jena.graph.*;
+import java.util.Iterator ;
+import java.util.List ;
-import java.util.*;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
-import com.hp.hpl.jena.util.OneToManyMap;
-import com.hp.hpl.jena.util.iterator.*;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.hp.hpl.jena.graph.Factory ;
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.reasoner.* ;
+import com.hp.hpl.jena.reasoner.rulesys.impl.FRuleEngine ;
+import com.hp.hpl.jena.reasoner.rulesys.impl.FRuleEngineI ;
+import com.hp.hpl.jena.reasoner.rulesys.impl.SafeGraph ;
+import com.hp.hpl.jena.util.OneToManyMap ;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
+import com.hp.hpl.jena.util.iterator.NullIterator ;
/**
* An inference graph interface that runs a set of forward chaining
@@ -39,14 +44,9 @@ import org.slf4j.LoggerFactory;
* This implementation has a horribly inefficient rule chainer built in.
* Once we have this working generalize this to an interface than
* can call out to a rule engine and build a real rule engine (e.g. Rete style). </p>
- *
- * @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.4 $ on $Date: 2009-10-06 07:59:55 $
*/
-public class BasicForwardRuleInfGraph extends BaseInfGraph implements ForwardRuleInfGraphI {
-//=======================================================================
-// variables
+public class BasicForwardRuleInfGraph extends BaseInfGraph implements ForwardRuleInfGraphI {
/** Table of derivation records, maps from triple to RuleDerivation */
protected OneToManyMap<Triple, Derivation> derivations;
@@ -104,17 +104,13 @@ public class BasicForwardRuleInfGraph ex
* @param rules the list of rules to use this time
* @param schema the (optional) schema or preload data which is being processed
*/
- public BasicForwardRuleInfGraph(Reasoner reasoner, List<Rule> rules, Graph schema) {
- this( reasoner, rules, schema, ReificationStyle.Minimal );
- }
-
- public BasicForwardRuleInfGraph( Reasoner reasoner, List<Rule> rules, Graph schema, ReificationStyle style )
- {
- super( null, reasoner, style );
+ public BasicForwardRuleInfGraph(Reasoner reasoner, List<Rule> rules, Graph schema)
+ {
+ super( null, reasoner );
instantiateRuleEngine( rules );
this.rules = rules;
this.schemaGraph = schema;
- }
+ }
/**
* Constructor. Creates a new inference graph based on the given rule set
@@ -417,11 +413,11 @@ public class BasicForwardRuleInfGraph ex
Graph dg = fdeductions.getGraph();
if (dg != null) {
// Reuse the old graph in order to preserve any listeners
- safeDeductions.getBulkUpdateHandler().removeAll();
+ safeDeductions.clear();
return dg;
}
}
- Graph dg = Factory.createGraphMem( style );
+ Graph dg = Factory.createGraphMem( );
safeDeductions = new SafeGraph( dg );
return dg;
}
@@ -528,15 +524,4 @@ public class BasicForwardRuleInfGraph ex
return engine.getNRulesFired();
}
- @Override
- public Reifier constructReifier()
- {
- BasicFBReifier.GetReifier deductionsReifier = new BasicFBReifier.GetReifier()
- {
- @Override
- public Reifier getReifier() { return getDeductionsGraph().getReifier(); }
- };
- return new BasicFBReifier( this, getRawGraph().getReifier(), deductionsReifier, style );
- }
-
}
Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/FBRuleInfGraph.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/FBRuleInfGraph.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/FBRuleInfGraph.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/FBRuleInfGraph.java Tue Jan 8 19:07:23 2013
@@ -18,29 +18,35 @@
package com.hp.hpl.jena.reasoner.rulesys;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.reasoner.rulesys.impl.*;
-import com.hp.hpl.jena.reasoner.transitiveReasoner.*;
-import com.hp.hpl.jena.reasoner.*;
-import com.hp.hpl.jena.shared.ReificationStyle;
-import com.hp.hpl.jena.shared.impl.JenaParameters;
-import com.hp.hpl.jena.datatypes.RDFDatatype;
-import com.hp.hpl.jena.datatypes.TypeMapper;
-import com.hp.hpl.jena.graph.*;
-import com.hp.hpl.jena.graph.impl.LiteralLabel;
+import java.util.* ;
-import java.util.*;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
+import com.hp.hpl.jena.datatypes.RDFDatatype ;
+import com.hp.hpl.jena.datatypes.TypeMapper ;
+import com.hp.hpl.jena.graph.Factory ;
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.graph.impl.LiteralLabel ;
+import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.rdf.model.ModelFactory ;
+import com.hp.hpl.jena.rdf.model.RDFNode ;
+import com.hp.hpl.jena.reasoner.* ;
+import com.hp.hpl.jena.reasoner.rulesys.impl.* ;
+import com.hp.hpl.jena.reasoner.transitiveReasoner.TransitiveEngine ;
+import com.hp.hpl.jena.reasoner.transitiveReasoner.TransitiveGraphCache ;
+import com.hp.hpl.jena.reasoner.transitiveReasoner.TransitiveReasoner ;
+import com.hp.hpl.jena.shared.impl.JenaParameters ;
+import com.hp.hpl.jena.util.OneToManyMap ;
+import com.hp.hpl.jena.util.PrintUtil ;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
+import com.hp.hpl.jena.util.iterator.Filter ;
+import com.hp.hpl.jena.util.iterator.UniqueExtendedIterator ;
+import com.hp.hpl.jena.vocabulary.RDFS ;
+import com.hp.hpl.jena.vocabulary.ReasonerVocabulary ;
//import com.hp.hpl.jena.util.PrintUtil;
-import com.hp.hpl.jena.util.OneToManyMap;
-import com.hp.hpl.jena.util.PrintUtil;
-import com.hp.hpl.jena.util.iterator.*;
-import com.hp.hpl.jena.vocabulary.*;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* An inference graph that uses a mixture of forward and backward
@@ -116,11 +122,7 @@ public class FBRuleInfGraph extends Bas
* @param schema the (optional) schema graph to be included
*/
public FBRuleInfGraph(Reasoner reasoner, List<Rule> rules, Graph schema) {
- this( reasoner, rules, schema, ReificationStyle.Minimal );
- }
-
- public FBRuleInfGraph( Reasoner reasoner, List<Rule> rules, Graph schema, ReificationStyle style ) {
- super( reasoner, rules, schema, style );
+ super( reasoner, rules, schema );
this.rawRules = rules;
constructorInit( schema );
}
@@ -407,7 +409,7 @@ public class FBRuleInfGraph extends Bas
// initilize the deductions graph
if (fdeductions != null) {
Graph oldDeductions = (fdeductions).getGraph();
- oldDeductions.getBulkUpdateHandler().removeAll();
+ oldDeductions.clear();
} else {
fdeductions = new FGraph( createDeductionsGraph() );
}
Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/FBRuleReasoner.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/FBRuleReasoner.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/FBRuleReasoner.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/FBRuleReasoner.java Tue Jan 8 19:07:23 2013
@@ -231,9 +231,8 @@ public class FBRuleReasoner implements R
*/
@Override
public InfGraph bind( Graph data ) throws ReasonerException {
- ReificationStyle style = data.getReifier().getStyle();
Graph schemaArg = schemaGraph == null ? getPreload() : (FBRuleInfGraph) schemaGraph;
- FBRuleInfGraph graph = new FBRuleInfGraph( this, rules, schemaArg, style );
+ FBRuleInfGraph graph = new FBRuleInfGraph( this, rules, schemaArg );
graph.setDerivationLogging( recordDerivations );
graph.setTraceOn( traceOn );
graph.rebind( data );
Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPTopGoalIterator.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPTopGoalIterator.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPTopGoalIterator.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPTopGoalIterator.java Tue Jan 8 19:07:23 2013
@@ -73,34 +73,50 @@ public class LPTopGoalIterator implement
engine.setTopInterpreter(this);
}
+ /* A Note on lock ordering:
+ *
+ * Elsewhere code takes an LPBRuleEngine then an LPTopGoalIterator
+ * Ensure we do that lock order here as well as just synchronized
+ * on the method reverses the lock ordering, leading to deadlock.
+ */
+
+
/**
* Find the next result in the goal state and put it in the
* lookahead buffer.
*/
- private synchronized void moveForward() {
- checkClosed();
- LPBRuleEngine lpEngine = interpreter.getEngine();
+ private void moveForward() {
+ LPBRuleEngine lpEngine ;
+ synchronized(this)
+ {
+ checkClosed();
+ lpEngine = interpreter.getEngine();
+ }
synchronized (lpEngine) {
-
- lookaheadValid = true;
-
- // TODO nasty dynamic typing here.
- Object next = interpreter.next();
- lookAhead = next instanceof Triple ? (Triple) next : null;
- if (next == StateFlag.FAIL) {
- if (choicePoints.isEmpty()) {
- // Nothing left to try
- close();
- } else {
- // Some options open, continue pumping
- nextToRun = null;
- lpEngine.pump(this);
- if (nextToRun == null) {
- // Reached final closure
+ synchronized(this)
+ {
+ checkClosed();
+
+ lookaheadValid = true;
+
+ // TODO nasty dynamic typing here.
+ Object next = interpreter.next();
+ lookAhead = next instanceof Triple ? (Triple) next : null;
+ if (next == StateFlag.FAIL) {
+ if (choicePoints.isEmpty()) {
+ // Nothing left to try
close();
} else {
- interpreter.setState(nextToRun);
- moveForward();
+ // Some options open, continue pumping
+ nextToRun = null;
+ lpEngine.pump(this);
+ if (nextToRun == null) {
+ // Reached final closure
+ close();
+ } else {
+ interpreter.setState(nextToRun);
+ moveForward();
+ }
}
}
}
@@ -165,24 +181,37 @@ public class LPTopGoalIterator implement
* @see com.hp.hpl.jena.util.iterator.ClosableIterator#close()
*/
@Override
- public synchronized void close() {
- if (interpreter != null) {
- synchronized (interpreter.getEngine()) {
- // LogFactory.getLog( getClass() ).debug( "Entering close sync block on " + interpreter.getEngine() );
-
- // Check for any dangling generators which are complete
- interpreter.getEngine().checkForCompletions();
- // Close this top goal
- lookAhead = null;
- //LogFactory.getLog( getClass() ).debug( "Nulling and closing LPTopGoalIterator " + interpreter );
- interpreter.close();
- // was TEMP experiment: interpreter.getEngine().detach(interpreter);
- interpreter = null;
- isReady = false;
- checkReadyNeeded = false;
- nextToRun = null;
-// choicePoints = null; // disabled to prevent async close causing problems
- //LogFactory.getLog( getClass() ).debug( "Leaving close sync block " );
+ public void close() {
+ LPBRuleEngine lpEngine ;
+ synchronized(this)
+ {
+ if ( interpreter == null ) return ;
+ lpEngine = interpreter.getEngine();
+ }
+
+ synchronized (lpEngine) {
+ // Elsewhere code takes an LPBRuleEngine then an LPTopGoalIterator
+ // Ensure we do that lock order here as well as just synchronized
+ // on the method reverses the locks takne, leading to deadlock.
+ synchronized(this)
+ {
+ if (interpreter != null) {
+ // LogFactory.getLog( getClass() ).debug( "Entering close sync block on " + interpreter.getEngine() );
+
+ // Check for any dangling generators which are complete
+ interpreter.getEngine().checkForCompletions();
+ // Close this top goal
+ lookAhead = null;
+ //LogFactory.getLog( getClass() ).debug( "Nulling and closing LPTopGoalIterator " + interpreter );
+ interpreter.close();
+ // was TEMP experiment: interpreter.getEngine().detach(interpreter);
+ interpreter = null;
+ isReady = false;
+ checkReadyNeeded = false;
+ nextToRun = null;
+ // choicePoints = null; // disabled to prevent async close causing problems
+ //LogFactory.getLog( getClass() ).debug( "Leaving close sync block " );
+ }
}
}
}
Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/shared/ReificationStyle.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/shared/ReificationStyle.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/shared/ReificationStyle.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/shared/ReificationStyle.java Tue Jan 8 19:07:23 2013
@@ -24,10 +24,15 @@ package com.hp.hpl.jena.shared;
in-Jena reification is through the reifyAs operation], and whether or
not reification triples will be visible in the graph.
*/
+@Deprecated
public class ReificationStyle
{
public static final ReificationStyle Standard = new ReificationStyle( true, false );
+ /** @deprecated Only "Standard" is supported -- use of this constant will be ignored */
+ @Deprecated
public static final ReificationStyle Convenient = new ReificationStyle( true, true );
+ /** @deprecated Only "Standard" is supported -- use of this constant will be ignored */
+ @Deprecated
public static final ReificationStyle Minimal = new ReificationStyle( false, true );
private boolean intercept;
Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/xmloutput/impl/BaseXMLWriter.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/xmloutput/impl/BaseXMLWriter.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/xmloutput/impl/BaseXMLWriter.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/xmloutput/impl/BaseXMLWriter.java Tue Jan 8 19:07:23 2013
@@ -18,53 +18,31 @@
package com.hp.hpl.jena.xmloutput.impl;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.Vector;
-import java.util.Map.Entry;
-import java.util.regex.Pattern;
-
-import org.apache.xerces.util.XMLChar;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.hp.hpl.jena.JenaRuntime;
-import org.apache.jena.iri.IRI;
-import org.apache.jena.iri.IRIFactory;
-import com.hp.hpl.jena.rdf.model.AnonId;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.NsIterator;
-import com.hp.hpl.jena.rdf.model.RDFErrorHandler;
-import com.hp.hpl.jena.rdf.model.RDFWriter;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler;
-import com.hp.hpl.jena.rdf.model.impl.ResourceImpl;
-import com.hp.hpl.jena.rdf.model.impl.Util;
-import com.hp.hpl.jena.shared.BadBooleanException;
-import com.hp.hpl.jena.shared.BadURIException;
-import com.hp.hpl.jena.shared.BrokenException;
-import com.hp.hpl.jena.shared.InvalidPropertyURIException;
-import com.hp.hpl.jena.shared.JenaException;
-import com.hp.hpl.jena.shared.PrefixMapping;
-import com.hp.hpl.jena.util.CharEncoding;
-import com.hp.hpl.jena.util.FileUtils;
+import java.io.OutputStream ;
+import java.io.OutputStreamWriter ;
+import java.io.PrintWriter ;
+import java.io.Writer ;
+import java.util.* ;
+import java.util.Map.Entry ;
+import java.util.regex.Pattern ;
+
+import org.apache.jena.iri.IRI ;
+import org.apache.jena.iri.IRIFactory ;
+import org.apache.xerces.util.XMLChar ;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
+
+import com.hp.hpl.jena.JenaRuntime ;
+import com.hp.hpl.jena.rdf.model.* ;
+import com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler ;
+import com.hp.hpl.jena.rdf.model.impl.ResourceImpl ;
+import com.hp.hpl.jena.rdf.model.impl.Util ;
+import com.hp.hpl.jena.shared.* ;
+import com.hp.hpl.jena.util.CharEncoding ;
+import com.hp.hpl.jena.util.FileUtils ;
+import com.hp.hpl.jena.vocabulary.* ;
+import com.hp.hpl.jena.xmloutput.RDFXMLWriterI ;
//import com.hp.hpl.jena.vocabulary.DAML_OIL;
-import com.hp.hpl.jena.vocabulary.DC;
-import com.hp.hpl.jena.vocabulary.RDF;
-import com.hp.hpl.jena.vocabulary.RDFS;
-import com.hp.hpl.jena.vocabulary.RDFSyntax;
-import com.hp.hpl.jena.vocabulary.RSS;
-import com.hp.hpl.jena.vocabulary.VCARD;
-import com.hp.hpl.jena.xmloutput.RDFXMLWriterI;
/**
* This is not part of the public API.
@@ -478,10 +456,9 @@ abstract public class BaseXMLWriter impl
* null</code> means use only absolute URI's.
*/
@Override
- synchronized public void write(Model baseModel, Writer out, String base)
+ synchronized public void write(Model model, Writer out, String base)
{
- Model model = ModelFactory.withHiddenStatements( baseModel );
- setupNamespaces( baseModel, model );
+ setupNamespaces( model );
PrintWriter pw = out instanceof PrintWriter ? (PrintWriter) out : new PrintWriter( out );
if (!Boolean.FALSE.equals(showXmlDeclaration)) writeXMLDeclaration( out, pw );
writeXMLBody( model, pw, base );
@@ -492,12 +469,12 @@ abstract public class BaseXMLWriter impl
@param baseModel
@param model
*/
- private void setupNamespaces( Model baseModel, Model model )
+ private void setupNamespaces( Model model )
{
this.namespacesNeeded = new HashSet<String>();
this.ns = null;
- this.modelPrefixMapping = baseModel;
- primeNamespace( baseModel );
+ this.modelPrefixMapping = model;
+ primeNamespace( model );
addNameSpace( RDF.getURI() );
addNameSpaces(model);
jenaPrefixCount = 0;
Modified: jena/branches/streaming-update/jena-core/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/resources/META-INF/NOTICE?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/resources/META-INF/NOTICE (original)
+++ jena/branches/streaming-update/jena-core/src/main/resources/META-INF/NOTICE Tue Jan 8 19:07:23 2013
@@ -1,5 +1,5 @@
Apache Jena - module jena-core
-Copyright 2011, 2012 The Apache Software Foundation
+Copyright 2011-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -11,4 +11,4 @@ Portions of this software were originall
These have been licensed to the Apache Software Foundation under a software grant.
This product includes software developed by
-PluggedIn Software and under a BSD license.
+PluggedIn Software under a BSD license.
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/AssemblerTestBase.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/AssemblerTestBase.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/AssemblerTestBase.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/AssemblerTestBase.java Tue Jan 8 19:07:23 2013
@@ -32,10 +32,8 @@ import com.hp.hpl.jena.vocabulary.*;
may be over-ridden in subclasses to control the parser that is used to
construct models and the prefixes added to the model (these features
added for Eyeball).
-
- @author kers
*/
-public abstract class AssemblerTestBase extends ModelTestBase
+public class AssemblerTestBase extends ModelTestBase
{
protected Class<? extends Assembler> getAssemblerClass()
{ throw new BrokenException( "this class must define getAssemblerClass" ); }
@@ -89,7 +87,7 @@ public abstract class AssemblerTestBase
protected Model model( String string )
{
- Model result = createModel( ReificationStyle.Standard );
+ Model result = createModel( );
setRequiredPrefixes( result );
return modelAddFacts( result, string );
}
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/TestFileModelAssembler.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/TestFileModelAssembler.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/TestFileModelAssembler.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/TestFileModelAssembler.java Tue Jan 8 19:07:23 2013
@@ -27,7 +27,7 @@ import com.hp.hpl.jena.rdf.model.*;
import com.hp.hpl.jena.shared.*;
import com.hp.hpl.jena.util.FileUtils;
-public class TestFileModelAssembler extends ModelAssemblerTestBase
+public class TestFileModelAssembler extends AssemblerTestBase
{
public TestFileModelAssembler( String name )
@@ -57,11 +57,10 @@ public class TestFileModelAssembler exte
{
FileModelAssembler a = new FileModelAssembler();
File x = FileUtils.tempFileName( "fileModelAssembler", ".n3" );
- Model m = a.createFileModel( x, "N3", true, false, ReificationStyle.Convenient );
+ Model m = a.createFileModel( x, "N3", true, false);
assertInstanceOf( FileGraph.class, m.getGraph() );
FileGraph fg = (FileGraph) m.getGraph();
assertEquals( x, fg.name );
- assertSame( ReificationStyle.Convenient, fg.getReifier().getStyle() );
}
public void testFileModelAssemblerUsesSpecialisedMethod()
@@ -70,7 +69,7 @@ public class TestFileModelAssembler exte
FileModelAssembler a = new FileModelAssembler()
{
@Override
- public Model createFileModel( File fullName, String lang, boolean create, boolean strict, ReificationStyle style )
+ public Model createFileModel( File fullName, String lang, boolean create, boolean strict)
{ return model; }
};
Resource root = resourceInModel( "x rdf:type ja:FileModel; x ja:modelName 'junk'; x ja:directory file:" );
@@ -85,7 +84,7 @@ public class TestFileModelAssembler exte
FileModelAssembler a = new FileModelAssembler()
{
@Override
- public Model createFileModel( File fullName, String lang, boolean create, boolean strict, ReificationStyle style )
+ public Model createFileModel( File fullName, String lang, boolean create, boolean strict)
{
assertEquals( "LANG", lang );
return model;
@@ -109,7 +108,7 @@ public class TestFileModelAssembler exte
FileModelAssembler a = new FileModelAssembler()
{
@Override
- public Model createFileModel( File fullName, String lang, boolean create, boolean strict, ReificationStyle style )
+ public Model createFileModel( File fullName, String lang, boolean create, boolean strict)
{ return model; }
};
try
@@ -121,30 +120,6 @@ public class TestFileModelAssembler exte
assertEquals( rdfNode( m, lang ), e.getObject() ); }
}
- public void testFileModelAssemblerUsesStyle()
- {
- testUsesStyle( "ja:minimal", ReificationStyle.Minimal );
- testUsesStyle( "ja:standard", ReificationStyle.Standard );
- testUsesStyle( "ja:convenient", ReificationStyle.Convenient );
- }
-
- private void testUsesStyle( String styleString, final ReificationStyle style )
- {
- final Model model = ModelFactory.createDefaultModel();
- FileModelAssembler a = new FileModelAssembler()
- {
- @Override
- public Model createFileModel( File fullName, String lang, boolean create, boolean strict, ReificationStyle s )
- {
- assertSame( style, s );
- return model;
- }
- };
- Resource root = resourceInModel( "x rdf:type ja:FileModel; x ja:modelName 'junk'; x ja:directory file:" + "; x ja:reificationMode " + styleString );
- Model m = a.openModel( root );
- assertSame( model, m );
- }
-
public void testStrictAndCreateCanBeSetFromProperties()
{
NoteAssemblerBooleans a = new NoteAssemblerBooleans();
@@ -169,7 +144,7 @@ public class TestFileModelAssembler exte
{ this.model = model(); }
@Override
- public Model createFileModel( File fullName, String lang, boolean create, boolean strict, ReificationStyle s )
+ public Model createFileModel( File fullName, String lang, boolean create, boolean strict )
{
this.create = create;
this.strict = strict;
@@ -194,7 +169,7 @@ public class TestFileModelAssembler exte
FileModelAssembler a = new FileModelAssembler()
{
@Override
- public Model createFileModel( File fullName, String lang, boolean create, boolean strict, ReificationStyle s )
+ public Model createFileModel( File fullName, String lang, boolean create, boolean strict)
{
if (mayCreate && mayReuse)
{
@@ -241,7 +216,6 @@ public class TestFileModelAssembler exte
{
final Model model = ModelFactory.createDefaultModel();
final File wantedFullName = new File( expectedName );
- final ReificationStyle wantedStyle = ReificationStyle.Standard;
final boolean wantedCreate = Mode.DEFAULT.permitCreateNew( null, null );
final boolean wantedStrict = Mode.DEFAULT.permitUseExisting( null, null );
Resource root = resourceInModel( "x rdf:type ja:FileModel; x ja:modelName '" + modelName + "'; x ja:directory file:" + directoryName );
@@ -249,10 +223,9 @@ public class TestFileModelAssembler exte
FileModelAssembler a = new FileModelAssembler()
{
@Override
- public Model createFileModel( File fullName, String lang, boolean create, boolean strict, ReificationStyle style )
+ public Model createFileModel( File fullName, String lang, boolean create, boolean strict)
{
assertEquals( wantedFullName, fullName );
- assertEquals( wantedStyle, style );
assertEquals( wantedCreate, create );
assertEquals( wantedStrict, strict );
return model;
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/TestMemoryModelAssembler.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/TestMemoryModelAssembler.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/TestMemoryModelAssembler.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/TestMemoryModelAssembler.java Tue Jan 8 19:07:23 2013
@@ -24,7 +24,7 @@ import com.hp.hpl.jena.assembler.assembl
import com.hp.hpl.jena.mem.GraphMemBase;
import com.hp.hpl.jena.rdf.model.*;
-public class TestMemoryModelAssembler extends ModelAssemblerTestBase
+public class TestMemoryModelAssembler extends AssemblerTestBase
{
public TestMemoryModelAssembler( String name )
{ super( name ); }
@@ -42,9 +42,4 @@ public class TestMemoryModelAssembler ex
assertInstanceOf( Model.class, m );
assertInstanceOf( GraphMemBase.class, m.getGraph() );
}
-
- public void testCreatesWithStyle()
- {
- testCreatesWithStyle( new MemoryModelAssembler(), "x rdf:type ja:MemoryModel" );
- }
}
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/TestModelAssembler.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/TestModelAssembler.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/TestModelAssembler.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/TestModelAssembler.java Tue Jan 8 19:07:23 2013
@@ -18,13 +18,14 @@
package com.hp.hpl.jena.assembler.test;
-import java.util.*;
-
-import com.hp.hpl.jena.assembler.*;
-import com.hp.hpl.jena.assembler.assemblers.*;
-import com.hp.hpl.jena.assembler.exceptions.UnknownStyleException;
-import com.hp.hpl.jena.rdf.model.*;
-import com.hp.hpl.jena.shared.*;
+import com.hp.hpl.jena.assembler.Assembler ;
+import com.hp.hpl.jena.assembler.Mode ;
+import com.hp.hpl.jena.assembler.assemblers.ContentAssembler ;
+import com.hp.hpl.jena.assembler.assemblers.ModelAssembler ;
+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.shared.PrefixMapping ;
public class TestModelAssembler extends AssemblerTestBase
{
@@ -40,15 +41,6 @@ public class TestModelAssembler extends
@Override protected Class<? extends Assembler> getAssemblerClass()
{ return null; }
- public void testModelAssemblerVocabulary()
- {
- assertDomain( JA.Model, JA.reificationMode );
- assertRange( JA.ReificationMode, JA.reificationMode );
- assertType( JA.ReificationMode, JA.minimal );
- assertType( JA.ReificationMode, JA.standard );
- assertType( JA.ReificationMode, JA.convenient );
- }
-
public void testContent()
{
Resource root = resourceInModel( "x rdf:type ja:DefaultModel; x ja:initialContent c; c ja:quotedContent A; A P B" );
@@ -70,57 +62,4 @@ public class TestModelAssembler extends
Model m = (Model) a.open( Assembler.prefixMapping, root );
assertSamePrefixMapping( wanted, m );
}
-
- public void testGetsStandardReificationMode()
- {
- final List<ReificationStyle> style = new ArrayList<ReificationStyle>();
- Assembler a = new ModelAssembler()
- {
- @Override
- protected Model openEmptyModel( Assembler a, Resource root, Mode irrelevant )
- {
- style.add( getReificationStyle( root ) );
- return ModelFactory.createDefaultModel();
- }
- };
- a.openModel( resourceInModel( "a rdf:type ja:Model" ) );
- assertEquals( listOfOne( ReificationStyle.Standard ), style );
- }
-
- public void testGetsExplicitReificationMode()
- {
- testGetsStyle( "ja:minimal", ReificationStyle.Minimal );
- testGetsStyle( "ja:standard", ReificationStyle.Standard );
- testGetsStyle( "ja:convenient", ReificationStyle.Convenient );
- }
-
- public void testUnknownStyleFails()
- {
- try
- {
- testGetsStyle( "unknown", ReificationStyle.Standard );
- fail( "should trap unknown reification style" );
- }
- catch (UnknownStyleException e)
- {
- assertEquals( resource( "unknown" ), e.getStyle() );
- assertEquals( resource( "a" ), e.getRoot() );
- }
- }
-
- private void testGetsStyle( String styleString, ReificationStyle style )
- {
- final List<ReificationStyle> styles = new ArrayList<ReificationStyle>();
- Assembler a = new ModelAssembler()
- {
- @Override
- protected Model openEmptyModel( Assembler a, Resource root, Mode irrelevant )
- {
- styles.add( getReificationStyle( root ) );
- return ModelFactory.createDefaultModel();
- }
- };
- a.openModel( resourceInModel( "a rdf:type ja:Model; a ja:reificationMode " + styleString ) );
- assertEquals( listOfOne( style ), styles );
- }
- }
+ }
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestCaseBasic.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestCaseBasic.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestCaseBasic.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestCaseBasic.java Tue Jan 8 19:07:23 2013
@@ -23,9 +23,6 @@ import java.lang.reflect.*;
import com.hp.hpl.jena.graph.*;
import com.hp.hpl.jena.rdf.model.ModelFactory;
-/**
- @author bwm, kers
-*/
public class TestCaseBasic extends com.hp.hpl.jena.regression.TestCaseBasic
{
private Class<? extends Graph> graphClass;
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDelta.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDelta.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDelta.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDelta.java Tue Jan 8 19:07:23 2013
@@ -18,15 +18,13 @@
package com.hp.hpl.jena.graph.compose.test;
-import com.hp.hpl.jena.graph.*;
-import com.hp.hpl.jena.graph.compose.Delta;
-import com.hp.hpl.jena.graph.test.*;
+import junit.framework.TestSuite ;
-import junit.framework.*;
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.compose.Delta ;
+import com.hp.hpl.jena.graph.test.GraphTestBase ;
-/**
- @author kers
-*/
+@SuppressWarnings("deprecation")
public class TestDelta extends GraphTestBase
{
@@ -45,7 +43,7 @@ public class TestDelta extends GraphTest
/* */
Graph base = graphWith( "x R y; p S q; I like cheese; pins pop balloons" );
Graph save = graphWith( "x R y; p S q; I like cheese; pins pop balloons" );
- Delta delta = new Delta( base );
+ Delta delta = new Delta( base );
assertContainsAll( "Delta", delta, "x R y; p S q; I like cheese; pins pop balloons" );
assertContainsAll( "Delta", base, "x R y; p S q; I like cheese; pins pop balloons" );
/* */
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDifference.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDifference.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDifference.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDifference.java Tue Jan 8 19:07:23 2013
@@ -24,9 +24,7 @@ import com.hp.hpl.jena.graph.test.*;
import junit.framework.*;
-/**
- @author kers
-*/
+@SuppressWarnings("deprecation")
public class TestDifference extends GraphTestBase
{
public TestDifference( String name )
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDisjointUnion.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDisjointUnion.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDisjointUnion.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDisjointUnion.java Tue Jan 8 19:07:23 2013
@@ -26,7 +26,6 @@ import com.hp.hpl.jena.graph.test.GraphT
/**
TestDisjointUnion - test that DisjointUnion works, as well as we can.
- @author kers
*/
public class TestDisjointUnion extends GraphTestBase
{
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDyadic.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDyadic.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDyadic.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDyadic.java Tue Jan 8 19:07:23 2013
@@ -27,9 +27,6 @@ import com.hp.hpl.jena.graph.test.*;
import java.util.*;
import junit.framework.*;
-/**
- @author kers
-*/
public class TestDyadic extends GraphTestBase
{
public TestDyadic( String name )
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestIntersection.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestIntersection.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestIntersection.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestIntersection.java Tue Jan 8 19:07:23 2013
@@ -23,6 +23,7 @@ import com.hp.hpl.jena.graph.compose.Int
import com.hp.hpl.jena.graph.test.*;
import junit.framework.*;
+@SuppressWarnings("deprecation")
public class TestIntersection extends GraphTestBase
{
public TestIntersection( String name )
@@ -51,7 +52,7 @@ public class TestIntersection extends Gr
Graph L = graphWith( "a pings b; b pings c; c pings a" );
Graph R = graphWith( "c pings a; b pings c; x captures y" );
Graph join = new Intersection( L, R );
- L.getBulkUpdateHandler().delete( join );
+ GraphUtil.deleteFrom(L, R) ;
assertIsomorphic( "R should not change", graphWith( "c pings a; b pings c; x captures y" ), R );
assertIsomorphic( graphWith( "a pings b" ), L );
}
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestMultiUnion.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestMultiUnion.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestMultiUnion.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestMultiUnion.java Tue Jan 8 19:07:23 2013
@@ -39,10 +39,6 @@ import junit.framework.*;
* <p>
* Unit tests for multi-union graph.
* </p>
- *
- * @author Ian Dickinson, HP Labs
- * (<a href="mailto:ian_dickinson@users.sourceforge.net" >email</a>)
- * @version CVS $Id: TestMultiUnion.java,v 1.2 2009-10-06 13:04:44 ian_dickinson Exp $
*/
public class TestMultiUnion extends AbstractTestGraph
{
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestMultiUnionReifier.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestMultiUnionReifier.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestMultiUnionReifier.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestMultiUnionReifier.java Tue Jan 8 19:07:23 2013
@@ -18,17 +18,18 @@
package com.hp.hpl.jena.graph.compose.test;
-import com.hp.hpl.jena.graph.*;
-import com.hp.hpl.jena.graph.compose.MultiUnion;
-import com.hp.hpl.jena.graph.test.NodeCreateUtils;
-import com.hp.hpl.jena.rdf.model.test.ModelTestBase;
-import com.hp.hpl.jena.shared.ReificationStyle;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
+import com.hp.hpl.jena.graph.Factory ;
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.GraphUtil ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.graph.compose.MultiUnion ;
+import com.hp.hpl.jena.graph.test.NodeCreateUtils ;
+import com.hp.hpl.jena.rdf.model.impl.ReifierStd ;
+import com.hp.hpl.jena.rdf.model.test.ModelTestBase ;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
/**
Test the reifier for multi-unions.
-
- @author kers
*/
public class TestMultiUnionReifier extends ModelTestBase
{
@@ -54,7 +55,7 @@ public class TestMultiUnionReifier exten
private Graph graph( String facts )
{
- Graph result = Factory.createDefaultGraph( ReificationStyle.Standard );
+ Graph result = Factory.createDefaultGraph( );
String [] factArray = facts.split( ";" );
for (int i = 0; i < factArray.length; i += 1)
{
@@ -65,12 +66,12 @@ public class TestMultiUnionReifier exten
{
Triple t = NodeCreateUtils.createTriple( fact.substring( 1 ) );
result.add( t );
- result.getReifier().reifyAs( NodeCreateUtils.create( "_r" + ++count ), t );
+ ReifierStd.reifyAs(result, NodeCreateUtils.create( "_r" + ++count ), t );
}
else if (fact.charAt( 0 ) == '~')
{
Triple t = NodeCreateUtils.createTriple( fact.substring( 1 ) );
- result.getReifier().reifyAs( NodeCreateUtils.create( "_r" + ++count ), t );
+ ReifierStd.reifyAs( result, NodeCreateUtils.create( "_r" + ++count ), t );
}
else
result.add( NodeCreateUtils.createTriple( fact ) );
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestPackage.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestPackage.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestPackage.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestPackage.java Tue Jan 8 19:07:23 2013
@@ -18,9 +18,6 @@
package com.hp.hpl.jena.graph.compose.test;
-/**
- @author kers
-*/
import com.hp.hpl.jena.graph.Graph;
import com.hp.hpl.jena.graph.compose.*;
@@ -28,13 +25,9 @@ import com.hp.hpl.jena.mem.test.TestSuit
import junit.framework.*;
-/**
- *
- * @author bwm
- * @version $Name: not supported by cvs2svn $ $Revision: 1.1 $ $Date: 2009-06-29 08:55:42 $
- */
public class TestPackage extends TestCase {
+ @SuppressWarnings("deprecation")
public static TestSuite suite() {
TestSuite result = new TestSuite();
suite( result, Intersection.class );
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestUnion.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestUnion.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestUnion.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestUnion.java Tue Jan 8 19:07:23 2013
@@ -25,10 +25,6 @@ import com.hp.hpl.jena.graph.test.*;
import junit.framework.*;
-/**
- @author kers.
-*/
-
public class TestUnion extends GraphTestBase
{
public TestUnion( String name )