Author: claude
Date: Sat Apr 6 19:04:08 2013
New Revision: 1465290
URL: http://svn.apache.org/r1465290
Log:
Added default constructor for simple testing.
Fixed TestNamespace so that it can be executed in the test jar from another
package.
Added:
jena/trunk/jena-core/src/test/resources/wg/
jena/trunk/jena-core/src/test/resources/wg/rdf-ns-prefix-confusion/
jena/trunk/jena-core/src/test/resources/wg/rdf-ns-prefix-confusion/test0014.rdf
Modified:
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/AbstractModelTestBase.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestNamespace.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReaders.java
Modified:
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/AbstractModelTestBase.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/AbstractModelTestBase.java?rev=1465290&r1=1465289&r2=1465290&view=diff
==============================================================================
---
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/AbstractModelTestBase.java
(original)
+++
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/AbstractModelTestBase.java
Sat Apr 6 19:04:08 2013
@@ -19,6 +19,8 @@
package com.hp.hpl.jena.rdf.model.test;
import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
import java.net.URISyntaxException;
import java.net.URL;
@@ -38,9 +40,9 @@ import junit.framework.TestCase;
*/
public abstract class AbstractModelTestBase extends TestCase
{
- protected static String getFileName( String fn )
+ protected static String getFileName( final String fn )
{
- URL u =
TestListSyntaxCategories.class.getClassLoader().getResource( fn );
+ URL u =
AbstractModelTestBase.class.getClassLoader().getResource( fn );
if (u == null)
{
throw new RuntimeException( new FileNotFoundException(
fn ));
@@ -52,6 +54,18 @@ public abstract class AbstractModelTestB
}
}
+ protected InputStream getInputStream( final String fn ) throws
IOException
+ {
+ ClassLoader loader =
AbstractModelTestBase.class.getClassLoader();
+ if (loader == null)
+ throw new SecurityException("Cannot access class
loader");
+ final InputStream in = loader.getResourceAsStream(fn);
+ if (in == null)
+ throw new IllegalArgumentException("Resource: " + fn
+ + " not found on class path.");
+ return in;
+ }
+
public static class LitTestObj
{
protected long content;
Modified:
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestNamespace.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestNamespace.java?rev=1465290&r1=1465289&r2=1465290&view=diff
==============================================================================
---
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestNamespace.java
(original)
+++
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestNamespace.java
Sat Apr 6 19:04:08 2013
@@ -85,8 +85,7 @@ public class TestNamespace extends Abstr
*/
public void testReadPrefixes()
{
-
-
model.read("file:testing/wg/rdf-ns-prefix-confusion/test0014.rdf");
+ model.read(getFileName(
"wg/rdf-ns-prefix-confusion/test0014.rdf" ));
final Map<String, String> ns = model.getNsPrefixMap();
// System.err.println( ">> " + ns );
Assert.assertEquals("namespace eg", "http://example.org/";,
ns.get("eg"));
Modified:
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReaders.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReaders.java?rev=1465290&r1=1465289&r2=1465290&view=diff
==============================================================================
---
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReaders.java
(original)
+++
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReaders.java
Sat Apr 6 19:04:08 2013
@@ -39,24 +39,11 @@ public class TestReaders extends Abstrac
final String name )
{
super(modelFactory, name);
- // TODO Auto-generated constructor stub
}
-
- private InputStream getInputStream( final String prop ) throws
IOException
+
+ public TestReaders()
{
-// Package p = TestReaders.class.getPackage();
-// String fqName = String.format("%s/%s",
-// p.getName().replace(".", "/"), prop);
- String fqName = prop ;
- ClassLoader loader = TestReaders.class.getClassLoader();
- if (loader == null)
- throw new SecurityException("Cannot access class
loader");
- final InputStream in = loader.getResourceAsStream(fqName);
- if (in == null)
- throw new IllegalArgumentException("Resource: " + fqName
- + " not found on class path.");
- return in;
-
+ this( new TestPackage.PlainModelFactory(), "TestReaders");
}
public void testGetNTripleReader()
Added:
jena/trunk/jena-core/src/test/resources/wg/rdf-ns-prefix-confusion/test0014.rdf
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/resources/wg/rdf-ns-prefix-confusion/test0014.rdf?rev=1465290&view=auto
==============================================================================
---
jena/trunk/jena-core/src/test/resources/wg/rdf-ns-prefix-confusion/test0014.rdf
(added)
+++
jena/trunk/jena-core/src/test/resources/wg/rdf-ns-prefix-confusion/test0014.rdf
Sat Apr 6 19:04:08 2013
@@ -0,0 +1,42 @@
+<!--
+ Copyright World Wide Web Consortium, (Massachusetts Institute of
+ Technology, Institut National de Recherche en Informatique et en
+ Automatique, Keio University).
+
+ All Rights Reserved.
+
+ Please see the full Copyright clause at
+ <http://www.w3.org/Consortium/Legal/copyright-software.html>
+
+ $Id: test0014.rdf,v 1.2 2005-08-04 09:53:17 jeremy_carroll Exp $
+-->
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:eg="http://example.org/";>
+
+ <!--
+ Test case for
+ Issue http://www.w3.org/2000/03/rdf-tracking/#rdf-ns-prefix-confusion
+
+ Non-prefixed RDF elements (NOT attributes) are allowed when a
+ default XML element namespace is defined with an
+ xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; attribute.
+
+ Dave Beckett - http://purl.org/net/dajobe/
+
+ -->
+
+ <!-- Testing outer bare RDF element (using default namespace) -->
+
+ <!-- Testing bare Seq element (using default namespace) -->
+
+ <!-- Testing bare li element (using default namespace)
+ - expect 2 triples -->
+
+ <!-- 6.2 obj; 6.4 container; 6.25 sequence, part 1; idAttr; -->
+ <Seq rdf:ID="container">
+ <!-- 6.28 member; 6.29 inlineItem, part 1 -->
+ <li>bar</li>
+ </Seq>
+
+</RDF>
