Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[8638] branches/SESAME_2_7
|
From: <mrp...@us...> - 2014-09-02 20:06:31
|
Revision: 8638
http://sourceforge.net/p/bigdata/code/8638
Author: mrpersonick
Date: 2014-09-02 20:06:22 +0000 (Tue, 02 Sep 2014)
Log Message:
-----------
Ticket #714: Sesame 2.7. Tidying up some CI loose ends.
Modified Paths:
--------------
branches/SESAME_2_7/bigdata-gas/src/java/com/bigdata/rdf/graph/util/AbstractGraphFixture.java
branches/SESAME_2_7/bigdata-rdf/src/test/com/bigdata/rdf/internal/constraints/TestStrAfterBOp.java
branches/SESAME_2_7/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestNegation.java
branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/AbstractBigdataExprBuilderTestCase.java
branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestBigdataExprBuilder.java
branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestBindingsClause.java
branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestGroupGraphPatternBuilder.java
branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestSubqueryPatterns.java
branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestTriplePatternBuilder.java
branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestUpdateExprBuilder.java
branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestValueExprBuilder.java
branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestVirtualGraphs.java
Modified: branches/SESAME_2_7/bigdata-gas/src/java/com/bigdata/rdf/graph/util/AbstractGraphFixture.java
===================================================================
--- branches/SESAME_2_7/bigdata-gas/src/java/com/bigdata/rdf/graph/util/AbstractGraphFixture.java 2014-09-02 19:28:35 UTC (rev 8637)
+++ branches/SESAME_2_7/bigdata-gas/src/java/com/bigdata/rdf/graph/util/AbstractGraphFixture.java 2014-09-02 20:06:22 UTC (rev 8638)
@@ -28,6 +28,7 @@
SailConnection cxn = null;
try {
cxn = getSail().getConnection();
+ cxn.begin();
newSailGraphLoader(cxn).loadGraph(null/* fallback */, resources);
cxn.commit();
ok = true;
Modified: branches/SESAME_2_7/bigdata-rdf/src/test/com/bigdata/rdf/internal/constraints/TestStrAfterBOp.java
===================================================================
--- branches/SESAME_2_7/bigdata-rdf/src/test/com/bigdata/rdf/internal/constraints/TestStrAfterBOp.java 2014-09-02 19:28:35 UTC (rev 8637)
+++ branches/SESAME_2_7/bigdata-rdf/src/test/com/bigdata/rdf/internal/constraints/TestStrAfterBOp.java 2014-09-02 20:06:22 UTC (rev 8638)
@@ -143,7 +143,7 @@
// strbefore("abc"^^xsd:string,"") -> ""^^xsd:string
{
final IV expected = DummyConstantNode.toDummyIV(vf
- .createLiteral("", XSD.STRING));
+ .createLiteral("abc", XSD.STRING));
final IV arg1 = DummyConstantNode.toDummyIV(vf
.createLiteral("abc", XSD.STRING));
Modified: branches/SESAME_2_7/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestNegation.java
===================================================================
--- branches/SESAME_2_7/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestNegation.java 2014-09-02 19:28:35 UTC (rev 8637)
+++ branches/SESAME_2_7/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestNegation.java 2014-09-02 20:06:22 UTC (rev 8638)
@@ -36,6 +36,7 @@
import com.bigdata.rdf.model.BigdataURI;
import com.bigdata.rdf.model.BigdataValue;
import com.bigdata.rdf.model.BigdataValueFactory;
+import com.bigdata.rdf.sail.sparql.PrefixDeclProcessor;
import com.bigdata.rdf.sparql.ast.ASTContainer;
import com.bigdata.rdf.sparql.ast.AssignmentNode;
import com.bigdata.rdf.sparql.ast.ConstantNode;
@@ -511,7 +512,7 @@
// Prefix declarations.
{
- expected.setPrefixDecls((Map)Collections.emptyMap());
+ expected.setPrefixDecls(PrefixDeclProcessor.defaultDecls);
}
// Top-level projection.
Modified: branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/AbstractBigdataExprBuilderTestCase.java
===================================================================
--- branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/AbstractBigdataExprBuilderTestCase.java 2014-09-02 19:28:35 UTC (rev 8637)
+++ branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/AbstractBigdataExprBuilderTestCase.java 2014-09-02 20:06:22 UTC (rev 8638)
@@ -69,7 +69,7 @@
public class AbstractBigdataExprBuilderTestCase extends TestCase {
private static final Logger log = Logger
- .getLogger(TestBigdataExprBuilder.class);
+ .getLogger(AbstractBigdataExprBuilderTestCase.class);
/**
*
Modified: branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestBigdataExprBuilder.java
===================================================================
--- branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestBigdataExprBuilder.java 2014-09-02 19:28:35 UTC (rev 8637)
+++ branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestBigdataExprBuilder.java 2014-09-02 20:06:22 UTC (rev 8638)
@@ -96,7 +96,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -133,7 +133,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -171,7 +171,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -212,7 +212,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -262,7 +262,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -314,7 +314,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -370,7 +370,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -422,7 +422,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -466,7 +466,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -511,7 +511,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -551,7 +551,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -596,7 +596,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -645,7 +645,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -687,7 +687,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -732,7 +732,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -775,7 +775,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -821,7 +821,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -864,7 +864,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
prefixDecls.put("rdf", RDF.NAMESPACE);
expected.setPrefixDecls(prefixDecls);
}
@@ -908,7 +908,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
prefixDecls.put("rdf", RDF.NAMESPACE);
expected.setPrefixDecls(prefixDecls);
}
@@ -973,7 +973,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
prefixDecls.put("foaf", FOAFVocabularyDecl.NAMESPACE);
prefixDecls.put("dc", DC.NAMESPACE);
expected.setPrefixDecls(prefixDecls);
@@ -1067,7 +1067,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
prefixDecls.put("foaf", FOAFVocabularyDecl.NAMESPACE);
prefixDecls.put("dc", DC.NAMESPACE);
expected.setPrefixDecls(prefixDecls);
@@ -1180,7 +1180,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
prefixDecls.put("foaf", FOAFVocabularyDecl.NAMESPACE);
}
Modified: branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestBindingsClause.java
===================================================================
--- branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestBindingsClause.java 2014-09-02 19:28:35 UTC (rev 8637)
+++ branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestBindingsClause.java 2014-09-02 20:06:22 UTC (rev 8638)
@@ -113,7 +113,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
prefixDecls.put("", "http://example.org/book/");
expected.setPrefixDecls(prefixDecls);
}
@@ -196,7 +196,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
prefixDecls.put("", "http://example.org/book/");
expected.setPrefixDecls(prefixDecls);
}
@@ -282,7 +282,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
prefixDecls.put("", "http://example.org/book/");
expected.setPrefixDecls(prefixDecls);
}
@@ -374,7 +374,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
prefixDecls.put("", "http://example.org/book/");
expected.setPrefixDecls(prefixDecls);
}
@@ -463,7 +463,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
prefixDecls.put("", "http://example.org/book/");
expected.setPrefixDecls(prefixDecls);
}
Modified: branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestGroupGraphPatternBuilder.java
===================================================================
--- branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestGroupGraphPatternBuilder.java 2014-09-02 19:28:35 UTC (rev 8637)
+++ branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestGroupGraphPatternBuilder.java 2014-09-02 20:06:22 UTC (rev 8638)
@@ -107,7 +107,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -141,7 +141,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -184,7 +184,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -225,7 +225,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -277,7 +277,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -330,7 +330,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -385,7 +385,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -447,7 +447,7 @@
final VarNode o = new VarNode("o");
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -522,7 +522,7 @@
final VarNode o = new VarNode("o");
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -599,7 +599,7 @@
final VarNode o = new VarNode("o");
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -659,7 +659,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -702,7 +702,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -747,7 +747,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -794,7 +794,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -844,7 +844,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -895,7 +895,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -941,7 +941,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -989,7 +989,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -1038,7 +1038,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -1092,7 +1092,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -1148,7 +1148,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -1203,7 +1203,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -1259,7 +1259,7 @@
final QueryRoot expected = new QueryRoot(QueryType.SELECT);
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
{
prefixDecls.put("", "http://www.bigdata.com/");
expected.setPrefixDecls(prefixDecls);
@@ -1314,8 +1314,8 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
- expected.setPrefixDecls(prefixDecls);
+// final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
+// expected.setPrefixDecls(prefixDecls);
}
{
Modified: branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestSubqueryPatterns.java
===================================================================
--- branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestSubqueryPatterns.java 2014-09-02 19:28:35 UTC (rev 8637)
+++ branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestSubqueryPatterns.java 2014-09-02 20:06:22 UTC (rev 8638)
@@ -104,7 +104,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -169,7 +169,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -235,7 +235,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -301,7 +301,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -371,7 +371,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -454,7 +454,7 @@
makeIV(valueFactory.createLiteral("12", XSD.INTEGER)));
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -566,7 +566,7 @@
final VarNode anonvar = mockAnonVar("-exists-1");
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
prefixDecls.put("rdf", RDF.NAMESPACE);
prefixDecls.put("foaf", FOAFVocabularyDecl.NAMESPACE);
expected.setPrefixDecls(prefixDecls);
@@ -643,7 +643,7 @@
final VarNode anonvar = mockAnonVar("-exists-1");
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
prefixDecls.put("rdf", RDF.NAMESPACE);
prefixDecls.put("foaf", FOAFVocabularyDecl.NAMESPACE);
expected.setPrefixDecls(prefixDecls);
@@ -732,7 +732,7 @@
.stringValue())));
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
prefixDecls.put("rdfs", RDFS.NAMESPACE);
expected.setPrefixDecls(prefixDecls);
}
@@ -839,7 +839,7 @@
// .stringValue())));
//
// {
-// final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+// final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
// prefixDecls.put("rdfs", RDFS.NAMESPACE);
// expected.setPrefixDecls(prefixDecls);
// }
@@ -947,7 +947,7 @@
// .stringValue())));
//
// {
-// final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+// final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
// prefixDecls.put("rdfs", RDFS.NAMESPACE);
// expected.setPrefixDecls(prefixDecls);
// }
Modified: branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestTriplePatternBuilder.java
===================================================================
--- branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestTriplePatternBuilder.java 2014-09-02 19:28:35 UTC (rev 8637)
+++ branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestTriplePatternBuilder.java 2014-09-02 20:06:22 UTC (rev 8638)
@@ -92,7 +92,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -137,7 +137,7 @@
final VarNode o = new VarNode("o");
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -181,7 +181,7 @@
final VarNode o = new VarNode("o");
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -225,7 +225,7 @@
makeIV(valueFactory.createURI("http://www.bigdata.com/o")));
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -270,7 +270,7 @@
makeIV(valueFactory.createURI("http://www.bigdata.com/o")));
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -315,7 +315,7 @@
final VarNode o = new VarNode("o");
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -363,7 +363,7 @@
final VarNode x = new VarNode("x");
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -399,7 +399,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -439,7 +439,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -495,7 +495,7 @@
makeIV(valueFactory.createURI("http://www.bigdata.com/bar")));
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -540,7 +540,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -596,7 +596,7 @@
makeIV(valueFactory.createURI("http://www.bigdata.com/goo")));
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -647,7 +647,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
@@ -703,7 +703,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
prefixDecls.put("", "http://example.org/");
}
@@ -769,7 +769,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
prefixDecls.put("", "http://example.org/");
}
@@ -840,7 +840,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
prefixDecls.put("", "http://example.org/");
}
@@ -920,7 +920,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
prefixDecls.put("", "http://example.org/");
}
@@ -1008,7 +1008,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
prefixDecls.put("foaf", FOAFVocabularyDecl.NAMESPACE);
}
@@ -1105,7 +1105,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
prefixDecls.put("", "http://example.org/ns#");
prefixDecls.put("rdf", RDF.NAMESPACE);
@@ -1220,7 +1220,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
prefixDecls.put("", "http://example.org/ns#");
prefixDecls.put("rdf", RDF.NAMESPACE);
@@ -1330,7 +1330,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
prefixDecls.put("xsd", XSD.NAMESPACE);
prefixDecls.put("", "http://example.org/ns#");
@@ -1432,7 +1432,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
prefixDecls.put("", "http://example.org/ns#");
}
@@ -1544,7 +1544,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
prefixDecls.put("", "http://example.org/ns#");
}
@@ -1653,7 +1653,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
prefixDecls.put("dc", DCElementsVocabularyDecl.NAMESPACE);
}
@@ -1733,7 +1733,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
prefixDecls.put("dc", DCElementsVocabularyDecl.NAMESPACE);
}
@@ -1805,7 +1805,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
prefixDecls.put("dc", DCElementsVocabularyDecl.NAMESPACE);
}
@@ -1876,7 +1876,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
prefixDecls.put("dc", DCElementsVocabularyDecl.NAMESPACE);
}
Modified: branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestUpdateExprBuilder.java
===================================================================
--- branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestUpdateExprBuilder.java 2014-09-02 19:28:35 UTC (rev 8637)
+++ branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestUpdateExprBuilder.java 2014-09-02 20:06:22 UTC (rev 8638)
@@ -1573,7 +1573,7 @@
+ "{\n"
+ " <http://example/book1> dc:title \"A new book\" .\n"
+ " <http://example/book1> dc:creator \"A.N.Other\" .\n" //
- + " GRAPH <http://example/bookStore> { <http://example/book1> ns:price 42 }\n"
+ + " <http://example/book1> ns:price 42 <http://example/bookStore> .\n"
+ "}";
final UpdateRoot expected = new UpdateRoot();
Modified: branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestValueExprBuilder.java
===================================================================
--- branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestValueExprBuilder.java 2014-09-02 19:28:35 UTC (rev 8637)
+++ branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestValueExprBuilder.java 2014-09-02 20:06:22 UTC (rev 8638)
@@ -214,7 +214,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
expected.setPrefixDecls(prefixDecls);
}
Modified: branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestVirtualGraphs.java
===================================================================
--- branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestVirtualGraphs.java 2014-09-02 19:28:35 UTC (rev 8637)
+++ branches/SESAME_2_7/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestVirtualGraphs.java 2014-09-02 20:06:22 UTC (rev 8638)
@@ -191,7 +191,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
prefixDecls.put("foaf", FOAFVocabularyDecl.NAMESPACE);
prefixDecls.put("dc", DC.NAMESPACE);
expected.setPrefixDecls(prefixDecls);
@@ -345,7 +345,7 @@
{
{
- final Map<String, String> prefixDecls = new LinkedHashMap<String, String>();
+ final Map<String, String> prefixDecls = new LinkedHashMap<String, String>(PrefixDeclProcessor.defaultDecls);
prefixDecls.put("foaf", FOAFVocabularyDecl.NAMESPACE);
prefixDecls.put("dc", DC.NAMESPACE);
expected.setPrefixDecls(prefixDecls);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
