feat: Moved tests and made basic test for option ref

Brancieq-Paul · May 4, 2024 · 850ee5f · 850ee5f
1 parent 5f48b1e
commit 850ee5f
Show file tree

Hide file tree

Showing 41 changed files with 133 additions and 295 deletions.
diff --git a/src/main/java/fr/paulbrancieq/modpackconfigupdater/remake/path/OptionPathDeserializer.java b/src/main/java/fr/paulbrancieq/modpackconfigupdater/remake/path/OptionPathDeserializer.java
@@ -3,6 +3,7 @@
 import com.google.gson.*;
 import fr.paulbrancieq.modpackconfigupdater.remake.mcufile.AnnotatedTypeAdapterFactory;
 import fr.paulbrancieq.modpackconfigupdater.remake.path.pathpart.OptionPathPart;
+import fr.paulbrancieq.modpackconfigupdater.remake.path.pathpart.SimpleOptionPathPart;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -19,7 +20,11 @@ public OptionPath deserialize(JsonElement json, Type typeOfT, JsonDeserializatio
     } else if (json.isJsonArray()) {
       List<OptionPathPart> optionPathParts = new ArrayList<>();
       for (JsonElement jsonElement : json.getAsJsonArray()) {
-        optionPathParts.add(gson.fromJson(jsonElement, OptionPathPart.class));
+        if (jsonElement.isJsonPrimitive() && jsonElement.getAsJsonPrimitive().isString()) {
+          optionPathParts.addAll(SimpleOptionPathPart.fromMultiPartString(jsonElement.getAsString()));
+        } else {
+          optionPathParts.add(gson.fromJson(jsonElement, OptionPathPart.class));
+        }
       }
       return new OptionPath(optionPathParts);
     }

