From ac4d8efe3e5729377f04a7be9a2fc7dcf3e1cc0a Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Tue, 7 Jun 2022 13:59:03 +0200
Subject: [PATCH] Fix tests

---
 .../jfronny/respackopts/ConditionJsonSerializationTest.java  | 5 ++---
 .../java/io/gitlab/jfronny/respackopts/TemplateTree.java     | 5 +++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/test/java/io/gitlab/jfronny/respackopts/ConditionJsonSerializationTest.java b/src/test/java/io/gitlab/jfronny/respackopts/ConditionJsonSerializationTest.java
index 64f3baa..db997ed 100644
--- a/src/test/java/io/gitlab/jfronny/respackopts/ConditionJsonSerializationTest.java
+++ b/src/test/java/io/gitlab/jfronny/respackopts/ConditionJsonSerializationTest.java
@@ -2,8 +2,7 @@ package io.gitlab.jfronny.respackopts;
 
 import io.gitlab.jfronny.gson.reflect.*;
 import io.gitlab.jfronny.muscript.*;
-import io.gitlab.jfronny.muscript.compiler.*;
-import io.gitlab.jfronny.muscript.optic.*;
+import io.gitlab.jfronny.muscript.compiler.expr.*;
 import io.gitlab.jfronny.respackopts.gson.*;
 import io.gitlab.jfronny.respackopts.model.*;
 import io.gitlab.jfronny.respackopts.util.*;
@@ -104,7 +103,7 @@ class ConditionJsonSerializationTest {
     }
 
     private boolean evaluateCondition(String json) {
-        Expr.BoolExpr condition = AttachmentHolder.attach(7, () -> GSON.fromJson(json, Expr.BoolExpr.class));
+        BoolExpr condition = AttachmentHolder.attach(7, () -> GSON.fromJson(json, BoolExpr.class));
         return condition.get(MetaCache.hydrateParameter(new ExpressionParameter()));
     }
 }
diff --git a/src/test/java/io/gitlab/jfronny/respackopts/TemplateTree.java b/src/test/java/io/gitlab/jfronny/respackopts/TemplateTree.java
index 476b211..974005d 100644
--- a/src/test/java/io/gitlab/jfronny/respackopts/TemplateTree.java
+++ b/src/test/java/io/gitlab/jfronny/respackopts/TemplateTree.java
@@ -1,6 +1,7 @@
 package io.gitlab.jfronny.respackopts;
 
 import io.gitlab.jfronny.gson.*;
+import io.gitlab.jfronny.muscript.compiler.expr.*;
 import io.gitlab.jfronny.respackopts.gson.*;
 import io.gitlab.jfronny.respackopts.gson.entry.*;
 import io.gitlab.jfronny.respackopts.model.tree.*;
@@ -12,8 +13,8 @@ public class TemplateTree {
             .registerTypeAdapter(ConfigBooleanEntry.class, new BooleanEntrySerializer())
             .registerTypeAdapter(ConfigBranch.class, new ConfigBranchSerializer())
             .registerTypeAdapter(Expr.class, new ExprDeserializer())
-            .registerTypeAdapter(Expr.StringExpr.class, new StringExprDeserializer())
-            .registerTypeAdapter(Expr.BoolExpr.class, new BoolExprDeserializer())
+            .registerTypeAdapter(StringExpr.class, new StringExprDeserializer())
+            .registerTypeAdapter(BoolExpr.class, new BoolExprDeserializer())
             .setLenient()
             .setPrettyPrinting()
             .create();