Browse Source

Fix tests

Lortseam 4 years ago
parent
commit
91d8af5684
15 changed files with 35 additions and 15 deletions
  1. 1 2
      lib/src/test/java/me/lortseam/completeconfig/data/BaseCollectionTest.java
  2. 1 1
      lib/src/test/java/me/lortseam/completeconfig/test/data/containers/ContainerIncludingContainerWithEntry.java
  3. 1 1
      lib/src/test/java/me/lortseam/completeconfig/test/data/containers/ContainerIncludingGroupWithEntry.java
  4. 1 1
      lib/src/test/java/me/lortseam/completeconfig/test/data/containers/ContainerNestingContainerWithEntry.java
  5. 1 1
      lib/src/test/java/me/lortseam/completeconfig/test/data/containers/ContainerNestingStaticContainerWithEntry.java
  6. 1 1
      lib/src/test/java/me/lortseam/completeconfig/test/data/containers/ContainerWithContainerWithEntry.java
  7. 1 1
      lib/src/test/java/me/lortseam/completeconfig/test/data/containers/ContainerWithEntry.java
  8. 1 1
      lib/src/test/java/me/lortseam/completeconfig/test/data/containers/ContainerWithField.java
  9. 2 2
      lib/src/test/java/me/lortseam/completeconfig/test/data/containers/ContainerWithGroupWithEntry.java
  10. 16 0
      lib/src/test/java/me/lortseam/completeconfig/test/data/containers/ContainerWithStaticContainerWithEntry.java
  11. 1 1
      lib/src/test/java/me/lortseam/completeconfig/test/data/containers/ContainerWithStaticEntry.java
  12. 1 1
      lib/src/test/java/me/lortseam/completeconfig/test/data/containers/EntriesContainerWithEntry.java
  13. 1 1
      lib/src/test/java/me/lortseam/completeconfig/test/data/containers/EntriesContainerWithIgnoredField.java
  14. 1 1
      lib/src/test/java/me/lortseam/completeconfig/test/data/containers/EntriesContainerWithTransientField.java
  15. 5 0
      lib/src/test/java/me/lortseam/completeconfig/test/data/containers/SubclassOfContainerWithStaticContainerWithEntry.java

+ 1 - 2
lib/src/test/java/me/lortseam/completeconfig/data/BaseCollectionTest.java

