fix: testcase uri should not have substrait_include as prefix (#86)

substrait-io · Dec 13, 2024 · 317c209 · 317c209
1 parent 6123b88
commit 317c209
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/testcases/parser/parse_test.go b/testcases/parser/parse_test.go
@@ -46,7 +46,7 @@ lt('2016-12-31T13:30:15'::ts, '2017-12-31T13:30:15'::ts) = true::bool
 	assert.Len(t, testFile.TestCases, 1)
 	assert.Equal(t, "lt", testFile.TestCases[0].FuncName)
 
-	assert.Contains(t, testFile.TestCases[0].BaseURI, "/extensions/functions_datetime.yaml")
+	assert.Equal(t, testFile.TestCases[0].BaseURI, "/extensions/functions_datetime.yaml")
 	assert.Contains(t, testFile.TestCases[0].GroupDesc, "timestamp examples using the timestamp type")
 	assert.Len(t, testFile.TestCases[0].Args, 2)
 	tsLiteral, err := literal.NewTimestampFromString("2016-12-31T13:30:15")
@@ -228,7 +228,7 @@ sum((9223372036854775806, 1, 1, 1, 1, 10000000000)::i64) [overflow:ERROR] = <!ER
 	assert.Len(t, testFile.TestCases, 2)
 	assert.Equal(t, "avg", testFile.TestCases[0].FuncName)
 	assert.Contains(t, testFile.TestCases[0].GroupDesc, "basic")
-	assert.Contains(t, testFile.TestCases[0].BaseURI, "extensions/functions_arithmetic.yaml")
+	assert.Equal(t, testFile.TestCases[0].BaseURI, "extensions/functions_arithmetic.yaml")
 	assert.Len(t, testFile.TestCases[0].Args, 0)
 	assert.Len(t, testFile.TestCases[0].AggregateArgs, 1)
 	assert.Equal(t, "fp32", testFile.TestCases[0].AggregateArgs[0].ColumnType.String())
@@ -243,7 +243,7 @@ sum((9223372036854775806, 1, 1, 1, 1, 10000000000)::i64) [overflow:ERROR] = <!ER
 
 	assert.Equal(t, "sum", testFile.TestCases[1].FuncName)
 	assert.Contains(t, testFile.TestCases[1].GroupDesc, "basic")
-	assert.Contains(t, testFile.TestCases[1].BaseURI, "extensions/functions_arithmetic.yaml")
+	assert.Equal(t, testFile.TestCases[1].BaseURI, "extensions/functions_arithmetic.yaml")
 	assert.Len(t, testFile.TestCases[1].Args, 0)
 	assert.Len(t, testFile.TestCases[1].AggregateArgs, 1)
 	assert.Equal(t, "i64", testFile.TestCases[1].AggregateArgs[0].ColumnType.String())
@@ -289,7 +289,7 @@ func TestParseAggregateFuncCompact(t *testing.T) {
 	assert.Len(t, testFile.TestCases, 1)
 	assert.Equal(t, "corr", testFile.TestCases[0].FuncName)
 	assert.Contains(t, testFile.TestCases[0].GroupDesc, "basic")
-	assert.Contains(t, testFile.TestCases[0].BaseURI, "extensions/functions_arithmetic.yaml")
+	assert.Equal(t, testFile.TestCases[0].BaseURI, "extensions/functions_arithmetic.yaml")
 	assert.Len(t, testFile.TestCases[0].Args, 0)
 	assert.Len(t, testFile.TestCases[0].AggregateArgs, 2)
 	assert.Equal(t, newFloat32Values(20, -3, 1, 10, 5), testFile.TestCases[0].Columns[0])
@@ -325,7 +325,7 @@ corr(t1.col1, t1.col0) = 1::fp64
 	assert.Len(t, testFile.TestCases, 2)
 	assert.Equal(t, "corr", testFile.TestCases[0].FuncName)
 	assert.Contains(t, testFile.TestCases[0].GroupDesc, "basic")
-	assert.Contains(t, testFile.TestCases[0].BaseURI, "extensions/functions_arithmetic.yaml")
+	assert.Equal(t, testFile.TestCases[0].BaseURI, "extensions/functions_arithmetic.yaml")
 	assert.Len(t, testFile.TestCases[0].Args, 0)
 	assert.Len(t, testFile.TestCases[0].AggregateArgs, 2)
 	assert.Equal(t, newFloat32Values(20, -3, 1, 10, 5), testFile.TestCases[0].Columns[0])
@@ -335,7 +335,7 @@ corr(t1.col1, t1.col0) = 1::fp64
 
 	assert.Equal(t, "corr", testFile.TestCases[1].FuncName)
 	assert.Contains(t, testFile.TestCases[1].GroupDesc, "basic")
-	assert.Contains(t, testFile.TestCases[1].BaseURI, "extensions/functions_arithmetic.yaml")
+	assert.Equal(t, testFile.TestCases[1].BaseURI, "extensions/functions_arithmetic.yaml")
 	assert.Len(t, testFile.TestCases[1].Args, 0)
 	assert.Len(t, testFile.TestCases[1].AggregateArgs, 2)
 	assert.Equal(t, newInt64Values(20, -3, 1, 10, 5), testFile.TestCases[1].Columns[0])

diff --git a/testcases/parser/visitor.go b/testcases/parser/visitor.go
@@ -59,10 +59,14 @@ func (v *TestCaseVisitor) VisitDoc(ctx *baseparser.DocContext) interface{} {
 func (v *TestCaseVisitor) VisitHeader(ctx *baseparser.HeaderContext) interface{} {
 	return TestFileHeader{
 		Version:     ctx.Version().GetText(),
-		IncludedURI: ctx.Include().GetText(),
+		IncludedURI: v.Visit(ctx.Include()).(string),
 	}
 }
 
+func (v *TestCaseVisitor) VisitInclude(ctx *baseparser.IncludeContext) interface{} {
+	return getRawStringFromStringLiteral(ctx.StringLiteral(0).GetText())
+}
+
 type TestGroup struct {
 	Description string
 	TestCases   []*TestCase