You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2013/01/02 17:07:24 UTC

svn commit: r1427837 - in /jena/trunk/jena-arq: Vocabularies/EARL-v0.rdf Vocabularies/EARL.rdf Vocabularies/EARL.ttl Vocabularies/build src/main/java/com/hp/hpl/jena/sparql/vocabulary/EARL.java src/test/java/com/hp/hpl/jena/sparql/junit/EarlReport.java

Author: andy
Date: Wed Jan  2 16:07:23 2013
New Revision: 1427837

URL: http://svn.apache.org/viewvc?rev=1427837&view=rev
Log:
Align EARL vocabulary and EARL reporting with current EARL naming.

Added:
    jena/trunk/jena-arq/Vocabularies/EARL-v0.rdf
      - copied unchanged from r1427712, jena/trunk/jena-arq/Vocabularies/EARL.rdf
    jena/trunk/jena-arq/Vocabularies/EARL.rdf
Removed:
    jena/trunk/jena-arq/Vocabularies/EARL.ttl
Modified:
    jena/trunk/jena-arq/Vocabularies/build
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/vocabulary/EARL.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/EarlReport.java

Added: jena/trunk/jena-arq/Vocabularies/EARL.rdf
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/Vocabularies/EARL.rdf?rev=1427837&view=auto
==============================================================================
--- jena/trunk/jena-arq/Vocabularies/EARL.rdf (added)
+++ jena/trunk/jena-arq/Vocabularies/EARL.rdf Wed Jan  2 16:07:23 2013
@@ -0,0 +1,282 @@
+<?xml version="1.0" encoding='UTF-8'?>
+<rdf:RDF xml:base="http://www.w3.org/ns/earl#"
+         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+         xmlns:owl="http://www.w3.org/2002/07/owl"
+         xmlns:dc="http://purl.org/dc/terms/">
+
+<!--// ### ontology header ### //-->
+
+<owl:Ontology rdf:about="">
+  <rdfs:label xml:lang="en">Evaluation and Report Language (EARL) 1.0 Schema</rdfs:label>
+  <rdfs:comment xml:lang="en">Formal schema of the Evaluation and Report Language (EARL) 1.0</rdfs:comment>
+  <owl:versionInfo xml:lang="en">Editor's Working Draft 10 June 2009</owl:versionInfo>
+  <rdfs:isDefinedBy rdf:resource="http://www.w3.org/TR/EARL10/" />
+  <rdfs:seeAlso rdf:resource="http://www.w3.org/WAI/intro/earl" />
+  <rdfs:seeAlso rdf:resource="http://www.w3.org/TR/HTTP-in-RDF/" />
+  <rdfs:seeAlso rdf:resource="http://www.w3.org/TR/Content-in-RDF/" />
+  <rdfs:seeAlso rdf:resource="http://www.w3.org/TR/Pointers-in-RDF/" />
+</owl:Ontology>
+
+<!--// ### EARL 1.0 classes ### //-->
+
+<rdf:Description rdf:about="#Assertion">
+  <rdfs:label xml:lang="en">Assertion</rdfs:label>
+  <rdfs:comment xml:lang="en">a statement that embodies the results of a test</rdfs:comment>
+  <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
+  <rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
+</rdf:Description>
+
+<rdf:Description rdf:about="#Assertor">
+  <rdfs:label xml:lang="en">Assertor</rdfs:label>
+  <rdfs:comment xml:lang="en">an entity such as a person, a software tool, an organization, or any other grouping that carries out a test collectively</rdfs:comment>
+  <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
+  <rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
+</rdf:Description>
+
+<rdf:Description rdf:about="#TestSubject">
+  <rdfs:label xml:lang="en">Test Subject</rdfs:label>
+  <rdfs:comment xml:lang="en">the class of things that have been tested against some test criterion</rdfs:comment>
+  <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
+  <rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
+</rdf:Description>
+
+<rdf:Description rdf:about="#TestCriterion">
+  <rdfs:label xml:lang="en">Test Criterion</rdfs:label>
+  <rdfs:comment xml:lang="en">a testable statement, usually one that can be passed or failed</rdfs:comment>
+  <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
+  <rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
+</rdf:Description>
+
+<rdf:Description rdf:about="#TestRequirement">
+  <rdfs:subClassOf rdf:resource="#TestCriterion"/>
+  <rdfs:label xml:lang="en">Test Requirement</rdfs:label>
+  <rdfs:comment xml:lang="en">a higher-level requirement that is tested by executing one or more sub-tests</rdfs:comment>
+  <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
+  <rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
+</rdf:Description>
+
+<rdf:Description rdf:about="#TestCase">
+  <rdfs:subClassOf rdf:resource="#TestCriterion"/>
+  <rdfs:label xml:lang="en">Test Case</rdfs:label>
+  <rdfs:comment xml:lang="en">an atomic test, usually one that is a partial test for a requirement</rdfs:comment>
+  <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
+  <rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
+</rdf:Description>
+
+<rdf:Description rdf:about="#TestResult">
+  <rdfs:label xml:lang="en">Test Result</rdfs:label>
+  <rdfs:comment xml:lang="en">the actual result of performing the test</rdfs:comment>
+  <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
+  <rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
+</rdf:Description>
+
+<rdf:Description rdf:about="#TestMode">
+  <rdfs:label xml:lang="en">Test Mode</rdfs:label>
+  <rdfs:comment xml:lang="en">describes how a test was carried out</rdfs:comment>
+  <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
+  <rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
+</rdf:Description>
+
+<rdf:Description rdf:about="#OutcomeValue">
+  <rdfs:label xml:lang="en">Outcome Value</rdfs:label>
+  <rdfs:comment xml:lang="en">a discrete value that describes a resulting condition from carrying out the test</rdfs:comment>
+  <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
+  <rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
+</rdf:Description>
+
+<rdf:Description rdf:about="#Pass">
+  <rdfs:subClassOf rdf:resource="#OutcomeValue"/>
+  <rdfs:label xml:lang="en">Pass</rdfs:label>
+  <rdfs:comment xml:lang="en">the class of outcomes to denote passing a test</rdfs:comment>
+  <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
+  <rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
+</rdf:Description>
+
+<rdf:Description rdf:about="#Fail">
+  <rdfs:subClassOf rdf:resource="#OutcomeValue"/>
+  <rdfs:label xml:lang="en">Fail</rdfs:label>
+  <rdfs:comment xml:lang="en">the class of outcomes to denote failing a test</rdfs:comment>
+  <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
+  <rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
+</rdf:Description>
+
+<rdf:Description rdf:about="#CannotTell">
+  <rdfs:subClassOf rdf:resource="#OutcomeValue"/>
+  <rdfs:label xml:lang="en">Undetermined</rdfs:label>
+  <rdfs:comment xml:lang="en">the class of outcomes to denote an undetermined outcome</rdfs:comment>
+  <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
+  <rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
+</rdf:Description>
+
+<rdf:Description rdf:about="#NotApplicable">
+  <rdfs:subClassOf rdf:resource="#OutcomeValue"/>
+  <rdfs:label xml:lang="en">Not applicable</rdfs:label>
+  <rdfs:comment xml:lang="en">the class of outcomes to denote the test is not applicable</rdfs:comment>
+  <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
+  <rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
+</rdf:Description>
+
+<rdf:Description rdf:about="#NotTested">
+  <rdfs:subClassOf rdf:resource="#OutcomeValue"/>
+  <rdfs:label xml:lang="en">Not tested</rdfs:label>
+  <rdfs:comment xml:lang="en">the class of outcomes to denote the test has not been carried out</rdfs:comment>
+  <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
+  <rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
+</rdf:Description>
+
+<rdf:Description rdf:about="#Software">
+  <rdfs:subClassOf rdf:resource="http://usefulinc.com/ns/doap#Project"/>
+  <rdfs:label xml:lang="en">Software</rdfs:label>
+  <rdfs:comment xml:lang="en">any piece of software such as an authoring tool, browser, or evaluation tool</rdfs:comment>
+  <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
+  <rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
+</rdf:Description>
+
+<!--// ### EARL 1.0 properties ### //-->
+
+<rdf:Description rdf:about="#assertedBy">
+  <rdfs:label xml:lang="en">Asserted By</rdfs:label>
+  <rdfs:comment xml:lang="en">assertor of an assertion</rdfs:comment>
+  <rdfs:domain rdf:resource="#Assertion"/>
+  <rdfs:range rdf:resource="#Assertor"/>
+  <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"/>
+  <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#Property"/>
+</rdf:Description>
+
+<rdf:Description rdf:about="#subject">
+  <rdfs:label xml:lang="en">Subject</rdfs:label>
+  <rdfs:comment xml:lang="en">test subject of an assertion</rdfs:comment>
+  <rdfs:domain rdf:resource="#Assertion"/>
+  <rdfs:range rdf:resource="#TestSubject"/>
+  <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"/>
+  <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#Property"/>
+</rdf:Description>
+
+<rdf:Description rdf:about="#test">
+  <rdfs:label xml:lang="en">Test</rdfs:label>
+  <rdfs:comment xml:lang="en">test criterion of an assertion</rdfs:comment>
+  <rdfs:domain rdf:resource="#Assertion"/>
+  <rdfs:range rdf:resource="#TestCriterion"/>
+  <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"/>
+  <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#Property"/>
+</rdf:Description>
+
+<rdf:Description rdf:about="#result">
+  <rdfs:label xml:lang="en">Result</rdfs:label>
+  <rdfs:comment xml:lang="en">result of an assertion</rdfs:comment>
+  <rdfs:domain rdf:resource="#Assertion"/>
+  <rdfs:range rdf:resource="#TestResult"/>
+  <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"/>
+  <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#Property"/>
+</rdf:Description>
+
+<rdf:Description rdf:about="#mode">
+  <rdfs:label xml:lang="en">Mode</rdfs:label>
+  <rdfs:comment xml:lang="en">mode in which the test was performed</rdfs:comment>
+  <rdfs:domain rdf:resource="#Assertion"/>
+  <rdfs:range rdf:resource="#TestMode"/>
+  <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"/>
+  <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#Property"/>
+</rdf:Description>
+
+<rdf:Description rdf:about="#mainAssertor">
+  <rdfs:label xml:lang="en">Main Assertor</rdfs:label>
+  <rdfs:comment xml:lang="en">assertor that is primarily responsible for performing the test</rdfs:comment>
+  <rdfs:domain rdf:resource="#Assertor"/>
+  <rdfs:range rdf:resource="#Assertor"/>
+  <rdfs:subPropertyOf rdf:resource="http://xmlns.com/foaf/spec/#term_member"/>
+  <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"/>
+  <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#Property"/>
+</rdf:Description>
+
+<rdf:Description rdf:about="#outcome">
+  <rdfs:label xml:lang="en">Outcome</rdfs:label>
+  <rdfs:comment xml:lang="en">outcome of performing the test</rdfs:comment>
+  <rdfs:domain rdf:resource="#TestResult"/>
+  <rdfs:range rdf:resource="#OutcomeValue"/>
+  <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"/>
+  <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#Property"/>
+</rdf:Description>
+
+<rdf:Description rdf:about="#pointer">
+  <rdfs:label xml:lang="en">Pointer</rdfs:label>
+  <rdfs:comment xml:lang="en">location within a test subject that are most relevant to a test result</rdfs:comment>
+  <rdfs:domain rdf:resource="TestResult"/>
+  <rdfs:range rdf:resource="http://www.w3.org/2009/pointers#Pointer"/>
+  <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"/>
+  <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#Property"/>
+</rdf:Description>
+
+<rdf:Description rdf:about="#info">
+  <rdfs:label xml:lang="en">Info</rdfs:label>
+  <rdfs:comment xml:lang="en">additional warnings or error messages in a human-readable form</rdfs:comment>
+  <rdfs:domain rdf:resource="#TestResult"/>
+  <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Literal"/>
+  <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
+  <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#Property"/>
+</rdf:Description>
+
+<!--// ### EARL 1.0 instances ### //-->
+
+<rdf:Description rdf:about="#automatic">
+  <rdf:type rdf:resource="#TestMode"/>
+  <dc:title xml:lang="en">Automatic</dc:title>
+  <dc:description xml:lang="en">where the test was carried out automatically by the software tool and without any human intervention</dc:description>
+</rdf:Description>
+
+<rdf:Description rdf:about="#manual">
+  <rdf:type rdf:resource="#TestMode"/>
+  <dc:title xml:lang="en">Manual</dc:title>
+  <dc:description xml:lang="en">where the test was carried out by human evaluators</dc:description>
+</rdf:Description>
+
+<rdf:Description rdf:about="#semiAuto">
+  <rdf:type rdf:resource="#TestMode"/>
+  <dc:title xml:lang="en">Semi-Automatic</dc:title>
+  <dc:description xml:lang="en">where the test was partially carried out by software tools, but where human input or judgment was still required to decide or help decide the outcome of the test</dc:description>
+</rdf:Description>
+
+<rdf:Description rdf:about="#undisclosed">
+  <rdf:type rdf:resource="#TestMode"/>
+  <dc:title xml:lang="en">Undisclosed</dc:title>
+  <dc:description xml:lang="en">where the exact testing process is undisclosed</dc:description>
+</rdf:Description>
+
+<rdf:Description rdf:about="#unknownMode">
+  <rdf:type rdf:resource="#TestMode"/>
+  <dc:title xml:lang="en">Unknown</dc:title>
+  <dc:description xml:lang="en">where the testing process is unknown or undetermined</dc:description>
+</rdf:Description>
+
+<rdf:Description rdf:about="#passed">
+  <rdf:type rdf:resource="#Pass"/>
+  <dc:title xml:lang="en">Passed</dc:title>
+  <dc:description xml:lang="en">the subject passed the test</dc:description>
+</rdf:Description>
+
+<rdf:Description rdf:about="#failed">
+  <rdf:type rdf:resource="#Fail"/>
+  <dc:title xml:lang="en">Failed</dc:title>
+  <dc:description xml:lang="en">the subject failed the test</dc:description>
+</rdf:Description>
+
+<rdf:Description rdf:about="#cantTell">
+  <rdf:type rdf:resource="#CannotTell"/>
+  <dc:title xml:lang="en">Cannot tell</dc:title>
+  <dc:description xml:lang="en">it is unclear if the subject passed or failed the test</dc:description>
+</rdf:Description>
+
+<rdf:Description rdf:about="#inapplicable">
+  <rdf:type rdf:resource="#NotApplicable"/>
+  <dc:title xml:lang="en">Inapplicable</dc:title>
+  <dc:description xml:lang="en">the test is not applicable to the subject</dc:description>
+</rdf:Description>
+
+<rdf:Description rdf:about="#untested">
+  <rdf:type rdf:resource="#NotTested"/>
+  <dc:title xml:lang="en">Untested</dc:title>
+  <dc:description xml:lang="en">the test has not been carried out</dc:description>
+</rdf:Description>
+
+</rdf:RDF>
\ No newline at end of file

