Skip to content

Commit 8869911

Browse files
robstewart57robstewart57
committed
Switches turtle list positive syntax tests to evaluation tests
Tests turtle-eval-lists-01 to turtle-eval-lists-05 were previously positive syntax tests. These tests are now evaluation tests, so for each Turtle lists test there is a corresponding NTriples .nt file with the expected output. This change still checks for Turtle collections syntax compliance as before, and it now also checks that blank nodes are generated correctly when the `( )` shorthand is used for collections as a subject or as an object.
1 parent 5825737 commit 8869911

11 files changed

+62
-20
lines changed

‎turtle/manifest.ttl

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,11 @@
201201
<#turtle-syntax-struct-03>
202202
<#turtle-syntax-struct-04>
203203
<#turtle-syntax-struct-05>
204-
<#turtle-syntax-lists-01>
205-
<#turtle-syntax-lists-02>
206-
<#turtle-syntax-lists-03>
207-
<#turtle-syntax-lists-04>
208-
<#turtle-syntax-lists-05>
204+
<#turtle-eval-lists-01>
205+
<#turtle-eval-lists-02>
206+
<#turtle-eval-lists-03>
207+
<#turtle-eval-lists-04>
208+
<#turtle-eval-lists-05>
209209
<#turtle-syntax-bad-uri-01>
210210
<#turtle-syntax-bad-uri-02>
211211
<#turtle-syntax-bad-uri-03>
@@ -1577,39 +1577,44 @@
15771577
mf:action <turtle-syntax-struct-05.ttl> ;
15781578
.
15791579

1580-
<#turtle-syntax-lists-01> rdf:type rdft:TestTurtlePositiveSyntax ;
1581-
mf:name "turtle-syntax-lists-01" ;
1580+
<#turtle-eval-lists-01> rdf:type rdft:TestTurtleEval ;
1581+
mf:name "turtle-eval-lists-01" ;
15821582
rdfs:comment "empty list" ;
15831583
rdft:approval rdft:Approved ;
1584-
mf:action <turtle-syntax-lists-01.ttl> ;
1584+
mf:action <turtle-eval-lists-01.ttl> ;
1585+
mf:result <turtle-eval-lists-01.nt> ;
15851586
.
15861587

1587-
<#turtle-syntax-lists-02> rdf:type rdft:TestTurtlePositiveSyntax ;
1588-
mf:name "turtle-syntax-lists-02" ;
1588+
<#turtle-eval-lists-02> rdf:type rdft:TestTurtleEval ;
1589+
mf:name "turtle-eval-lists-02" ;
15891590
rdfs:comment "mixed list" ;
15901591
rdft:approval rdft:Approved ;
1591-
mf:action <turtle-syntax-lists-02.ttl> ;
1592+
mf:action <turtle-eval-lists-02.ttl> ;
1593+
mf:result <turtle-eval-lists-02.nt> ;
15921594
.
15931595

1594-
<#turtle-syntax-lists-03> rdf:type rdft:TestTurtlePositiveSyntax ;
1595-
mf:name "turtle-syntax-lists-03" ;
1596+
<#turtle-eval-lists-03> rdf:type rdft:TestTurtleEval ;
1597+
mf:name "turtle-eval-lists-03" ;
15961598
rdfs:comment "isomorphic list as subject and object" ;
15971599
rdft:approval rdft:Approved ;
1598-
mf:action <turtle-syntax-lists-03.ttl> ;
1600+
mf:action <turtle-eval-lists-03.ttl> ;
1601+
mf:result <turtle-eval-lists-03.nt> ;
15991602
.
16001603

1601-
<#turtle-syntax-lists-04> rdf:type rdft:TestTurtlePositiveSyntax ;
1602-
mf:name "turtle-syntax-lists-04" ;
1604+
<#turtle-eval-lists-04> rdf:type rdft:TestTurtleEval ;
1605+
mf:name "turtle-eval-lists-04" ;
16031606
rdfs:comment "lists of lists" ;
16041607
rdft:approval rdft:Approved ;
1605-
mf:action <turtle-syntax-lists-04.ttl> ;
1608+
mf:action <turtle-eval-lists-04.ttl> ;
1609+
mf:result <turtle-eval-lists-04.nt> ;
16061610
.
16071611

