Merge pull request #155 from rubensworks/feature/rdf-test-suite

Use rdf-test-suite for spec testing

Author: RubenVerborgh

.gitignore

@@ -3,5 +3,6 @@
 docs
 browser/n3*
 node_modules
-spec/*/*
+spec/*.ttl
 coverage
+.rdf-test-suite-cache

.travis.yml

@@ -6,32 +6,13 @@ node_js:
  - "node"
 env:
  - DEFAULT_NODE_VERSION=10
-addons:
-  apt:
-    sources:
-    - boost-latest
-    packages:
-    # for SWObjects
-    - libboost-all-dev
-    - uuid-dev
-before_script:
-  - | # Build SWObjects for spec tests
-    if [ ! -e swobjects/bin/sparql ]; then
-      rm -rf swobjects
-      git clone https://github.com/ericprud/SWObjects.git swobjects
-      pushd swobjects
-      git checkout 1739b95536d2b7bf516f5543a6cf7e5c46a9a4f9
-      sed -i 's/^SQL_CLIENTS=.*/SQL_CLIENTS= MYSQL /' CONFIG
-      sed -i 's/^CRYPTLIB=.*/LDFLAGS += -lltdl -ldl/' CONFIG
-      make -j2 bin/sparql
-      popd
-    fi
-  - PATH=$PATH:swobjects/bin
-  - sparql -v
 script:
   - npm run lint
   - npm test
-  - npm run spec
+  - npm run spec-turtle
+  - npm run spec-ntriples
+  - npm run spec-nquads
+  - npm run spec-trig
   - npm run docs
 after_success:
   - if [ "$TRAVIS_NODE_VERSION" == "$DEFAULT_NODE_VERSION" ]; then
@@ -41,10 +22,7 @@ after_success:
       ./.travis_build_pages;
     fi
 cache:
-  apt: true
   directories:
     - node_modules
-    - swobjects
-    - spec/turtle
-    - spec/trig
+    - .rdf-test-suite-cache
 sudo: false

lib/N3Lexer.js

@@ -26,7 +26,7 @@ function N3Lexer(options) {
   // In line mode (N-Triples or N-Quads), only simple features may be parsed
   if (options.lineMode) {
     // Don't tokenize special literals
-    this._tripleQuotedString = this._number = this._boolean = /$0^/;
+    this._tripleApos = this._tripleQuote = this._number = this._boolean = /$0^/;
     // Swap the tokenize method for a restricted version
     var self = this;
     this._tokenize = this.tokenize;

lib/N3Parser.js

@@ -358,12 +358,15 @@ N3Parser.prototype = {
 
   // ### `_readPredicateAfterBlank` reads a predicate after an anonymous blank node
   _readPredicateAfterBlank: function (token) {
-    // If a dot follows a blank node in top context, there is no predicate
-    if (token.type === '.' && !this._contextStack.length) {
-      this._subject = null; // cancel the current quad
+    switch (token.type) {
+    case '.':
+    case '}':
+      // No predicate is coming if the triple is terminated here
+      this._subject = null;
       return this._readPunctuation(token);
+    default:
+      return this._readPredicate(token);
     }
-    return this._readPredicate(token);
   },
 
   // ### `_readListItem` reads items from a list