Modified: jena/trunk/jena-arq/Vocabularies/build
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/Vocabularies/build?rev=1427837&r1=1427836&r2=1427837&view=diff
==============================================================================
--- jena/trunk/jena-arq/Vocabularies/build (original)
+++ jena/trunk/jena-arq/Vocabularies/build Wed Jan  2 16:07:23 2013
@@ -4,7 +4,7 @@ function syntaxCheck
 {
     FILE="$1"
     echo "Syntax check: $FILE"
-    turtle --sink "$FILE"
+    riot --validate --sink "$FILE"
 }
 
 function proc
@@ -18,7 +18,8 @@ function proc
     shift
     echo "Schemagen: $FILE"
 
-    schemagen --rdfs -i "$FILE" -n "$CLASS" -a "$NS" -o "$CLASS".java -e N3 "$@" 
+    # -e syntax
+    schemagen --rdfs -i "$FILE" -n "$CLASS" -a "$NS" -o "$CLASS".java  "$@" 
     # Add imports
     echo "package com.hp.hpl.jena.sparql.vocabulary ;" >> "$TMP"
     echo >>"$TMP"
@@ -41,9 +42,9 @@ function proc
 ## proc test-manifest.ttl TestManifest \
 ##     "http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#"
 
-syntaxCheck test-manifest-1_1.ttl
-proc test-manifest-1_1.ttl TestManifest_11 \
-    "http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#"
+## syntaxCheck test-manifest-1_1.ttl
+## proc test-manifest-1_1.ttl TestManifest_11 \
+##     "http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#"
 
 ## syntaxCheck test-update.n3
 ## proc test-update.n3 TestManifestUpdate_11 \
