Migrate to new spec (#106)

Migrated tests from old spec to PTS spec

Also fixes a multiple PTS bugs and integrates it with the ref implementation

* set_default_environment can be a file path or a struct with the
environment
* equality for struct elements were using Ion equality instead of PTS
equality
* Interpolation now accepts both $variable or ${variable} when
interpolating strings
* using absolute path for test files in errors for better error
reporting
* JUnitRunner generated name now includes the test location location along with
the test id

Author: raganhan

pts/test/org/partiql/lang/pts/PartiQlPtsEvaluator.kt

@@ -33,12 +33,11 @@ class PartiQlPtsEvaluator(equality: PtsEquality) : Evaluator(equality) {
             }
 
     private fun runTest(test: TestExpression): TestResult = try {
-        val ionStruct = test.environment
+        // recreate the environment struct using the evaluator ion system
+        val ionStruct = ion.newValue(ion.newReader(test.environment).apply { next() }) as IonStruct
 
-        val reader = ion.newReader(ionStruct)
-        reader.next()
 
-        val globals = compilerPipeline.valueFactory.newFromIonValue(ion.newValue(reader) as IonStruct).bindings
+        val globals = compilerPipeline.valueFactory.newFromIonValue(ionStruct).bindings
         val session = EvaluationSession.build { globals(globals) }
         val expression = compilerPipeline.compile(test.statement)
         val actualResult = expression.eval(session).toPtsIon()
@@ -75,7 +74,7 @@ class PartiQlPtsEvaluator(equality: PtsEquality) : Evaluator(equality) {
             LIST -> this.foldToIonSequence(ion.newEmptyList())
             SEXP -> this.foldToIonSequence(ion.newEmptySexp())
             STRUCT -> this.fold(ion.newEmptyStruct()) { struct, el ->
-                struct.apply { put(el.asNamed().name.stringValue(), el.toPtsIon()) }
+                struct.apply { add(el.name!!.stringValue(), el.toPtsIon()) }
             }
             BAG -> {
                 val bag = ion.newEmptySexp().apply { add(ion.newSymbol("bag")) }

pts/test/org/partiql/lang/pts/PtsTest.kt

@@ -0,0 +1,18 @@
+package org.partiql.lang.pts
+
+import org.partiql.testscript.evaluator.Evaluator
+import org.partiql.testscript.evaluator.PtsEquality
+import org.partiql.testscript.junitRunner.Junit4PtsTest
+
+// TODO move this back into lang when testscript is its own pkg
+
+/**
+ * Runs all tests from PTS as Junit tests
+ */
+class PtsTest : Junit4PtsTest() {
+
+    override fun getEvaluator(): Evaluator = PartiQlPtsEvaluator(PtsEquality.getDefault())
+
+    override fun getPtsFilePaths() = listOf("../testscript/pts/test-scripts")
+
+}

testscript/Readme.md

@@ -37,18 +37,22 @@ successfully or produce an error:
 Changes the default environment for the current file. The initial default environment is the empty environment.
 
 ```ion
-set_default_environment::<struct, required - new default environment>
+set_default_environment::<struct|string, required - new default environment>
 ```
 
+When `set_default_environment` is a `string` it denotes the relative file path to an ion file that contains 
+the environment.  
+
 ### for
 
-A `for` function contains a `template` and `variableSet`. Each `test` in the template is performed once for 
-each `variableSet` by substituting a `variableSet`'s name/value pairs into corresponding placeholders in a `test`.
+A `for` function contains a `template` and `variable_set`. Each `test` in the template is performed once for 
+each `variable_set` by substituting a `variable_set`'s name/value pairs into corresponding placeholders in 
+the template.
 
 ```ion
 for::{
-    template: <list of tests, required - list of templated PTS functions to be interpolated>,
-    variableSets: <list of structs, required - list of variables used to interpolate the template>,
+    template: <list of tests, required - list of templated PTS tests to be interpolated>,
+    variable_sets: <list of structs, required - list of variables used to interpolate the template>,
 }
 ```
 
@@ -64,7 +68,7 @@ for::{
             expected: (success $expected)
         }
     ],
-    variableSets: [
+    variable_sets: [
         { value: 1, expected: 2 },
         { value: 10, expected: 11 },
     ]

testscript/build.gradle

@@ -14,6 +14,9 @@ dependencies {
     // test dependencies
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.3.1"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.3.1"
+
+    testImplementation 'com.amazon.ion:ion-kotlin-builder:1.0.1'
+    
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.3.1"
 }
 

testscript/pts/test-scripts-ignored/README.md

@@ -0,0 +1 @@
+Tests inside this directory are not run as part of the `integration-test` target. They may be failing or too slow