better reporting on failing official tests

and allow running from a local JSON file

Author: gburt

internal/testing.go

@@ -3,17 +3,20 @@ package internal
 import (
 	"bytes"
 	"encoding/json"
+	"flag"
+	"fmt"
 	"io"
 	"log"
 	"net/http"
+	"os"
 	"reflect"
 )
 
 type (
 	Test struct {
-		Rule     io.Reader
-		Data     io.Reader
-		Expected io.Reader
+		Rule     any
+		Data     any
+		Expected any
 	}
 
 	Tests []Test
@@ -31,27 +34,39 @@ func convertInterfaceToReader(i any) io.Reader {
 	return &result
 }
 
+var testFile = flag.String("jsonlogic-test-file", "", "tests.json file to use instead of http://jsonlogic.com/tests.json")
+
 func GetScenariosFromOfficialTestSuite() Tests {
 	var tests Tests
 
-	response, err := http.Get("http://jsonlogic.com/tests.json")
-	if err != nil {
-		log.Fatal(err)
+	var buffer []byte
+	if *testFile != "" {
+		fmt.Printf("reading from local file\n")
+		var err error
+		buffer, err = os.ReadFile(*testFile)
+		if err != nil {
+			log.Fatal(err)
+		}
+	} else {
+		response, err := http.Get("http://jsonlogic.com/tests.json")
+		if err != nil {
+			log.Fatal(err)
 
-		return tests
-	}
+			return tests
+		}
 
-	buffer, _ := io.ReadAll(response.Body)
+		buffer, err = io.ReadAll(response.Body)
+		if err != nil {
+			log.Fatal(err)
+		}
 
-	response.Body.Close()
+		response.Body.Close()
+	}
 
 	var scenarios []any
-
-	err = json.Unmarshal(buffer, &scenarios)
+	var err = json.Unmarshal(buffer, &scenarios)
 	if err != nil {
 		log.Fatal(err)
-
-		return tests
 	}
 
 	// add missing but relevant scenarios
@@ -69,9 +84,9 @@ func GetScenariosFromOfficialTestSuite() Tests {
 		}
 
 		tests = append(tests, Test{
-			Rule:     convertInterfaceToReader(scenario.([]any)[0]),
-			Data:     convertInterfaceToReader(scenario.([]any)[1]),
-			Expected: convertInterfaceToReader(scenario.([]any)[2]),
+			Rule:     scenario.([]any)[0],
+			Data:     scenario.([]any)[1],
+			Expected: scenario.([]any)[2],
 		})
 	}
 

jsonlogic_test.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io"
 	"strings"
 	"testing"
 
@@ -19,20 +18,24 @@ func TestRulesFromJsonLogic(t *testing.T) {
 
 	for i, test := range tests {
 		t.Run(fmt.Sprintf("Scenario_%d", i), func(t *testing.T) {
-			var result bytes.Buffer
-
-			err := jsonlogic.Apply(test.Rule, test.Data, &result)
+			result, err := jsonlogic.ApplyInterface(test.Rule, test.Data)
 			if err != nil {
 				t.Fatal(err)
 			}
 
-			if b, err := io.ReadAll(test.Expected); err == nil {
-				assert.JSONEq(t, string(b), result.String())
-			}
+			assert.Equal(t, test.Expected, result, "Applying rule %v to data %v", toJSON(test.Rule), toJSON(test.Data))
 		})
 	}
 }
 
+func toJSON(val any) string {
+	res, err := json.Marshal(val)
+	if err != nil {
+		panic(err)
+	}
+	return string(res)
+}
+
 func TestDivWithOnlyOneValue(t *testing.T) {
 	rule := strings.NewReader(`{"/":[4]}`)
 	data := strings.NewReader(`null`)