You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by rv...@apache.org on 2013/06/10 22:50:07 UTC
svn commit: r1491593 - in /jena/Experimental/jena-jdbc/jena-jdbc-core/src:
main/java/org/apache/jena/jdbc/results/
test/java/org/apache/jena/jdbc/results/
Author: rvesse
Date: Mon Jun 10 20:50:07 2013
New Revision: 1491593
URL: http://svn.apache.org/r1491593
Log:
More result set tests
Modified:
jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/TripleIteratorResults.java
jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/TripleListResults.java
jena/Experimental/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/results/AbstractResultSetTests.java
Modified: jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/TripleIteratorResults.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/TripleIteratorResults.java?rev=1491593&r1=1491592&r2=1491593&view=diff
==============================================================================
--- jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/TripleIteratorResults.java (original)
+++ jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/TripleIteratorResults.java Mon Jun 10 20:50:07 2013
@@ -69,11 +69,11 @@ public class TripleIteratorResults exten
@Override
public int findColumn(String columnLabel) throws SQLException {
if (TripleResultsMetadata.COLUMN_LABEL_SUBJECT.equals(columnLabel)) {
- return 1;
+ return TripleResultsMetadata.COLUMN_INDEX_SUBJECT;
} else if (TripleResultsMetadata.COLUMN_LABEL_PREDICATE.equals(columnLabel)) {
- return 2;
+ return TripleResultsMetadata.COLUMN_INDEX_PREDICATE;
} else if (TripleResultsMetadata.COLUMN_LABEL_OBJECT.equals(columnLabel)) {
- return 3;
+ return TripleResultsMetadata.COLUMN_INDEX_OBJECT;
} else {
throw new SQLException("Column " + columnLabel + " does not exist in these results");
}
@@ -128,11 +128,11 @@ public class TripleIteratorResults exten
throw new SQLException("Result Set is closed");
if (columnIndex >= 1 && columnIndex <= TripleResultsMetadata.NUM_COLUMNS) {
switch (columnIndex) {
- case 1:
+ case TripleResultsMetadata.COLUMN_INDEX_SUBJECT:
return TripleResultsMetadata.COLUMN_LABEL_SUBJECT;
- case 2:
+ case TripleResultsMetadata.COLUMN_INDEX_PREDICATE:
return TripleResultsMetadata.COLUMN_LABEL_PREDICATE;
- case 3:
+ case TripleResultsMetadata.COLUMN_INDEX_OBJECT:
return TripleResultsMetadata.COLUMN_LABEL_OBJECT;
default:
throw new SQLException("Column Index is out of bounds");
Modified: jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/TripleListResults.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/TripleListResults.java?rev=1491593&r1=1491592&r2=1491593&view=diff
==============================================================================
--- jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/TripleListResults.java (original)
+++ jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/TripleListResults.java Mon Jun 10 20:50:07 2013
@@ -65,11 +65,11 @@ public class TripleListResults extends M
@Override
public int findColumn(String columnLabel) throws SQLException {
if (TripleResultsMetadata.COLUMN_LABEL_SUBJECT.equals(columnLabel)) {
- return 1;
+ return TripleResultsMetadata.COLUMN_INDEX_SUBJECT;
} else if (TripleResultsMetadata.COLUMN_LABEL_PREDICATE.equals(columnLabel)) {
- return 2;
+ return TripleResultsMetadata.COLUMN_INDEX_PREDICATE;
} else if (TripleResultsMetadata.COLUMN_LABEL_OBJECT.equals(columnLabel)) {
- return 3;
+ return TripleResultsMetadata.COLUMN_INDEX_OBJECT;
} else {
throw new SQLException("Column " + columnLabel + " does not exist in these results");
}
@@ -120,11 +120,11 @@ public class TripleListResults extends M
throw new SQLException("Result Set is closed");
if (columnIndex >= 1 && columnIndex <= TripleResultsMetadata.NUM_COLUMNS) {
switch (columnIndex) {
- case 1:
+ case TripleResultsMetadata.COLUMN_INDEX_SUBJECT:
return TripleResultsMetadata.COLUMN_LABEL_SUBJECT;
- case 2:
+ case TripleResultsMetadata.COLUMN_INDEX_PREDICATE:
return TripleResultsMetadata.COLUMN_LABEL_PREDICATE;
- case 3:
+ case TripleResultsMetadata.COLUMN_INDEX_OBJECT:
return TripleResultsMetadata.COLUMN_LABEL_OBJECT;
default:
throw new SQLException("Column Index is out of bounds");
Modified: jena/Experimental/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/results/AbstractResultSetTests.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/results/AbstractResultSetTests.java?rev=1491593&r1=1491592&r2=1491593&view=diff
==============================================================================
--- jena/Experimental/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/results/AbstractResultSetTests.java (original)
+++ jena/Experimental/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/results/AbstractResultSetTests.java Mon Jun 10 20:50:07 2013
@@ -46,6 +46,7 @@ import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.junit.AfterClass;
import org.junit.Assert;
+import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -367,6 +368,172 @@ public abstract class AbstractResultSetT
rset.close();
Assert.assertTrue(rset.isClosed());
}
+
+ /**
+ * Tests that SELECT result values are appropriately marshalled when using
+ * getObject()
+ *
+ * @throws SQLException
+ */
+ @Test
+ public void results_select_objects_06() throws SQLException {
+ ResultSet rset = this.createResults(ds, "SELECT ?o { ?s ?p ?o . FILTER(DATATYPE(?o) = <" + XSD.xboolean.toString() + ">) }");
+ Assert.assertNotNull(rset);
+ Assert.assertFalse(rset.isClosed());
+ Assert.assertTrue(rset.isBeforeFirst());
+ Assert.assertFalse(rset.isLast());
+
+ // Check all rows allow us to marshal strings OK
+ while (rset.next()) {
+ Object obj = rset.getObject("o");
+ Assert.assertNotNull(obj);
+ Assert.assertFalse(rset.wasNull());
+ Assert.assertTrue(obj instanceof Boolean);
+ }
+
+ Assert.assertTrue(rset.isAfterLast());
+ rset.close();
+ Assert.assertTrue(rset.isClosed());
+ }
+
+ /**
+ * Tests that SELECT result values are appropriately marshalled when using
+ * getObject()
+ *
+ * @throws SQLException
+ */
+ @Test
+ public void results_select_objects_07() throws SQLException {
+ ResultSet rset = this.createResults(ds, "SELECT ?o { ?s ?p ?o . FILTER(DATATYPE(?o) = <" + this.getLongTypeUri() + ">) }");
+ Assert.assertNotNull(rset);
+ Assert.assertFalse(rset.isClosed());
+ Assert.assertTrue(rset.isBeforeFirst());
+ Assert.assertFalse(rset.isLast());
+
+ // Check all rows allow us to marshal strings OK
+ while (rset.next()) {
+ Object obj = rset.getObject("o");
+ Assert.assertNotNull(obj);
+ Assert.assertFalse(rset.wasNull());
+ Assert.assertTrue(obj instanceof Long);
+ }
+
+ Assert.assertTrue(rset.isAfterLast());
+ rset.close();
+ Assert.assertTrue(rset.isClosed());
+ }
+
+ /**
+ * Tests that SELECT result values are appropriately marshalled when using
+ * getObject()
+ *
+ * @throws SQLException
+ */
+ @Test
+ public void results_select_objects_08() throws SQLException {
+ ResultSet rset = this.createResults(ds, "SELECT ?o { ?s ?p ?o . FILTER(DATATYPE(?o) = <" + XSD.xdouble.toString() + ">) }");
+ Assert.assertNotNull(rset);
+ Assert.assertFalse(rset.isClosed());
+ Assert.assertTrue(rset.isBeforeFirst());
+ Assert.assertFalse(rset.isLast());
+
+ // Check all rows allow us to marshal strings OK
+ while (rset.next()) {
+ Object obj = rset.getObject("o");
+ Assert.assertNotNull(obj);
+ Assert.assertFalse(rset.wasNull());
+ Assert.assertTrue(obj instanceof Double);
+ }
+
+ Assert.assertTrue(rset.isAfterLast());
+ rset.close();
+ Assert.assertTrue(rset.isClosed());
+ }
+
+ /**
+ * Tests that SELECT result values are appropriately marshalled when using
+ * getObject()
+ *
+ * @throws SQLException
+ */
+ @Test
+ public void results_select_objects_09() throws SQLException {
+ ResultSet rset = this.createResults(ds, "SELECT ?o { ?s ?p ?o . FILTER(DATATYPE(?o) = <" + XSD.xfloat.toString() + ">) }");
+ Assert.assertNotNull(rset);
+ Assert.assertFalse(rset.isClosed());
+ Assert.assertTrue(rset.isBeforeFirst());
+ Assert.assertFalse(rset.isLast());
+
+ // Check all rows allow us to marshal strings OK
+ while (rset.next()) {
+ Object obj = rset.getObject("o");
+ Assert.assertNotNull(obj);
+ Assert.assertFalse(rset.wasNull());
+ Assert.assertTrue(obj instanceof Float);
+ }
+
+ Assert.assertTrue(rset.isAfterLast());
+ rset.close();
+ Assert.assertTrue(rset.isClosed());
+ }
+
+ /**
+ * Tests that SELECT result values are appropriately marshalled when using
+ * getObject()
+ *
+ * @throws SQLException
+ */
+ @Test
+ public void results_select_objects_10() throws SQLException {
+ Assume.assumeTrue(this.getShortTypeUri().equals(XSD.xshort.getURI()));
+
+ ResultSet rset = this.createResults(ds, "SELECT ?o { ?s ?p ?o . FILTER(DATATYPE(?o) = <" + this.getShortTypeUri() + ">) }");
+ Assert.assertNotNull(rset);
+ Assert.assertFalse(rset.isClosed());
+ Assert.assertTrue(rset.isBeforeFirst());
+ Assert.assertFalse(rset.isLast());
+
+ // Check all rows allow us to marshal strings OK
+ while (rset.next()) {
+ Object obj = rset.getObject("o");
+ Assert.assertNotNull(obj);
+ Assert.assertFalse(rset.wasNull());
+ Assert.assertTrue(obj instanceof Integer);
+ }
+
+ Assert.assertTrue(rset.isAfterLast());
+ rset.close();
+ Assert.assertTrue(rset.isClosed());
+ }
+
+ /**
+ * Tests that SELECT result values are appropriately marshalled when using
+ * getObject()
+ *
+ * @throws SQLException
+ */
+ @Test
+ public void results_select_objects_11() throws SQLException {
+ Assume.assumeTrue(this.getByteTypeUri().equals(XSD.xbyte.getURI()));
+
+ ResultSet rset = this.createResults(ds, "SELECT ?o { ?s ?p ?o . FILTER(DATATYPE(?o) = <" + this.getByteTypeUri() + ">) }");
+ Assert.assertNotNull(rset);
+ Assert.assertFalse(rset.isClosed());
+ Assert.assertTrue(rset.isBeforeFirst());
+ Assert.assertFalse(rset.isLast());
+
+ // Check all rows allow us to marshal strings OK
+ while (rset.next()) {
+ Object obj = rset.getObject("o");
+ Assert.assertNotNull(obj);
+ Assert.assertFalse(rset.wasNull());
+ Assert.assertTrue(obj instanceof Byte);
+ }
+
+ Assert.assertTrue(rset.isAfterLast());
+ rset.close();
+ Assert.assertTrue(rset.isClosed());
+ }
/**
* Tests that SELECT result values can be marshalled to strings OK