Skip to content

Commit 8d0a6e2

Browse files
authored
Merge pull request #145 from arduino/per1234/rulefunction-output-test-names
Show expected and actual values in rule function output test messages
2 parents c98d787 + 5be51f2 commit 8d0a6e2

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

Diff for: internal/rule/rulefunction/library_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package rulefunction
1717

1818
import (
19+
"fmt"
1920
"os"
2021
"regexp"
2122
"testing"
@@ -60,7 +61,7 @@ func checkLibraryRuleFunction(ruleFunction Type, testTables []libraryRuleFunctio
6061

6162
result, output := ruleFunction()
6263
assert.Equal(t, testTable.expectedRuleResult, result, testTable.testName)
63-
assert.True(t, expectedOutputRegexp.MatchString(output), testTable.testName)
64+
assert.True(t, expectedOutputRegexp.MatchString(output), fmt.Sprintf("%s (output: %s, assertion regex: %s)", testTable.testName, output, testTable.expectedOutputQuery))
6465
}
6566
}
6667

Diff for: internal/rule/rulefunction/packageindex_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package rulefunction
1717

1818
import (
19+
"fmt"
1920
"regexp"
2021
"testing"
2122

@@ -55,7 +56,7 @@ func checkPackageIndexRuleFunction(ruleFunction Type, testTables []packageIndexR
5556

5657
result, output := ruleFunction()
5758
assert.Equal(t, testTable.expectedRuleResult, result, testTable.testName)
58-
assert.True(t, expectedOutputRegexp.MatchString(output), testTable.testName)
59+
assert.True(t, expectedOutputRegexp.MatchString(output), fmt.Sprintf("%s (output: %s, assertion regex: %s)", testTable.testName, output, testTable.expectedOutputQuery))
5960
}
6061
}
6162

Diff for: internal/rule/rulefunction/platform_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package rulefunction
1717

1818
import (
19+
"fmt"
1920
"regexp"
2021
"testing"
2122

@@ -58,7 +59,7 @@ func checkPlatformRuleFunction(ruleFunction Type, testTables []platformRuleFunct
5859

5960
result, output := ruleFunction()
6061
assert.Equal(t, testTable.expectedRuleResult, result, testTable.testName)
61-
assert.True(t, expectedOutputRegexp.MatchString(output), testTable.testName)
62+
assert.True(t, expectedOutputRegexp.MatchString(output), fmt.Sprintf("%s (output: %s, assertion regex: %s)", testTable.testName, output, testTable.expectedOutputQuery))
6263
}
6364
}
6465

Diff for: internal/rule/rulefunction/rulefunction_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package rulefunction
1717

1818
import (
19+
"fmt"
1920
"os"
2021
"regexp"
2122
"testing"
@@ -56,7 +57,7 @@ func checkRuleFunction(ruleFunction Type, testTables []ruleFunctionTestTable, t
5657

5758
result, output := ruleFunction()
5859
assert.Equal(t, testTable.expectedRuleResult, result, testTable.testName)
59-
assert.True(t, expectedOutputRegexp.MatchString(output), testTable.testName)
60+
assert.True(t, expectedOutputRegexp.MatchString(output), fmt.Sprintf("%s (output: %s, assertion regex: %s)", testTable.testName, output, testTable.expectedOutputQuery))
6061
}
6162
}
6263

Diff for: internal/rule/rulefunction/sketch_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package rulefunction
1717

1818
import (
19+
"fmt"
1920
"os"
2021
"regexp"
2122
"testing"
@@ -56,7 +57,7 @@ func checkSketchRuleFunction(ruleFunction Type, testTables []sketchRuleFunctionT
5657

5758
result, output := ruleFunction()
5859
assert.Equal(t, testTable.expectedRuleResult, result, testTable.testName)
59-
assert.True(t, expectedOutputRegexp.MatchString(output), testTable.testName)
60+
assert.True(t, expectedOutputRegexp.MatchString(output), fmt.Sprintf("%s (output: %s, assertion regex: %s)", testTable.testName, output, testTable.expectedOutputQuery))
6061
}
6162
}
6263

0 commit comments

Comments
 (0)