1608-
<#turtle-syntax-lists-05> rdf:type rdft:TestTurtlePositiveSyntax ;
1609-
mf:name "turtle-syntax-lists-05" ;
1612+
<#turtle-eval-lists-05> rdf:type rdft:TestTurtleEval ;
1613+
mf:name "turtle-eval-lists-05" ;
16101614
rdfs:comment "mixed lists with embedded lists" ;
16111615
rdft:approval rdft:Approved ;
1612-
mf:action <turtle-syntax-lists-05.ttl> ;
1616+
mf:action <turtle-eval-lists-05.ttl> ;
1617+
mf:result <turtle-eval-lists-05.nt> ;
16131618
.
16141619

16151620
<#turtle-syntax-bad-uri-01> rdf:type rdft:TestTurtleNegativeSyntax ;

‎turtle/turtle-eval-lists-01.nt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<http://www.w3.org/2013/TurtleTests/s> <http://www.w3.org/2013/TurtleTests/p> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .

‎turtle/turtle-syntax-lists-01.ttl renamed to ‎turtle/turtle-eval-lists-01.ttl

File renamed without changes.

‎turtle/turtle-eval-lists-02.nt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<http://www.w3.org/2013/TurtleTests/s> <http://www.w3.org/2013/TurtleTests/p> _:b1 .
2+
_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "1"^^<http://www.w3.org/2001/XMLSchema#integer> .
3+
_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:b2 .
4+
_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "2" .
5+
_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:b3 .
6+
_:b3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://www.w3.org/2013/TurtleTests/o> .
7+
_:b3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .

‎turtle/turtle-syntax-lists-02.ttl renamed to ‎turtle/turtle-eval-lists-02.ttl

File renamed without changes.

‎turtle/turtle-eval-lists-03.nt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "1"^^<http://www.w3.org/2001/XMLSchema#integer> .
2+
_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
3+
_:b1 <http://www.w3.org/2013/TurtleTests/p> _:b2 .
4+
_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "1"^^<http://www.w3.org/2001/XMLSchema#integer> .
5+
_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .

‎turtle/turtle-syntax-lists-03.ttl renamed to ‎turtle/turtle-eval-lists-03.ttl

File renamed without changes.

‎turtle/turtle-eval-lists-04.nt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
2+
_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
3+
_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
4+
_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
5+
_:b1 <http://www.w3.org/2013/TurtleTests/p> _:b2 .

‎turtle/turtle-syntax-lists-04.ttl renamed to ‎turtle/turtle-eval-lists-04.ttl

File renamed without changes.

‎turtle/turtle-eval-lists-05.nt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "1"^^<http://www.w3.org/2001/XMLSchema#integer> .
2+
_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:b2 .
3+
_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "2"^^<http://www.w3.org/2001/XMLSchema#integer> .
4+
_:b3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "1"^^<http://www.w3.org/2001/XMLSchema#integer> .
5+
_:b3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:b4 .
6+
_:b4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "2"^^<http://www.w3.org/2001/XMLSchema#integer> .
7+
_:b4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
8+
_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:b5 .
9+
_:b5 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> _:b3 .
10+
_:b5 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
11+
_:b6 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "a" .
12+
_:b6 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
13+
_:b7 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> _:b6 .
14+
_:b7 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:b8 .
15+
_:b8 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "b" .
16+
_:b8 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:b9 .
17+
_:b9 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://www.w3.org/2013/TurtleTests/o> .
18+
_:b9 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
19+
_:b1 <http://www.w3.org/2013/TurtleTests/p> _:b7 .

0 commit comments

Comments
 (0)