@@ -65,8 +66,8 @@ proc test-manifest-1_1.ttl TestManifest_
 
 ##java jena.schemagen -i schema.rdf -o Earl.java -a http://www.w3.org/ns/earl# --inference
 
-## syntaxCheck  EARL.ttl
-## proc EARL.ttl VocabEARL "http://www.w3.org/ns/earl#" --inference
+syntaxCheck  EARL.rdf
+proc EARL.rdf VocabEARL "http://www.w3.org/ns/earl#"
 
 ## syntaxCheck  FOAF.ttl
 ## proc FOAF.ttl FOAF "http://xmlns.com/foaf/0.1/"

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/vocabulary/EARL.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/vocabulary/EARL.java?rev=1427837&r1=1427836&r2=1427837&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/vocabulary/EARL.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/vocabulary/EARL.java Wed Jan  2 16:07:23 2013
@@ -17,122 +17,121 @@
  */
 
 package com.hp.hpl.jena.sparql.vocabulary;
-
-import com.hp.hpl.jena.rdf.model.Property ;
-import com.hp.hpl.jena.rdf.model.Resource ;
-import com.hp.hpl.jena.rdf.model.ResourceFactory ;
-
-public class EARL
-{
+ 
+import com.hp.hpl.jena.rdf.model.*;
+ 
+/**
+ * Vocabulary definitions from EARL.rdf 
+ * Auto-generated by schemagen 
+ */
+public class EARL {
+    /** <p>The RDF model that holds the vocabulary terms</p> */
+    private static Model m_model = ModelFactory.createDefaultModel();
+    
     /** <p>The namespace of the vocabulary as a string</p> */
     public static final String NS = "http://www.w3.org/ns/earl#";
-
     
-    private static Resource resource(String name)
-    { return ResourceFactory.createResource(NS+name) ; }
-
-    private static Property property(String name)
-    { return ResourceFactory.createProperty(NS+name) ; }
     /** <p>The namespace of the vocabulary as a string</p>
      *  @see #NS */
     public static String getURI() {return NS;}
     
     /** <p>The namespace of the vocabulary as a resource</p> */
-    public static final Resource NAMESPACE = resource( NS );
-    
-    public static final Property assertedBy =property( "assertedBy" );
-    
-    public static final Property info = property( "info" );
+    public static final Resource NAMESPACE = m_model.createResource( NS );
     
-    public static final Property outcome = property( "outcome" );
+    /** <p>assertor of an assertion</p> */
+    public static final Property assertedBy = m_model.createProperty( "http://www.w3.org/ns/earl#assertedBy" );
     
-    public static final Property mode = property( "mode" );
+    /** <p>additional warnings or error messages in a human-readable form</p> */
+    public static final Property info = m_model.createProperty( "http://www.w3.org/ns/earl#info" );
     
-    /** <p>Assertor assisting to determine assertion result</p> */
-    public static final Property helpAssertor = property( "helpAssertor" );
+    /** <p>assertor that is primarily responsible for performing the test</p> */
+    public static final Property mainAssertor = m_model.createProperty( "http://www.w3.org/ns/earl#mainAssertor" );
     
-    public static final Property result = property( "result" );
+    /** <p>mode in which the test was performed</p> */
+    public static final Property mode = m_model.createProperty( "http://www.w3.org/ns/earl#mode" );
     
-    /** <p>Assertor mainly responsible for determining assertion result</p> */
-    public static final Property mainAssertor = property( "mainAssertor" );
+    /** <p>outcome of performing the test</p> */
+    public static final Property outcome = m_model.createProperty( "http://www.w3.org/ns/earl#outcome" );
     
-    public static final Property pointer = property( "pointer" );
+    /** <p>location within a test subject that are most relevant to a test result</p> */
+    public static final Property pointer = m_model.createProperty( "http://www.w3.org/ns/earl#pointer" );
     
-    public static final Property sourceCopy = property( "sourceCopy" );
+    /** <p>result of an assertion</p> */
+    public static final Property result = m_model.createProperty( "http://www.w3.org/ns/earl#result" );
     
-    public static final Property test = property( "test" );
+    /** <p>test subject of an assertion</p> */
+    public static final Property subject = m_model.createProperty( "http://www.w3.org/ns/earl#subject" );
     
-    public static final Property subject = property( "subject" );
+    /** <p>test criterion of an assertion</p> */
+    public static final Property test = m_model.createProperty( "http://www.w3.org/ns/earl#test" );
     
-    public static final Property context = property( "context" );
+    /** <p>a statement that embodies the results of a test</p> */
+    public static final Resource Assertion = m_model.createResource( "http://www.w3.org/ns/earl#Assertion" );
     
-    /** <p>Group of persons or evaluation tools that claim assertions</p> */
-    public static final Resource CompoundAssertor = resource( "CompoundAssertor" );
+    /** <p>an entity such as a person, a software tool, an organization, or any other 
+     *  grouping that carries out a test collectively</p>
+     */
+    public static final Resource Assertor = m_model.createResource( "http://www.w3.org/ns/earl#Assertor" );
     
-    /** <p>Nominal value of the result</p> */
-    public static final Resource OutcomeValue = resource( "OutcomeValue" );
+    /** <p>the class of outcomes to denote an undetermined outcome</p> */
+    public static final Resource CannotTell = m_model.createResource( "http://www.w3.org/ns/earl#CannotTell" );
     
-    /** <p>Result from conducting test cases on subjects</p> */
-    public static final Resource TestResult = resource( "TestResult" );
+    /** <p>the class of outcomes to denote failing a test</p> */
+    public static final Resource Fail = m_model.createResource( "http://www.w3.org/ns/earl#Fail" );
     
-    /** <p>A test case against which subjects are tested</p> */
-    public static final Resource TestCase = resource( "TestCase" );
+    /** <p>the class of outcomes to denote the test is not applicable</p> */
+    public static final Resource NotApplicable = m_model.createResource( "http://www.w3.org/ns/earl#NotApplicable" );
     
-    /** <p>One person or evaluation tool that claims assertions</p> */
-    public static final Resource SingleAssertor = resource( "SingleAssertor" );
+    /** <p>the class of outcomes to denote the test has not been carried out</p> */
+    public static final Resource NotTested = m_model.createResource( "http://www.w3.org/ns/earl#NotTested" );
     
-    /** <p>A testable statement against which subjects are tested</p> */
-    public static final Resource TestCriterion = resource( "TestCriterion" );
+    /** <p>a discrete value that describes a resulting condition from carrying out the 
+     *  test</p>
+     */
+    public static final Resource OutcomeValue = m_model.createResource( "http://www.w3.org/ns/earl#OutcomeValue" );
     
-    /** <p>Parent node that contains all parts of an assertion</p> */
-    public static final Resource Assertion = resource( "Assertion" );
+    /** <p>the class of outcomes to denote passing a test</p> */
+    public static final Resource Pass = m_model.createResource( "http://www.w3.org/ns/earl#Pass" );
     
-    /** <p>Mode in which tests were conducted</p> */
-    public static final Resource TestMode = resource( "TestMode" );
+    /** <p>any piece of software such as an authoring tool, browser, or evaluation tool</p> */
+    public static final Resource Software = m_model.createResource( "http://www.w3.org/ns/earl#Software" );
     
-    /** <p>Subjects that are available on the Web</p> */
-    public static final Resource Content = resource( "Content" );
+    /** <p>an atomic test, usually one that is a partial test for a requirement</p> */
+    public static final Resource TestCase = m_model.createResource( "http://www.w3.org/ns/earl#TestCase" );
     
-    /** <p>A tool that can perform tests or be the subject of testing</p> */
-    public static final Resource Software = resource( "Software" );
+    /** <p>a testable statement, usually one that can be passed or failed</p> */
+    public static final Resource TestCriterion = m_model.createResource( "http://www.w3.org/ns/earl#TestCriterion" );
     
-    /** <p>A requirement against which subjects are tested</p> */
-    public static final Resource TestRequirement = resource( "TestRequirement" );
+    /** <p>describes how a test was carried out</p> */
+    public static final Resource TestMode = m_model.createResource( "http://www.w3.org/ns/earl#TestMode" );
     
-    /** <p>Subject of the assertion</p> */
-    public static final Resource TestSubject = resource( "TestSubject" );
+    /** <p>a higher-level requirement that is tested by executing one or more sub-tests</p> */
+    public static final Resource TestRequirement = m_model.createResource( "http://www.w3.org/ns/earl#TestRequirement" );
     
-    /** <p>Persons or evaluation tools that claim assertions</p> */
-    public static final Resource Assertor = resource( "Assertor" );
+    /** <p>the actual result of performing the test</p> */
+    public static final Resource TestResult = m_model.createResource( "http://www.w3.org/ns/earl#TestResult" );
     
+    /** <p>the class of things that have been tested against some test criterion</p> */
+    public static final Resource TestSubject = m_model.createResource( "http://www.w3.org/ns/earl#TestSubject" );
     
-    /** <p>Test failed</p> */
-    public static final Resource fail = resource( "fail" );
+    public static final Resource automatic = m_model.createResource( "http://www.w3.org/ns/earl#automatic" );
     
-    /** <p>Test has not been carried out</p> */
-    public static final Resource notTested = resource( "notTested" );
+    public static final Resource cantTell = m_model.createResource( "http://www.w3.org/ns/earl#cantTell" );
     
-    /** <p>Test passed</p> */
-    public static final Resource pass = resource( "pass" );
+    public static final Resource failed = m_model.createResource( "http://www.w3.org/ns/earl#failed" );
     
-    /** <p>Test was performed primarily by a tool, and human assistance</p> */
-    public static final Resource semiAutomatic = resource( "semiAutomatic" );
+    public static final Resource inapplicable = m_model.createResource( "http://www.w3.org/ns/earl#inapplicable" );
     
-    /** <p>Test is not applicable to the subject</p> */
-    public static final Resource notApplicable = resource( "notApplicable" );
+    public static final Resource manual = m_model.createResource( "http://www.w3.org/ns/earl#manual" );
     
-    /** <p>Result was derived from other results</p> */
-    public static final Resource heuristic = resource( "heuristic" );
+    public static final Resource passed = m_model.createResource( "http://www.w3.org/ns/earl#passed" );
     
-    /** <p>Test was performed by a tool only</p> */
-    public static final Resource automatic = resource( "automatic" );
+    public static final Resource semiAuto = m_model.createResource( "http://www.w3.org/ns/earl#semiAuto" );
     
-    /** <p>Test was performed by a human only</p> */
-    public static final Resource manual = resource( "manual" );
+    public static final Resource undisclosed = m_model.createResource( "http://www.w3.org/ns/earl#undisclosed" );
     
-    /** <p>Outcome of the test is uncertain</p> */
-    public static final Resource cannotTell = resource( "cannotTell" );
+    public static final Resource unknownMode = m_model.createResource( "http://www.w3.org/ns/earl#unknownMode" );
     
-    /** <p>Test was performed by a combination of persons and tools</p> */
-    public static final Resource notAvailable = resource( "notAvailable" );
+    public static final Resource untested = m_model.createResource( "http://www.w3.org/ns/earl#untested" );
 }
+  
\ No newline at end of file

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/EarlReport.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/EarlReport.java?rev=1427837&r1=1427836&r2=1427837&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/EarlReport.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/EarlReport.java Wed Jan  2 16:07:23 2013
@@ -40,7 +40,7 @@ public class EarlReport
          earl:assertedBy [ ...] 
          earl:result [ 
                  rdf:type earl:TestResult;
-                 earl:outcome earl:pass ];
+                 earl:outcome earl:passed ];
          earl:subject <thingBeingTested>;
          earl:test <testPerformed> ;
          earl:mode .... ].
@@ -97,22 +97,26 @@ public class EarlReport
     
     public void success(String testURI)
     { 
-        createAssertionResult(testURI, EARL.pass) ;
+        createAssertionResult(testURI, EARL.passed) ;
+        //Old -- createAssertionResult(testURI, EARL.pass) ;
     }
     
     public void failure(String testURI)
     {
-        createAssertionResult(testURI, EARL.fail) ;
+        createAssertionResult(testURI, EARL.failed) ;
+        //Old -- createAssertionResult(testURI, EARL.fail) ;
     }
 
     public void notApplicable(String testURI)
     {
-        createAssertionResult(testURI, EARL.notApplicable);
+        createAssertionResult(testURI, EARL.inapplicable);
+        // Old --  createAssertionResult(testURI, EARL.notApplicable);
     }
     
     public void notTested(String testURI)
     {
-        createAssertionResult(testURI, EARL.notTested);
+        createAssertionResult(testURI, EARL.untested);
+        // Old -- createAssertionResult(testURI, EARL.notTested);
     }
     
     private void createAssertionResult(String testURI, Resource outcome)