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 2012/10/29 18:03:03 UTC
svn commit: r1403423 - in /jena/Experimental/riot-reader/testing/RIOT/Lang:
N-Triples/gentests Turtle/eval-struct-01.nt Turtle/eval-struct-01.ttl
Turtle/eval-struct-02.nt Turtle/eval-struct-02.ttl Turtle/gentests
Turtle/manifest.ttl Turtle/master generate
Author: andy
Date: Mon Oct 29 17:03:02 2012
New Revision: 1403423
URL: http://svn.apache.org/viewvc?rev=1403423&view=rev
Log:
Eval tests (start of)
Added:
jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/eval-struct-01.nt
jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/eval-struct-01.ttl
jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/eval-struct-02.nt
jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/eval-struct-02.ttl
Modified:
jena/Experimental/riot-reader/testing/RIOT/Lang/N-Triples/gentests
jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/gentests
jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/manifest.ttl
jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/master
jena/Experimental/riot-reader/testing/RIOT/Lang/generate
Modified: jena/Experimental/riot-reader/testing/RIOT/Lang/N-Triples/gentests
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/testing/RIOT/Lang/N-Triples/gentests?rev=1403423&r1=1403422&r2=1403423&view=diff
==============================================================================
--- jena/Experimental/riot-reader/testing/RIOT/Lang/N-Triples/gentests (original)
+++ jena/Experimental/riot-reader/testing/RIOT/Lang/N-Triples/gentests Mon Oct 29 17:03:02 2012
@@ -1,2 +1,2 @@
#!/bin/sh
-../generate N-Triples nt master
+../generate N-Triples nt nt master
Added: jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/eval-struct-01.nt
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/eval-struct-01.nt?rev=1403423&view=auto
==============================================================================
--- jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/eval-struct-01.nt (added)
+++ jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/eval-struct-01.nt Mon Oct 29 17:03:02 2012
@@ -0,0 +1 @@
+<http://example/s> <http://example/p> <http://example/o> .
Added: jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/eval-struct-01.ttl
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/eval-struct-01.ttl?rev=1403423&view=auto
==============================================================================
--- jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/eval-struct-01.ttl (added)
+++ jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/eval-struct-01.ttl Mon Oct 29 17:03:02 2012
@@ -0,0 +1 @@
+<http://example/s> <http://example/p> <http://example/o> .
Added: jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/eval-struct-02.nt
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/eval-struct-02.nt?rev=1403423&view=auto
==============================================================================
--- jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/eval-struct-02.nt (added)
+++ jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/eval-struct-02.nt Mon Oct 29 17:03:02 2012
@@ -0,0 +1,2 @@
+<http://example/s> <http://example/p1> <http://example/o1> .
+<http://example/s> <http://example/p2> <http://example/o2> .
Added: jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/eval-struct-02.ttl
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/eval-struct-02.ttl?rev=1403423&view=auto
==============================================================================
--- jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/eval-struct-02.ttl (added)
+++ jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/eval-struct-02.ttl Mon Oct 29 17:03:02 2012
@@ -0,0 +1,3 @@
+<http://example/s>
+ <http://example/p1> <http://example/o1> ;
+ <http://example/p2> <http://example/o2> ;
Modified: jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/gentests
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/gentests?rev=1403423&r1=1403422&r2=1403423&view=diff
==============================================================================
--- jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/gentests (original)
+++ jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/gentests Mon Oct 29 17:03:02 2012
@@ -1,2 +1,2 @@
#!/bin/sh
-../generate Turtle ttl master
+../generate Turtle ttl nt master
Modified: jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/manifest.ttl
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/manifest.ttl?rev=1403423&r1=1403422&r2=1403423&view=diff
==============================================================================
--- jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/manifest.ttl (original)
+++ jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/manifest.ttl Mon Oct 29 17:03:02 2012
@@ -149,6 +149,8 @@
<#syn-bad-num-03>
<#syn-bad-num-04>
<#syn-bad-num-05>
+ <#eval-struct-01>
+ <#eval-struct-02>
) .
<#syn-file-01> rdf:type rdft:TestTurtlePositiveSyntax ;
@@ -775,3 +777,15 @@
mf:name "syn-bad-num-05" ;
mf:action <syn-bad-num-05.ttl> ;
.
+
+<#eval-struct-01> rdf:type rdft:TestTurtleEval ;
+ mf:name "eval-struct-01" ;
+ mf:action <eval-struct-01.ttl> ;
+ mf:result <eval-struct-01.nt> ;
+ .
+
+<#eval-struct-02> rdf:type rdft:TestTurtleEval ;
+ mf:name "eval-struct-02" ;
+ mf:action <eval-struct-02.ttl> ;
+ mf:result <eval-struct-02.nt> ;
+ .
Modified: jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/master
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/master?rev=1403423&r1=1403422&r2=1403423&view=diff
==============================================================================
--- jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/master (original)
+++ jena/Experimental/riot-reader/testing/RIOT/Lang/Turtle/master Mon Oct 29 17:03:02 2012
@@ -688,3 +688,18 @@ ROOT=syn-bad-num
<http://example/s> <http://example/p> +-1 .
--End--
+ROOT=eval-struct
+--Eval--
+<http://example/s> <http://example/p> <http://example/o> .
+--Results--
+<http://example/s> <http://example/p> <http://example/o> .
+--End--
+
+--Eval--
+<http://example/s>
+ <http://example/p1> <http://example/o1> ;
+ <http://example/p2> <http://example/o2> ;
+--Results--
+<http://example/s> <http://example/p1> <http://example/o1> .
+<http://example/s> <http://example/p2> <http://example/o2> .
+--End--
Modified: jena/Experimental/riot-reader/testing/RIOT/Lang/generate
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/testing/RIOT/Lang/generate?rev=1403423&r1=1403422&r2=1403423&view=diff
==============================================================================
--- jena/Experimental/riot-reader/testing/RIOT/Lang/generate (original)
+++ jena/Experimental/riot-reader/testing/RIOT/Lang/generate Mon Oct 29 17:03:02 2012
@@ -19,9 +19,9 @@
use File::Slurp;
-if ( $#ARGV != 2 )
+if ( $#ARGV != 3 )
{
- print STDERR "Usage: $0 LANG EXT FILE > manifest.ttl\n" ;
+ print STDERR "Usage: $0 LANG EXT EXT2 FILE > manifest.ttl\n" ;
print STDERR "(writes test files to current directory)\n" ;
exit 1 ;
}
@@ -30,8 +30,9 @@ $lang = shift @ARGV ;
$langt = $lang ;
$langt =~ s/-// ;
$ext = shift @ARGV ;
+$extR = shift @ARGV ;
-# print STDERR "$lang $langt $ext\n" ;
+# print STDERR "$lang $langt $ext $extR\n" ;
$testsyngood = 0 ;
$testsynbad = 0 ;
@@ -57,6 +58,42 @@ while(<>)
next ;
}
+ if ( /^--Eval--/ )
+ {
+ $testType = "rdft:Test${langt}Eval" ;
+ $testevalgood ++ ;
+ $text = &testtext ;
+ ($input,$output) = split(/--Results-- *\n/,$text) ;
+
+## print "TEST\n" ;
+## print $text, "\n" ;
+## print "--------\n" ;
+## print $input, "\n" ;
+## print "--------\n" ;
+## print $output, "\n" ;
+## print "--------\n" ;
+
+ $x = ++ $rootnames{$currentRoot} ;
+ $x = sprintf("%02d", $x) ;
+ $testname = "$currentRoot-$x" ;
+ $fileIn = "$testname.$ext" ;
+ $fileOut = "$testname.$extR" ;
+ $array .= " <#$testname>\n" ;
+ open F,">:utf8", $fileIn ;
+ syswrite F, $input ;
+ close F ;
+ open F,">:utf8", $fileOut ;
+ syswrite F, $output ;
+ close F ;
+ $tests .= qq!
+<#$testname> rdf:type $testType ;
+ mf:name "$testname" ;
+ mf:action <$fileIn> ;
+ mf:result <$fileOut> ;
+ .
+! ;
+ }
+
if ( /^--Syntax--/ || /^--BadSyntax--/ )
{
if ( /^--Syntax--/ )