diff --git a/src/main/java/fr/paulbrancieq/modpackconfigupdater/remake/path/OptionRefDeserializer.java b/src/main/java/fr/paulbrancieq/modpackconfigupdater/remake/path/OptionRefDeserializer.java
@@ -14,7 +14,11 @@ public OptionRef deserialize(JsonElement json, Type typeOfT, JsonDeserialization
     Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation()
             .registerTypeAdapterFactory(new AnnotatedTypeAdapterFactory()).create();
     if (json.isJsonPrimitive() && json.getAsJsonPrimitive().isString()) {
-      return new OptionRef(json.getAsString());
+      try {
+        return new OptionRef(json.getAsString());
+      } catch (IllegalArgumentException e) {
+        throw new JsonParseException(e.getMessage());
+      }
     } else if (json.isJsonObject()) {
       if (!json.getAsJsonObject().has("filepath") || !json.getAsJsonObject().get("filepath").isJsonPrimitive() ||
               !json.getAsJsonObject().get("filepath").getAsJsonPrimitive().isString()) {

diff --git a/...kconfigupdater/remake/path/pathpart/filters/validators/FilterOptionPathPartValidator.java b/...kconfigupdater/remake/path/pathpart/filters/validators/FilterOptionPathPartValidator.java
@@ -3,6 +3,7 @@
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.JsonAdapter;
 import fr.paulbrancieq.modpackconfigupdater.remake.mcufile.JsonRequired;
+import fr.paulbrancieq.modpackconfigupdater.remake.path.pathpart.filters.validators.type.FilterValidatorType;
 import org.jetbrains.annotations.Nullable;
 
 @JsonAdapter(FilterOptionPathPartValidatorJsonDeserializer.class)

diff --git a/...emake/path/pathpart/filters/validators/FilterOptionPathPartValidatorJsonDeserializer.java b/...emake/path/pathpart/filters/validators/FilterOptionPathPartValidatorJsonDeserializer.java
@@ -2,6 +2,7 @@
 
 import com.google.gson.*;
 import fr.paulbrancieq.modpackconfigupdater.remake.mcufile.AnnotatedTypeAdapterFactory;
+import fr.paulbrancieq.modpackconfigupdater.remake.path.pathpart.filters.validators.type.FilterValidatorType;
 
 import java.lang.reflect.Type;
 

diff --git a/...nfigupdater/remake/path/pathpart/filters/validators/type/FilterValidatorDeserializer.java b/...nfigupdater/remake/path/pathpart/filters/validators/type/FilterValidatorDeserializer.java
@@ -0,0 +1,20 @@
+package fr.paulbrancieq.modpackconfigupdater.remake.path.pathpart.filters.validators.type;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+
+import java.lang.reflect.Type;
+
+public class FilterValidatorDeserializer implements JsonDeserializer<FilterValidatorType> {
+  @Override
+  public FilterValidatorType deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
+          throws JsonParseException {
+    try {
+      return FilterValidatorType.fromString(json.getAsString());
+    } catch (Exception e) {
+      throw new JsonParseException("Invalid FilterValidatorType: " + json.getAsString());
+    }
+  }
+}
diff --git a/...lters/validators/FilterValidatorType.java → .../validators/type/FilterValidatorType.java b/...lters/validators/FilterValidatorType.java → .../validators/type/FilterValidatorType.java
@@ -1,5 +1,10 @@
-package fr.paulbrancieq.modpackconfigupdater.remake.path.pathpart.filters.validators;
+package fr.paulbrancieq.modpackconfigupdater.remake.path.pathpart.filters.validators.type;
 
+import com.google.gson.annotations.JsonAdapter;
+import fr.paulbrancieq.modpackconfigupdater.remake.path.pathpart.filters.validators.FilterOptionPathPartValidator;
+import fr.paulbrancieq.modpackconfigupdater.remake.path.pathpart.filters.validators.RangeFilterOptionPathPartValidator;
+
+@JsonAdapter(FilterValidatorDeserializer.class)
 public enum FilterValidatorType {
   RANGE("range", RangeFilterOptionPathPartValidator.class); // TODO: Add more filter types
   // Note for myself for when adding more filters: You have already done all that is needed to verify the filter fields.
@@ -20,4 +25,13 @@ public String getTypeString() {
   public Class<? extends FilterOptionPathPartValidator> getFilterValidatorOptionPathPartClass() {
     return filterValidatorOptionPathPartClass;
   }
+
+  public static FilterValidatorType fromString(String type) {
+    for (FilterValidatorType filterValidatorType : FilterValidatorType.values()) {
+      if (filterValidatorType.getTypeString().equals(type)) {
+        return filterValidatorType;
+      }
+    }
+    throw new IllegalArgumentException("Unknown filter validator type: " + type);
+  }
 }
diff --git a/...mcujsonfiletest/BasicMcuJsonFileTest.java → ...mcujsonfiletest/BasicMcuJsonFileTest.java b/...mcujsonfiletest/BasicMcuJsonFileTest.java → ...mcujsonfiletest/BasicMcuJsonFileTest.java
@@ -1,17 +1,17 @@
-package fr.paulbrancieq.modpackconfigupdater.newtests.mcujsonfiletest;
+package fr.paulbrancieq.modpackconfigupdater.mcujsonfiletest;
 
 import com.google.gson.JsonParseException;
 
-import fr.paulbrancieq.modpackconfigupdater.newtests.mcujsonfiletest.basictestfiles.McuFile;
-import fr.paulbrancieq.modpackconfigupdater.newtests.mcujsonfiletest.basictestfiles.McuFileData;
+import fr.paulbrancieq.modpackconfigupdater.mcujsonfiletest.basictestfiles.McuFile;
+import fr.paulbrancieq.modpackconfigupdater.mcujsonfiletest.basictestfiles.McuFileData;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 public class BasicMcuJsonFileTest {
   @Test
   public void testFieldRetrieve() {
-    McuFile mcuFile = new McuFile("src/test/java/fr/paulbrancieq/modpackconfigupdater/newtests/mcujsonfiletest/basictestfiles/basic.json");
+    McuFile mcuFile = new McuFile("src/test/java/fr/paulbrancieq/modpackconfigupdater/mcujsonfiletest/basictestfiles/basic.json");
     McuFileData mcuData = mcuFile.getData();
     assertEquals("testId", mcuData.getId());
     assertEquals("testName", mcuData.getName());
@@ -20,20 +20,20 @@ public void testFieldRetrieve() {
   @Test
   public void testMissingVersionField() {
     assertThrows(JsonParseException.class, () -> {
-      McuFile mcuFile = new McuFile("src/test/java/fr/paulbrancieq/modpackconfigupdater/newtests/mcujsonfiletest/basictestfiles/missingVersionField.json");
+      McuFile mcuFile = new McuFile("src/test/java/fr/paulbrancieq/modpackconfigupdater/mcujsonfiletest/basictestfiles/missingVersionField.json");
     });
   }
 
   @Test
   public void testMissingRequiredField() {
     assertThrows(JsonParseException.class, () -> {
-      McuFile mcuFile = new McuFile("src/test/java/fr/paulbrancieq/modpackconfigupdater/newtests/mcujsonfiletest/basictestfiles/missingRequiredField.json");
+      McuFile mcuFile = new McuFile("src/test/java/fr/paulbrancieq/modpackconfigupdater/mcujsonfiletest/basictestfiles/missingRequiredField.json");
     });
   }
 
   @Test
   public void testMissingOptionalField() {
-    McuFile mcuFile = new McuFile("src/test/java/fr/paulbrancieq/modpackconfigupdater/newtests/mcujsonfiletest/basictestfiles/missingOptionalField.json");
+    McuFile mcuFile = new McuFile("src/test/java/fr/paulbrancieq/modpackconfigupdater/mcujsonfiletest/basictestfiles/missingOptionalField.json");
     McuFileData mcuData = mcuFile.getData();
     assertEquals("test", mcuData.getId());
     assertNull(mcuData.getName());

diff --git a/...letest/ComplexSubTypeMcuJsonFileTest.java → ...letest/ComplexSubTypeMcuJsonFileTest.java b/...letest/ComplexSubTypeMcuJsonFileTest.java → ...letest/ComplexSubTypeMcuJsonFileTest.java
@@ -1,16 +1,16 @@
-package fr.paulbrancieq.modpackconfigupdater.newtests.mcujsonfiletest;
+package fr.paulbrancieq.modpackconfigupdater.mcujsonfiletest;
 
-import fr.paulbrancieq.modpackconfigupdater.newtests.mcujsonfiletest.complexsubtypetestfiles.ComplexSubType;
-import fr.paulbrancieq.modpackconfigupdater.newtests.mcujsonfiletest.complexsubtypetestfiles.McuFile;
-import fr.paulbrancieq.modpackconfigupdater.newtests.mcujsonfiletest.complexsubtypetestfiles.McuFileData;
+import fr.paulbrancieq.modpackconfigupdater.mcujsonfiletest.complexsubtypetestfiles.McuFile;
+import fr.paulbrancieq.modpackconfigupdater.mcujsonfiletest.complexsubtypetestfiles.McuFileData;
+import fr.paulbrancieq.modpackconfigupdater.mcujsonfiletest.complexsubtypetestfiles.ComplexSubType;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ComplexSubTypeMcuJsonFileTest {
   @Test
   public void testFieldRetrieve() {
-    McuFile mcuFile = new McuFile("src/test/java/fr/paulbrancieq/modpackconfigupdater/newtests/mcujsonfiletest/complexsubtypetestfiles/basic.json");
+    McuFile mcuFile = new McuFile("src/test/java/fr/paulbrancieq/modpackconfigupdater/mcujsonfiletest/complexsubtypetestfiles/basic.json");
     McuFileData mcuData = mcuFile.getData();
     ComplexSubType object = mcuData.object;
     assertEquals("test", object.id);

diff --git a/...ujsonfiletest/SubTypeMcuJsonFileTest.java → ...ujsonfiletest/SubTypeMcuJsonFileTest.java b/...ujsonfiletest/SubTypeMcuJsonFileTest.java → ...ujsonfiletest/SubTypeMcuJsonFileTest.java
@@ -1,9 +1,9 @@
-package fr.paulbrancieq.modpackconfigupdater.newtests.mcujsonfiletest;
+package fr.paulbrancieq.modpackconfigupdater.mcujsonfiletest;
 
 import com.google.gson.JsonParseException;
-import fr.paulbrancieq.modpackconfigupdater.newtests.mcujsonfiletest.subtypetestfiles.McuFile;
-import fr.paulbrancieq.modpackconfigupdater.newtests.mcujsonfiletest.subtypetestfiles.McuFileData;
-import fr.paulbrancieq.modpackconfigupdater.newtests.mcujsonfiletest.subtypetestfiles.SubType;
+import fr.paulbrancieq.modpackconfigupdater.mcujsonfiletest.subtypetestfiles.McuFileData;
+import fr.paulbrancieq.modpackconfigupdater.mcujsonfiletest.subtypetestfiles.McuFile;
+import fr.paulbrancieq.modpackconfigupdater.mcujsonfiletest.subtypetestfiles.SubType;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -12,7 +12,7 @@
 public class SubTypeMcuJsonFileTest {
   @Test
   public void testFieldRetrieve() {
-    McuFile mcuFile = new McuFile("src/test/java/fr/paulbrancieq/modpackconfigupdater/newtests/mcujsonfiletest/subtypetestfiles/basic.json");
+    McuFile mcuFile = new McuFile("src/test/java/fr/paulbrancieq/modpackconfigupdater/mcujsonfiletest/subtypetestfiles/basic.json");
     McuFileData mcuData = mcuFile.getData();
     SubType object = mcuData.object;
     assertEquals("test", object.id);
@@ -25,7 +25,7 @@ public void testFieldRetrieve() {
   @Test
   public void testMissingRequiredField() {
     assertThrows(JsonParseException.class, () -> {
-      McuFile mcuFile = new McuFile("src/test/java/fr/paulbrancieq/modpackconfigupdater/newtests/mcujsonfiletest/subtypetestfiles/missingRequiredField.json");
+      McuFile mcuFile = new McuFile("src/test/java/fr/paulbrancieq/modpackconfigupdater/mcujsonfiletest/subtypetestfiles/missingRequiredField.json");
     });
   }
 }
diff --git a/...ujsonfiletest/basictestfiles/McuFile.java → ...ujsonfiletest/basictestfiles/McuFile.java b/...ujsonfiletest/basictestfiles/McuFile.java → ...ujsonfiletest/basictestfiles/McuFile.java
@@ -1,4 +1,4 @@
-package fr.paulbrancieq.modpackconfigupdater.newtests.mcujsonfiletest.basictestfiles;
+package fr.paulbrancieq.modpackconfigupdater.mcujsonfiletest.basictestfiles;
 
 import fr.paulbrancieq.modpackconfigupdater.remake.mcufile.McuJsonFile;
 

diff --git a/...nfiletest/basictestfiles/McuFileData.java → ...nfiletest/basictestfiles/McuFileData.java b/...nfiletest/basictestfiles/McuFileData.java → ...nfiletest/basictestfiles/McuFileData.java
@@ -1,4 +1,4 @@
-package fr.paulbrancieq.modpackconfigupdater.newtests.mcujsonfiletest.basictestfiles;
+package fr.paulbrancieq.modpackconfigupdater.mcujsonfiletest.basictestfiles;
 
 import com.google.gson.annotations.Expose;
 import fr.paulbrancieq.modpackconfigupdater.remake.mcufile.JsonRequired;

diff --git a/...mcujsonfiletest/basictestfiles/basic.json → ...mcujsonfiletest/basictestfiles/basic.json b/...mcujsonfiletest/basictestfiles/basic.json → ...mcujsonfiletest/basictestfiles/basic.json
diff --git a/.../basictestfiles/missingOptionalField.json → .../basictestfiles/missingOptionalField.json b/.../basictestfiles/missingOptionalField.json → .../basictestfiles/missingOptionalField.json
diff --git a/.../basictestfiles/missingRequiredField.json → .../basictestfiles/missingRequiredField.json b/.../basictestfiles/missingRequiredField.json → .../basictestfiles/missingRequiredField.json
diff --git a/...t/basictestfiles/missingVersionField.json → ...t/basictestfiles/missingVersionField.json b/...t/basictestfiles/missingVersionField.json → ...t/basictestfiles/missingVersionField.json
diff --git a/...mplexsubtypetestfiles/ComplexSubType.java → ...mplexsubtypetestfiles/ComplexSubType.java b/...mplexsubtypetestfiles/ComplexSubType.java → ...mplexsubtypetestfiles/ComplexSubType.java
@@ -1,4 +1,4 @@
-package fr.paulbrancieq.modpackconfigupdater.newtests.mcujsonfiletest.complexsubtypetestfiles;
+package fr.paulbrancieq.modpackconfigupdater.mcujsonfiletest.complexsubtypetestfiles;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.JsonAdapter;

diff --git a/...testfiles/ComplexSubTypeDeserializer.java → ...testfiles/ComplexSubTypeDeserializer.java b/...testfiles/ComplexSubTypeDeserializer.java → ...testfiles/ComplexSubTypeDeserializer.java
@@ -1,4 +1,4 @@
-package fr.paulbrancieq.modpackconfigupdater.newtests.mcujsonfiletest.complexsubtypetestfiles;
+package fr.paulbrancieq.modpackconfigupdater.mcujsonfiletest.complexsubtypetestfiles;
 
 import com.google.gson.*;
 

diff --git a/...sonfiletest/subtypetestfiles/McuFile.java → ...test/complexsubtypetestfiles/McuFile.java b/...sonfiletest/subtypetestfiles/McuFile.java → ...test/complexsubtypetestfiles/McuFile.java
@@ -1,4 +1,4 @@
-package fr.paulbrancieq.modpackconfigupdater.newtests.mcujsonfiletest.subtypetestfiles;
+package fr.paulbrancieq.modpackconfigupdater.mcujsonfiletest.complexsubtypetestfiles;
 
 import fr.paulbrancieq.modpackconfigupdater.remake.mcufile.McuJsonFile;
 

diff --git a/.../complexsubtypetestfiles/McuFileData.java → .../complexsubtypetestfiles/McuFileData.java b/.../complexsubtypetestfiles/McuFileData.java → .../complexsubtypetestfiles/McuFileData.java
@@ -1,4 +1,4 @@
-package fr.paulbrancieq.modpackconfigupdater.newtests.mcujsonfiletest.complexsubtypetestfiles;
+package fr.paulbrancieq.modpackconfigupdater.mcujsonfiletest.complexsubtypetestfiles;
 
 import com.google.gson.annotations.Expose;
 import fr.paulbrancieq.modpackconfigupdater.remake.mcufile.JsonRequired;

diff --git a/...letest/complexsubtypetestfiles/basic.json → ...letest/complexsubtypetestfiles/basic.json b/...letest/complexsubtypetestfiles/basic.json → ...letest/complexsubtypetestfiles/basic.json
diff --git a/...test/complexsubtypetestfiles/McuFile.java → ...sonfiletest/subtypetestfiles/McuFile.java b/...test/complexsubtypetestfiles/McuFile.java → ...sonfiletest/subtypetestfiles/McuFile.java
@@ -1,4 +1,4 @@
-package fr.paulbrancieq.modpackconfigupdater.newtests.mcujsonfiletest.complexsubtypetestfiles;
+package fr.paulbrancieq.modpackconfigupdater.mcujsonfiletest.subtypetestfiles;
 
 import fr.paulbrancieq.modpackconfigupdater.remake.mcufile.McuJsonFile;
 

diff --git a/...iletest/subtypetestfiles/McuFileData.java → ...iletest/subtypetestfiles/McuFileData.java b/...iletest/subtypetestfiles/McuFileData.java → ...iletest/subtypetestfiles/McuFileData.java
@@ -1,4 +1,4 @@
-package fr.paulbrancieq.modpackconfigupdater.newtests.mcujsonfiletest.subtypetestfiles;
+package fr.paulbrancieq.modpackconfigupdater.mcujsonfiletest.subtypetestfiles;
 
 import com.google.gson.annotations.Expose;
 import fr.paulbrancieq.modpackconfigupdater.remake.mcufile.JsonRequired;

diff --git a/...sonfiletest/subtypetestfiles/SubType.java → ...sonfiletest/subtypetestfiles/SubType.java b/...sonfiletest/subtypetestfiles/SubType.java → ...sonfiletest/subtypetestfiles/SubType.java
@@ -1,4 +1,4 @@
-package fr.paulbrancieq.modpackconfigupdater.newtests.mcujsonfiletest.subtypetestfiles;
+package fr.paulbrancieq.modpackconfigupdater.mcujsonfiletest.subtypetestfiles;
 
 import com.google.gson.annotations.Expose;
 import fr.paulbrancieq.modpackconfigupdater.remake.mcufile.JsonRequired;

diff --git a/...ujsonfiletest/subtypetestfiles/basic.json → ...ujsonfiletest/subtypetestfiles/basic.json b/...ujsonfiletest/subtypetestfiles/basic.json → ...ujsonfiletest/subtypetestfiles/basic.json
diff --git a/...ubtypetestfiles/missingRequiredField.json → ...ubtypetestfiles/missingRequiredField.json b/...ubtypetestfiles/missingRequiredField.json → ...ubtypetestfiles/missingRequiredField.json
diff --git a/...va/fr/paulbrancieq/modpackconfigupdater/newtests/optionpathtest/FilterOptionPathTest.java b/...va/fr/paulbrancieq/modpackconfigupdater/newtests/optionpathtest/FilterOptionPathTest.java
diff --git a/src/test/java/fr/paulbrancieq/modpackconfigupdater/oldtest/OptionContextTest.java b/src/test/java/fr/paulbrancieq/modpackconfigupdater/oldtest/OptionContextTest.java