Uses fixtures for the error tests.

Also fix a bug in the jsonPath calculation for and/or.

Author: magnarn

src/main/java/io/github/jamsesso/jsonlogic/evaluator/expressions/LogicExpression.java

@@ -33,7 +33,7 @@ public Object evaluate(JsonLogicEvaluator evaluator, JsonLogicArray arguments, O
 
     int index = 0;
     for (JsonLogicNode element : arguments) {
-      result = evaluator.evaluate(element, data, String.format("%s[%d]", jsonPath, index));
+      result = evaluator.evaluate(element, data, String.format("%s[%d]", jsonPath, index++));
 
       if ((isAnd && !JsonLogic.truthy(result)) || (!isAnd && JsonLogic.truthy(result))) {
         return result;

src/test/java/io/github/jamsesso/jsonlogic/ErrorFixtureTests.java

@@ -0,0 +1,96 @@
+package io.github.jamsesso.jsonlogic;
+
+import java.util.ArrayList;
+import java.util.List;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import org.junit.Assert;
+import org.junit.Test;
+import io.github.jamsesso.jsonlogic.utils.JsonValueExtractor;
+
+import static io.github.jamsesso.jsonlogic.FixtureTests.readFixtures;
+
+public class ErrorFixtureTests {
+  private static final List<ErrorFixture> FIXTURES = readFixtures("error-fixtures.json", ErrorFixture::fromArray);
+
+  @Test
+  public void testAllFixtures() {
+    JsonLogic jsonLogic = new JsonLogic();
+    List<TestResult> failures = new ArrayList<>();
+
+    for (ErrorFixture fixture : FIXTURES) {
+      try {
+        jsonLogic.apply(fixture.getJson(), fixture.getData());
+        failures.add(new TestResult(fixture, new JsonLogicException("Expected an exception at " + fixture.getExpectedJsonPath(), "")));
+      } catch (JsonLogicException e) {
+        if (!fixture.getExpectedJsonPath().equals(e.getJsonPath()) ||
+            !fixture.getExpectedError().equals(e.getMessage())) {
+          failures.add(new TestResult(fixture, e));
+        }
+      }
+    }
+
+    for (TestResult testResult : failures) {
+      JsonLogicException exception = testResult.getException();
+      ErrorFixture fixture = testResult.getFixture();
+
+      System.out.printf("FAIL: %s\n\t%s\n\tExpected: %s at %s Got: \"%s\" at \"%s\"\n%n", fixture.getJson(), fixture.getData(),
+        fixture.getExpectedError(), fixture.getExpectedJsonPath(),
+        exception.getMessage(), exception.getJsonPath());
+    }
+
+    Assert.assertEquals(String.format("%d/%d test failures!", failures.size(), FIXTURES.size()), 0, failures.size());
+  }
+
+  private static class ErrorFixture {
+    private final String json;
+    private final Object data;
+    private final String expectedPath;
+    private final String expectedError;
+
+    private ErrorFixture(String json, JsonElement data, String expectedPath, String expectedError) {
+      this.json = json;
+      this.data = JsonValueExtractor.extract(data);
+      this.expectedPath = expectedPath;
+      this.expectedError = expectedError;
+    }
+
+    public static ErrorFixture fromArray(JsonArray array) {
+      return new ErrorFixture(array.get(0).toString(), array.get(1), array.get(2).getAsString(), array.get(3).getAsString());
+    }
+
+    String getJson() {
+      return json;
+    }
+
+    Object getData() {
+      return data;
+    }
+
+    String getExpectedJsonPath() {
+      return expectedPath;
+    }
+
+    String getExpectedError() {
+      return expectedError;
+    }
+  }
+
+  private static class TestResult {
+    private final ErrorFixture fixture;
+    private final JsonLogicException exception;
+
+    private TestResult(ErrorFixture fixture, JsonLogicException exception) {
+      this.fixture = fixture;
+      this.exception = exception;
+    }
+
+    ErrorFixture getFixture() {
+      return fixture;
+    }
+
+    JsonLogicException getException() {
+      return exception;
+    }
+  }
+}

src/test/java/io/github/jamsesso/jsonlogic/FixtureTests.java

@@ -3,31 +3,32 @@
 import com.google.gson.*;
 import io.github.jamsesso.jsonlogic.utils.JsonValueExtractor;
 import org.junit.Assert;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.*;
+import java.util.function.Function;
 
 public class FixtureTests {
-  private static final List<Fixture> FIXTURES = new ArrayList<>();
+  private static final List<Fixture> FIXTURES = readFixtures("fixtures.json", Fixture::fromArray);
 
-  @BeforeClass
-  public static void beforeAll() {
-    InputStream inputStream = FixtureTests.class.getClassLoader().getResourceAsStream("fixtures.json");
+  public static <F> List<F> readFixtures(String fileName, Function<JsonArray, F> makeFixture) {
+    InputStream inputStream = ErrorFixtureTests.class.getClassLoader().getResourceAsStream(fileName);
     JsonParser parser = new JsonParser();
     JsonArray json = parser.parse(new InputStreamReader(inputStream)).getAsJsonArray();
 
+    List<F> fixtures = new ArrayList<>();
     // Pull out each fixture from the array.
     for (JsonElement element : json) {
       if (!element.isJsonArray()) {
         continue;
       }
 
       JsonArray array = element.getAsJsonArray();
-      FIXTURES.add(new Fixture(array.get(0).toString(), array.get(1), array.get(2)));
+      fixtures.add(makeFixture.apply(array));
     }
+    return fixtures;
   }
 
   @Test
@@ -60,6 +61,10 @@ public void testAllFixtures() {
   }
 
   private static class Fixture {
+    public static Fixture fromArray(JsonArray array) {
+      return new Fixture(array.get(0).toString(), array.get(1), array.get(2));
+    }
+
     private final String json;
     private final Object data;
     private final Object expectedValue;