[Mulgara-svn] r883 - in trunk/src/jar/query/java/org/mulgara/query/filter: . arithmetic value
pag at mulgara.org
pag at mulgara.org
Thu May 1 17:51:53 UTC 2008
Author: pag
Date: 2008-05-01 10:51:53 -0700 (Thu, 01 May 2008)
New Revision: 883
Modified:
trunk/src/jar/query/java/org/mulgara/query/filter/AbstractIsIriFnUnitTest.java
trunk/src/jar/query/java/org/mulgara/query/filter/AbstractLogicUnitTest.java
trunk/src/jar/query/java/org/mulgara/query/filter/BoundFnUnitTest.java
trunk/src/jar/query/java/org/mulgara/query/filter/EqualityComparisonUnitTest.java
trunk/src/jar/query/java/org/mulgara/query/filter/IsBlankFnUnitTest.java
trunk/src/jar/query/java/org/mulgara/query/filter/IsLiteralFnUnitTest.java
trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/AbstractOperationUnitTest.java
trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/UnaryMinusUnitTest.java
trunk/src/jar/query/java/org/mulgara/query/filter/value/DataTypeFnUnitTest.java
trunk/src/jar/query/java/org/mulgara/query/filter/value/LangFnUnitTest.java
trunk/src/jar/query/java/org/mulgara/query/filter/value/NumericLiteralUnitTest.java
trunk/src/jar/query/java/org/mulgara/query/filter/value/StrFnUnitTest.java
trunk/src/jar/query/java/org/mulgara/query/filter/value/TypedLiteralUnitTest.java
Log:
Changed to use the XSD namespace values directly out of XSD
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/AbstractIsIriFnUnitTest.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/AbstractIsIriFnUnitTest.java 2008-05-01 17:51:40 UTC (rev 882)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/AbstractIsIriFnUnitTest.java 2008-05-01 17:51:53 UTC (rev 883)
@@ -1,7 +1,5 @@
package org.mulgara.query.filter;
-import static org.mulgara.query.filter.value.TypedLiteral.XSD_NS;
-
import java.net.URI;
import org.jrdf.graph.Literal;
@@ -12,6 +10,7 @@
import org.mulgara.query.filter.value.Var;
import org.mulgara.query.rdf.LiteralImpl;
import org.mulgara.query.rdf.URIReferenceImpl;
+import static org.mulgara.query.rdf.XSD.INT_URI;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -27,7 +26,7 @@
*/
public abstract class AbstractIsIriFnUnitTest extends TestCase {
- protected URI xsdInt = URI.create(XSD_NS + "int");
+ protected URI xsdInt = INT_URI;
Bool t = Bool.TRUE;
Bool f = Bool.FALSE;
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/AbstractLogicUnitTest.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/AbstractLogicUnitTest.java 2008-05-01 17:51:40 UTC (rev 882)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/AbstractLogicUnitTest.java 2008-05-01 17:51:53 UTC (rev 883)
@@ -11,12 +11,11 @@
*/
package org.mulgara.query.filter;
-import static org.mulgara.query.filter.value.TypedLiteral.XSD_NS;
-
import java.net.URI;
import org.mulgara.query.filter.value.Bool;
import org.mulgara.query.filter.value.SimpleLiteral;
+import static org.mulgara.query.rdf.XSD.*;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -32,8 +31,8 @@
*/
public abstract class AbstractLogicUnitTest extends TestCase {
- protected URI xsdInt = URI.create(XSD_NS + "int");
- protected URI xsdBool = URI.create(XSD_NS + "boolean");
+ protected URI xsdInt = INT_URI;
+ protected URI xsdBool = BOOLEAN_URI;
public AbstractLogicUnitTest(String name) {
super(name);
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/BoundFnUnitTest.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/BoundFnUnitTest.java 2008-05-01 17:51:40 UTC (rev 882)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/BoundFnUnitTest.java 2008-05-01 17:51:53 UTC (rev 883)
@@ -23,7 +23,7 @@
import org.mulgara.query.filter.value.Bool;
import org.mulgara.query.filter.value.Var;
-import static org.mulgara.query.filter.value.TypedLiteral.XSD_NS;
+import static org.mulgara.query.rdf.XSD.INT_URI;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -40,7 +40,7 @@
*/
public class BoundFnUnitTest extends TestCase {
- protected URI xsdInt = URI.create(XSD_NS + "int");
+ protected URI xsdInt = INT_URI;
Bool t = Bool.TRUE;
Bool f = Bool.FALSE;
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/EqualityComparisonUnitTest.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/EqualityComparisonUnitTest.java 2008-05-01 17:51:40 UTC (rev 882)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/EqualityComparisonUnitTest.java 2008-05-01 17:51:53 UTC (rev 883)
@@ -28,7 +28,7 @@
import org.mulgara.query.filter.value.TypedLiteral;
import org.mulgara.query.filter.value.Var;
-import static org.mulgara.query.filter.value.TypedLiteral.XSD_NS;
+import static org.mulgara.query.rdf.XSD.*;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -45,9 +45,9 @@
*/
public class EqualityComparisonUnitTest extends TestCase {
- protected URI xsdInt = URI.create(XSD_NS + "int");
- protected URI xsdFloat = URI.create(XSD_NS + "float");
- protected URI xsdString = URI.create(XSD_NS + "string");
+ protected URI xsdInt = INT_URI;
+ protected URI xsdFloat = FLOAT_URI;
+ protected URI xsdString = STRING_URI;
Bool t = Bool.TRUE;
Bool f = Bool.FALSE;
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/IsBlankFnUnitTest.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/IsBlankFnUnitTest.java 2008-05-01 17:51:40 UTC (rev 882)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/IsBlankFnUnitTest.java 2008-05-01 17:51:53 UTC (rev 883)
@@ -25,7 +25,7 @@
import org.mulgara.query.filter.value.Bool;
import org.mulgara.query.filter.value.Var;
-import static org.mulgara.query.filter.value.TypedLiteral.XSD_NS;
+import static org.mulgara.query.rdf.XSD.INT_URI;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -42,7 +42,7 @@
*/
public class IsBlankFnUnitTest extends TestCase {
- protected URI xsdInt = URI.create(XSD_NS + "int");
+ protected URI xsdInt = INT_URI;
Bool t = Bool.TRUE;
Bool f = Bool.FALSE;
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/IsLiteralFnUnitTest.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/IsLiteralFnUnitTest.java 2008-05-01 17:51:40 UTC (rev 882)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/IsLiteralFnUnitTest.java 2008-05-01 17:51:53 UTC (rev 883)
@@ -25,7 +25,7 @@
import org.mulgara.query.filter.value.Bool;
import org.mulgara.query.filter.value.Var;
-import static org.mulgara.query.filter.value.TypedLiteral.XSD_NS;
+import static org.mulgara.query.rdf.XSD.*;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -42,7 +42,7 @@
*/
public class IsLiteralFnUnitTest extends TestCase {
- protected URI xsdInt = URI.create(XSD_NS + "int");
+ protected URI xsdInt = INT_URI;
Bool t = Bool.TRUE;
Bool f = Bool.FALSE;
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/AbstractOperationUnitTest.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/AbstractOperationUnitTest.java 2008-05-01 17:51:40 UTC (rev 882)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/AbstractOperationUnitTest.java 2008-05-01 17:51:53 UTC (rev 883)
@@ -28,7 +28,7 @@
import org.mulgara.query.filter.value.TypedLiteral;
import org.mulgara.query.filter.value.ValueLiteral;
import org.mulgara.query.filter.value.Var;
-import static org.mulgara.query.filter.value.TypedLiteral.XSD_NS;
+import static org.mulgara.query.rdf.XSD.NAMESPACE;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -47,10 +47,10 @@
*/
public abstract class AbstractOperationUnitTest extends TestCase {
- URI xsdInt = URI.create(XSD_NS + "int");
- URI xsdLong = URI.create(XSD_NS + "long");
- URI xsdFloat = URI.create(XSD_NS + "float");
- URI xsdDouble = URI.create(XSD_NS + "double");
+ URI xsdInt = URI.create(NAMESPACE + "int");
+ URI xsdLong = URI.create(NAMESPACE + "long");
+ URI xsdFloat = URI.create(NAMESPACE + "float");
+ URI xsdDouble = URI.create(NAMESPACE + "double");
/** The first operand to use for this test */
abstract Number op1();
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/UnaryMinusUnitTest.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/UnaryMinusUnitTest.java 2008-05-01 17:51:40 UTC (rev 882)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/UnaryMinusUnitTest.java 2008-05-01 17:51:53 UTC (rev 883)
@@ -26,7 +26,7 @@
import org.mulgara.query.filter.value.NumericLiteral;
import org.mulgara.query.filter.value.SimpleLiteral;
import org.mulgara.query.filter.value.Var;
-import static org.mulgara.query.filter.value.TypedLiteral.XSD_NS;
+import static org.mulgara.query.rdf.XSD.NAMESPACE;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -43,10 +43,10 @@
*/
public class UnaryMinusUnitTest extends TestCase {
- URI xsdInt = URI.create(XSD_NS + "int");
- URI xsdLong = URI.create(XSD_NS + "long");
- URI xsdFloat = URI.create(XSD_NS + "float");
- URI xsdDouble = URI.create(XSD_NS + "double");
+ URI xsdInt = URI.create(NAMESPACE + "int");
+ URI xsdLong = URI.create(NAMESPACE + "long");
+ URI xsdFloat = URI.create(NAMESPACE + "float");
+ URI xsdDouble = URI.create(NAMESPACE + "double");
/**
* Build the unit test.
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/value/DataTypeFnUnitTest.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/value/DataTypeFnUnitTest.java 2008-05-01 17:51:40 UTC (rev 882)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/value/DataTypeFnUnitTest.java 2008-05-01 17:51:53 UTC (rev 883)
@@ -11,8 +11,6 @@
*/
package org.mulgara.query.filter.value;
-import static org.mulgara.query.filter.value.TypedLiteral.XSD_NS;
-
import java.net.URI;
import org.jrdf.graph.Node;
@@ -22,6 +20,7 @@
import org.mulgara.query.rdf.BlankNodeImpl;
import org.mulgara.query.rdf.LiteralImpl;
import org.mulgara.query.rdf.URIReferenceImpl;
+import static org.mulgara.query.rdf.XSD.*;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -60,7 +59,7 @@
public void testValues() throws Exception {
String str = "test";
- URI t = URI.create(XSD_NS + "string");
+ URI t = STRING_URI;
TypedLiteral l = (TypedLiteral) TypedLiteral.newLiteral(str, t, null);
DataTypeFn fn = new DataTypeFn(l);
IRI i = new IRI(t);
@@ -88,7 +87,7 @@
assertTrue(fn.isURI());
String s2 = "foobar";
- URI t2 = URI.create(XSD_NS + "foo:bar");
+ URI t2 = URI.create(NAMESPACE + "foo:bar");
l = (TypedLiteral)TypedLiteral.newLiteral(s2, t2, null);
fn = new DataTypeFn(l);
i = new IRI(t2);
@@ -101,7 +100,7 @@
Long v = Long.valueOf(5);
l = (TypedLiteral)TypedLiteral.newLiteral(v);
fn = new DataTypeFn(l);
- i = new IRI(URI.create(XSD_NS + "long"));
+ i = new IRI(LONG_URI);
assertTrue(fn.equals(i));
}
@@ -110,8 +109,8 @@
Var v = new Var(vName);
DataTypeFn fn = new DataTypeFn(v);
- URI xsdString = URI.create(XSD_NS + "string");
- URI xsdDouble = URI.create(XSD_NS + "double");
+ URI xsdString = STRING_URI;
+ URI xsdDouble = DOUBLE_URI;
URI fooBar = URI.create("foo:bar");
Node[][] rows = {
new Node[] {new LiteralImpl("foo")},
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/value/LangFnUnitTest.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/value/LangFnUnitTest.java 2008-05-01 17:51:40 UTC (rev 882)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/value/LangFnUnitTest.java 2008-05-01 17:51:53 UTC (rev 883)
@@ -11,8 +11,6 @@
*/
package org.mulgara.query.filter.value;
-import static org.mulgara.query.filter.value.TypedLiteral.XSD_NS;
-
import java.net.URI;
import org.jrdf.graph.Node;
@@ -22,6 +20,7 @@
import org.mulgara.query.rdf.BlankNodeImpl;
import org.mulgara.query.rdf.LiteralImpl;
import org.mulgara.query.rdf.URIReferenceImpl;
+import static org.mulgara.query.rdf.XSD.*;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -60,7 +59,7 @@
public void testValues() throws Exception {
String str = "test";
- URI t = URI.create(XSD_NS + "string");
+ URI t = STRING_URI;
ValueLiteral l = TypedLiteral.newLiteral(str, t, null);
LangFn fn = new LangFn(l);
@@ -103,8 +102,8 @@
Var v = new Var(vName);
LangFn fn = new LangFn(v);
- URI xsdString = URI.create(XSD_NS + "string");
- URI xsdDouble = URI.create(XSD_NS + "double");
+ URI xsdString = STRING_URI;
+ URI xsdDouble = DOUBLE_URI;
URI fooBar = URI.create("foo:bar");
Node[][] rows = {
new Node[] {new LiteralImpl("foo")},
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/value/NumericLiteralUnitTest.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/value/NumericLiteralUnitTest.java 2008-05-01 17:51:40 UTC (rev 882)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/value/NumericLiteralUnitTest.java 2008-05-01 17:51:53 UTC (rev 883)
@@ -11,11 +11,9 @@
*/
package org.mulgara.query.filter.value;
-import java.net.URI;
-
import org.mulgara.query.filter.Context;
import org.mulgara.query.filter.TestContext;
-import static org.mulgara.query.filter.value.TypedLiteral.XSD_NS;
+import static org.mulgara.query.rdf.XSD.*;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -82,19 +80,19 @@
public void testType() throws Exception {
NumericLiteral n = new NumericLiteral(Integer.valueOf(5));
assertTrue(n.getType().isIRI());
- assertEquals(n.getType().getValue(), URI.create(XSD_NS + "int"));
+ assertEquals(n.getType().getValue(), INT_URI);
n = new NumericLiteral(Long.valueOf(5));
assertTrue(n.getType().isIRI());
- assertEquals(n.getType().getValue(), URI.create(XSD_NS + "long"));
+ assertEquals(n.getType().getValue(), LONG_URI);
n = new NumericLiteral(Double.valueOf(5));
assertTrue(n.getType().isIRI());
- assertEquals(n.getType().getValue(), URI.create(XSD_NS + "double"));
+ assertEquals(n.getType().getValue(), DOUBLE_URI);
n = new NumericLiteral(Float.valueOf(5));
assertTrue(n.getType().isIRI());
- assertEquals(n.getType().getValue(), URI.create(XSD_NS + "float"));
+ assertEquals(n.getType().getValue(), FLOAT_URI);
}
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/value/StrFnUnitTest.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/value/StrFnUnitTest.java 2008-05-01 17:51:40 UTC (rev 882)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/value/StrFnUnitTest.java 2008-05-01 17:51:53 UTC (rev 883)
@@ -11,8 +11,6 @@
*/
package org.mulgara.query.filter.value;
-import static org.mulgara.query.filter.value.TypedLiteral.XSD_NS;
-
import java.net.URI;
import org.jrdf.graph.Node;
@@ -22,6 +20,7 @@
import org.mulgara.query.rdf.BlankNodeImpl;
import org.mulgara.query.rdf.LiteralImpl;
import org.mulgara.query.rdf.URIReferenceImpl;
+import static org.mulgara.query.rdf.XSD.*;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -61,7 +60,7 @@
public void testValues() throws Exception {
String str = "test";
SimpleLiteral strLiteral = new SimpleLiteral(str);
- URI t = URI.create(XSD_NS + "string");
+ URI t = STRING_URI;
ValueLiteral l = TypedLiteral.newLiteral(str, t, null);
StrFn fn = new StrFn(l);
@@ -100,8 +99,8 @@
Var v = new Var(vName);
StrFn fn = new StrFn(v);
- URI xsdString = URI.create(XSD_NS + "string");
- URI xsdDouble = URI.create(XSD_NS + "double");
+ URI xsdString = STRING_URI;
+ URI xsdDouble = DOUBLE_URI;
URI fooBar = URI.create("foo:bar");
Node[][] rows = {
new Node[] {new LiteralImpl("foo")},
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/value/TypedLiteralUnitTest.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/value/TypedLiteralUnitTest.java 2008-05-01 17:51:40 UTC (rev 882)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/value/TypedLiteralUnitTest.java 2008-05-01 17:51:53 UTC (rev 883)
@@ -17,7 +17,7 @@
import org.mulgara.query.filter.Context;
import org.mulgara.query.filter.TestContext;
-import static org.mulgara.query.filter.value.TypedLiteral.XSD_NS;
+import static org.mulgara.query.rdf.XSD.NAMESPACE;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -58,7 +58,7 @@
public void testValues() throws Exception {
String str = "test";
- TypedLiteral l = (TypedLiteral)TypedLiteral.newLiteral(str, URI.create(XSD_NS + "string"), null);
+ TypedLiteral l = (TypedLiteral)TypedLiteral.newLiteral(str, URI.create(NAMESPACE + "string"), null);
assertEquals(str, l.getValue());
l = (TypedLiteral)TypedLiteral.newLiteral(str);
@@ -75,7 +75,7 @@
public void testFilter() throws Exception {
Context c = new TestContext();
- TypedLiteral l = (TypedLiteral)TypedLiteral.newLiteral("test", URI.create(XSD_NS + "string"), null);
+ TypedLiteral l = (TypedLiteral)TypedLiteral.newLiteral("test", URI.create(NAMESPACE + "string"), null);
assertTrue(l.test(c));
l = (TypedLiteral)TypedLiteral.newLiteral("test");
@@ -99,7 +99,7 @@
public void testType() throws Exception {
String str = "test";
- URI t = URI.create(XSD_NS + "string");
+ URI t = URI.create(NAMESPACE + "string");
TypedLiteral l = (TypedLiteral) TypedLiteral.newLiteral(str, t, null);
assertTrue(l.getType().isIRI());
assertEquals(t, l.getType().getValue());
@@ -108,17 +108,17 @@
assertEquals(t, l.getType().getValue());
String s2 = "foobar";
- URI t2 = URI.create(XSD_NS + "foo:bar");
+ URI t2 = URI.create(NAMESPACE + "foo:bar");
l = (TypedLiteral)TypedLiteral.newLiteral(s2, t2, null);
assertEquals(t2, l.getType().getValue());
Long v = Long.valueOf(5);
l = (TypedLiteral)TypedLiteral.newLiteral(v);
- assertEquals(URI.create(XSD_NS + "long"), l.getType().getValue());
+ assertEquals(URI.create(NAMESPACE + "long"), l.getType().getValue());
}
public void testProperties() throws Exception {
- TypedLiteral l = (TypedLiteral) TypedLiteral.newLiteral("test", URI.create(XSD_NS + "string"), null);
+ TypedLiteral l = (TypedLiteral) TypedLiteral.newLiteral("test", URI.create(NAMESPACE + "string"), null);
assertFalse(l.isBlank());
assertFalse(l.isIRI());
assertTrue(l.isLiteral());
More information about the Mulgara-svn
mailing list