Always include input when logging test errors

rubensworks · Dec 5, 2018 · 726438b · 726438b
1 parent fa18815
commit 726438b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/lib/testcase/rdfsyntax/TestCaseEval.ts b/lib/testcase/rdfsyntax/TestCaseEval.ts
@@ -55,7 +55,7 @@ export class TestCaseEval implements ITestCaseRdfSyntax {
     const quads: RDF.Quad[] = await parser.parse(this.data, this.baseIRI, injectArguments);
     if (!isomorphic(quads, this.expected)) {
       throw new Error(`Invalid data parsing
-  Query: ${this.data}
+  Input: ${this.data}
 
   Expected: ${JSON.stringify(this.expected.map(quadToStringQuad), null, '  ')}
 

diff --git a/lib/testcase/rdfsyntax/TestCaseSyntax.ts b/lib/testcase/rdfsyntax/TestCaseSyntax.ts
@@ -56,15 +56,15 @@ export class TestCaseSyntax implements ITestCaseRdfSyntax {
     } catch (e) {
       if (this.expectNoError) {
         throw new Error(`Expected not throw an error when parsing.
-  Query: ${this.data}
+  Input: ${this.data}
   Error: ${e}
 `);
       }
       return;
     }
     if (!this.expectNoError) {
       throw new Error(`Expected to throw an error when parsing.
-  Query: ${this.data}
+  Input: ${this.data}
 `);
     }
   }

diff --git a/lib/testcase/sparql/TestCaseNegativeSyntax.ts b/lib/testcase/sparql/TestCaseNegativeSyntax.ts
@@ -44,7 +44,9 @@ export class TestCaseNegativeSyntax implements ITestCaseSparql {
     } catch (e) {
       return;
     }
-    throw new Error(`Expected ${this.queryString} to throw an error when parsing.`);
+    throw new Error(`Expected ${this.queryString} to throw an error when parsing.
+  Input: ${this.queryString}
+`);
   }
 
 }
diff --git a/lib/testcase/sparql/TestCasePositiveSyntax.ts b/lib/testcase/sparql/TestCasePositiveSyntax.ts
@@ -39,7 +39,14 @@ export class TestCasePositiveSyntax implements ITestCaseSparql {
   }
 
   public async test(engine: IQueryEngine, injectArguments: any): Promise<void> {
-    await engine.parse(this.queryString, injectArguments);
+    try {
+      await engine.parse(this.queryString, injectArguments);
+    } catch (e) {
+      throw new Error(`Expected not throw an error when parsing.
+  Input: ${this.queryString}
+  Error: ${e}
+`);
+    }
     return;
   }