You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by cl...@apache.org on 2013/10/27 14:16:04 UTC

svn commit: r1536129 - /jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/SimpleSelectorTest.java

Author: claude
Date: Sun Oct 27 13:16:04 2013
New Revision: 1536129

URL: http://svn.apache.org/r1536129
Log:
Fixed SimpleSelector test

Modified:
    jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/SimpleSelectorTest.java

Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/SimpleSelectorTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/SimpleSelectorTest.java?rev=1536129&r1=1536128&r2=1536129&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/SimpleSelectorTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/SimpleSelectorTest.java Sun Oct 27 13:16:04 2013
@@ -2,67 +2,74 @@ package com.hp.hpl.jena.rdf.model;
 
 import static com.hp.hpl.jena.testing_framework.ModelHelper.*;
 
-import org.junit.Assert;
+import static org.junit.Assert.*;
+
 import org.junit.Test;
 
 public class SimpleSelectorTest {
 
 	private Selector check(final Resource S, final Property P, final RDFNode O) {
 		final Selector s = new SimpleSelector(S, P, O);
-		Assert.assertTrue(s.isSimple());
-		Assert.assertEquals(S, s.getSubject());
-		Assert.assertEquals(P, s.getPredicate());
-		Assert.assertEquals(O, s.getObject());
+		assertTrue(s.isSimple());
+		assertEquals(S, s.getSubject());
+		assertEquals(P, s.getPredicate());
+		assertEquals(O, s.getObject());
 		return s;
 	}
 
 	@Test
-	public void testSelectors() {
-		Resource A = resource("Foo");
-		Property B = property("B");
-		Literal ten = literal("10");
-		Resource C = resource("C");
-		Property D = property("D");
-		Resource E = resource("_E");
-
+	public void testWild() {
 		Selector s = check(null, null, null);
-		Assert.assertTrue(s.test(statement("Foo, B, C")));
-		Assert.assertTrue(s.test(statement("Foo, D, C")));
-		Assert.assertTrue(s.test(statement("Foo, B, 10")));
-		Assert.assertTrue(s.test(statement("C, B, C")));
-		Assert.assertTrue(s.test(statement("Foo, B, _E")));
-		Assert.assertTrue(s.test(statement("C, D, _E")));
-
-		s = check(resource("Foo"), null, null);
-		Assert.assertTrue(s.test(statement("Foo, B, C")));
-		Assert.assertTrue(s.test(statement("Foo, D, C")));
-		Assert.assertTrue(s.test(statement("Foo, B, 10")));
-		Assert.assertFalse(s.test(statement("C, B, C")));
-		Assert.assertTrue(s.test(statement("Foo, B, _E")));
-		Assert.assertFalse(s.test(statement("C, D, _E")));
-
-		s = check(null, property("B"), null);
-		Assert.assertTrue(s.test(statement("Foo, B, C")));
-		Assert.assertFalse(s.test(statement("Foo, D, C")));
-		Assert.assertTrue(s.test(statement("Foo, B, 10")));
-		Assert.assertTrue(s.test(statement("C, B, C")));
-		Assert.assertTrue(s.test(statement("Foo, B, _E")));
-		Assert.assertFalse(s.test(statement("C, D, _E")));
-
-		s = check(null, null, literal("10"));
-		Assert.assertFalse(s.test(statement("Foo, B, C")));
-		Assert.assertFalse(s.test(statement("Foo, D, C")));
-		Assert.assertTrue(s.test(statement("Foo, B, 10")));
-		Assert.assertFalse(s.test(statement("C, B, C")));
-		Assert.assertFalse(s.test(statement("Foo, B, _E")));
-		Assert.assertFalse(s.test(statement("C, D, _E")));
-
-		s = check(resource("C"), property("D"), resource("_E"));
-		Assert.assertFalse(s.test(statement("Foo, B, C")));
-		Assert.assertFalse(s.test(statement("Foo, D, C")));
-		Assert.assertFalse(s.test(statement("Foo, B, 10")));
-		Assert.assertFalse(s.test(statement("C, B, C")));
-		Assert.assertFalse(s.test(statement("Foo, B, _E")));
-		Assert.assertTrue(s.test(statement("C, D, _E")));
+		assertTrue(s.test(statement("Foo, B, C")));
+		assertTrue(s.test(statement("Foo, D, C")));
+		assertTrue(s.test(statement("Foo, B, 10")));
+		assertTrue(s.test(statement("C, B, C")));
+		assertTrue(s.test(statement("Foo, B, _E")));
+		assertTrue(s.test(statement("C, D, _E")));
+	}
+
+	@Test
+	public void test_S() {
+		Selector s = check(resource("Foo"), null, null);
+		assertTrue(s.test(statement("Foo B C")));
+		assertTrue(s.test(statement("Foo D C")));
+		assertTrue(s.test(statement("Foo B 10")));
+		assertFalse(s.test(statement("C B C")));
+		assertTrue(s.test(statement("Foo B _E")));
+		assertFalse(s.test(statement("C D _E")));
+	}
+
+	@Test
+	public void test_P() {
+		Selector s = check(null, property("B"), null);
+		assertTrue(s.test(statement("Foo B C")));
+		assertFalse(s.test(statement("Foo D C")));
+		assertTrue(s.test(statement("Foo B 10")));
+		assertTrue(s.test(statement("C B C")));
+		assertTrue(s.test(statement("Foo B _E")));
+		assertFalse(s.test(statement("C D _E")));
+	}
+
+	@Test
+	public void test_Lit() {
+		Selector s = check(null, null, literal("10"));
+		assertFalse(s.test(statement("Foo B C")));
+		assertFalse(s.test(statement("Foo D C")));
+		assertTrue(s.test(statement("Foo B 10")));
+		assertFalse(s.test(statement("C B C")));
+		assertFalse(s.test(statement("Foo B _E")));
+		assertFalse(s.test(statement("C D _E")));
+
+	}
+
+	@Test
+	public void test_SPAnonymous() {
+		Selector s = check(resource("C"), property("D"), resource("_E"));
+		assertFalse(s.test(statement("Foo B C")));
+		assertFalse(s.test(statement("Foo D C")));
+		assertFalse(s.test(statement("Foo B 10")));
+		assertFalse(s.test(statement("C B C")));
+		assertFalse(s.test(statement("Foo B _E")));
+		assertTrue(s.test(statement("C D _E")));
 	}
 }