@@ -77,8 +77,7 @@ public class BaseCollectionTest {
 
     @Test
     public void resolve_excludeSuperclassFieldIfStatic() {
-        baseCollection.resolve(new SubclassOfContainerWithStaticEntry());
-        // TODO: Add container test
+        baseCollection.resolve(new SubclassOfContainerWithStaticEntry(), new SubclassOfContainerWithStaticContainerWithEntry());
         assertTrue(baseCollection.isEmpty());
     }
 

+ 1 - 1
lib/src/test/java/me/lortseam/completeconfig/test/data/containers/ContainerIncludingContainerWithEntry.java

@@ -10,7 +10,7 @@ public class ContainerIncludingContainerWithEntry implements ConfigContainer {
         return new ConfigContainer[]{new ConfigContainer() {
 
             @ConfigEntry
-            private boolean entry;
+            private boolean containerIncludingContainerWithEntryEntry;
 
         }};
     }

+ 1 - 1
lib/src/test/java/me/lortseam/completeconfig/test/data/containers/ContainerIncludingGroupWithEntry.java

@@ -11,7 +11,7 @@ public class ContainerIncludingGroupWithEntry implements ConfigContainer {
         return new ConfigContainer[]{new ConfigGroup() {
 
             @ConfigEntry
-            private boolean entry;
+            private boolean containerIncludingGroupWithEntryEntry;
 
         }};
     }

+ 1 - 1
lib/src/test/java/me/lortseam/completeconfig/test/data/containers/ContainerNestingContainerWithEntry.java

@@ -9,7 +9,7 @@ public class ContainerNestingContainerWithEntry implements ConfigContainer {
     public class ContainerWithEntry implements ConfigContainer {
 
         @ConfigEntry
-        private boolean entry;
+        private boolean containerNestingContainerWithEntry;
 
     }
 

+ 1 - 1
lib/src/test/java/me/lortseam/completeconfig/test/data/containers/ContainerNestingStaticContainerWithEntry.java

@@ -9,7 +9,7 @@ public class ContainerNestingStaticContainerWithEntry implements ConfigContainer
     public static class ContainerWithEntry implements ConfigContainer {
 
         @ConfigEntry
-        private boolean entry;
+        private boolean containerNestingStaticContainerWithEntryEntry;
 
     }
 

+ 1 - 1
lib/src/test/java/me/lortseam/completeconfig/test/data/containers/ContainerWithContainerWithEntry.java

@@ -9,7 +9,7 @@ public class ContainerWithContainerWithEntry implements ConfigContainer {
     private final ConfigContainer container = new ConfigContainer() {
 
         @ConfigEntry
-        private boolean entry;
+        private boolean containerWithContainerWithEntryEntry;
 
     };
 

+ 1 - 1
lib/src/test/java/me/lortseam/completeconfig/test/data/containers/ContainerWithEntry.java

@@ -6,6 +6,6 @@ import me.lortseam.completeconfig.api.ConfigContainer;
 public class ContainerWithEntry implements ConfigContainer {
 
     @ConfigEntry
-    private boolean entry;
+    private boolean containerWithEntryEntry;
 
 }

+ 1 - 1
lib/src/test/java/me/lortseam/completeconfig/test/data/containers/ContainerWithField.java

@@ -4,6 +4,6 @@ import me.lortseam.completeconfig.api.ConfigContainer;
 
 public class ContainerWithField implements ConfigContainer {
 
-    private boolean noEntry;
+    private boolean containerWithFieldField;
 
 }

+ 2 - 2
lib/src/test/java/me/lortseam/completeconfig/test/data/containers/ContainerWithGroupWithEntry.java

@@ -7,10 +7,10 @@ import me.lortseam.completeconfig.api.ConfigGroup;
 public class ContainerWithGroupWithEntry implements ConfigContainer {
 
     @Transitive
-    private final ConfigGroup group = new ConfigGroup() {
+    private final ConfigGroup containerWithGroupWithEntryGroup = new ConfigGroup() {
 
         @ConfigEntry
-        private boolean entry;
+        private boolean containerWithGroupWithEntryEntry;
 
     };
 

+ 16 - 0
lib/src/test/java/me/lortseam/completeconfig/test/data/containers/ContainerWithStaticContainerWithEntry.java

@@ -0,0 +1,16 @@
+package me.lortseam.completeconfig.test.data.containers;
+
+import me.lortseam.completeconfig.api.ConfigContainer;
+import me.lortseam.completeconfig.api.ConfigEntry;
+
+public class ContainerWithStaticContainerWithEntry implements ConfigContainer {
+
+    @Transitive
+    private static final ConfigContainer container = new ConfigContainer() {
+
+        @ConfigEntry
+        private boolean containerWithStaticContainerWithEntryEntry;
+
+    };
+
+}

+ 1 - 1
lib/src/test/java/me/lortseam/completeconfig/test/data/containers/ContainerWithStaticEntry.java

@@ -6,6 +6,6 @@ import me.lortseam.completeconfig.api.ConfigContainer;
 public class ContainerWithStaticEntry implements ConfigContainer {
 
     @ConfigEntry
-    private static boolean entry;
+    private static boolean containerWithStaticEntryEntry;
 
 }

+ 1 - 1
lib/src/test/java/me/lortseam/completeconfig/test/data/containers/EntriesContainerWithEntry.java

@@ -6,6 +6,6 @@ import me.lortseam.completeconfig.api.ConfigEntries;
 @ConfigEntries
 public class EntriesContainerWithEntry implements ConfigContainer {
 
-    private boolean entry;
+    private boolean entriesContainerWithEntryEntry;
 
 }

+ 1 - 1
lib/src/test/java/me/lortseam/completeconfig/test/data/containers/EntriesContainerWithIgnoredField.java

@@ -7,6 +7,6 @@ import me.lortseam.completeconfig.api.ConfigEntries;
 public class EntriesContainerWithIgnoredField implements ConfigContainer {
 
     @ConfigEntries.Exclude
-    private boolean noEntry;
+    private boolean entriesContainerWithIgnoredFieldField;
 
 }

+ 1 - 1
lib/src/test/java/me/lortseam/completeconfig/test/data/containers/EntriesContainerWithTransientField.java

@@ -6,6 +6,6 @@ import me.lortseam.completeconfig.api.ConfigEntries;
 @ConfigEntries
 public class EntriesContainerWithTransientField implements ConfigContainer {
 
-    private transient boolean noEntry;
+    private transient boolean entriesContainerWithTransientFieldField;
 
 }

+ 5 - 0
lib/src/test/java/me/lortseam/completeconfig/test/data/containers/SubclassOfContainerWithStaticContainerWithEntry.java

@@ -0,0 +1,5 @@
+package me.lortseam.completeconfig.test.data.containers;
+
+public class SubclassOfContainerWithStaticContainerWithEntry extends ContainerWithStaticContainerWithEntry {
+
+}