refactor

assira/src/test/java/net/ranides/assira/collection/mockup/TPointUtils.java

@@ -14,10 +14,9 @@ import java.util.Random;
 import java.util.TreeMap;
 import net.ranides.assira.collection.HashComparator;
 import net.ranides.assira.collection.lookups.Lookup;
-import static net.ranides.assira.collection.mockup.TValueEnum.B1;
+import static net.ranides.assira.collection.mockup.ValueEnum.*;
 import net.ranides.assira.generic.CompareUtils;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 /**
  *
@@ -29,7 +28,7 @@ public final class TPointUtils {
         // utility class
     }
     
-    public static final ObjectGenerator<TPoint, TValueEnum> KEYS = new ObjectGenerator<TPoint, TValueEnum>(TPoint.class) {
+    public static final ValueGenerator<TPoint, ValueEnum> KEYS = new ValueGenerator<TPoint, ValueEnum>(TPoint.class) {
         
         @Override
         public HashComparator<TPoint> comparator() {
@@ -37,7 +36,7 @@ public final class TPointUtils {
         }
         
         @Override
-        public TPoint object(TValueEnum key) {
+        public TPoint object(ValueEnum key) {
             return $key(key);
         }
         
@@ -47,7 +46,7 @@ public final class TPointUtils {
         }
     };
     
-    public static final ObjectGenerator<Entry<TPoint, Integer>, TValueEnum> ENTRIES = new ObjectGenerator<Entry<TPoint, Integer>, TValueEnum>(Entry.class) {
+    public static final ValueGenerator<Entry<TPoint, Integer>, ValueEnum> ENTRIES = new ValueGenerator<Entry<TPoint, Integer>, ValueEnum>(Entry.class) {
 
         @Override
         public HashComparator<Entry<TPoint, Integer>> comparator() {
@@ -55,7 +54,7 @@ public final class TPointUtils {
         }
 
         @Override
-        public Entry<TPoint, Integer> object(TValueEnum key) {
+        public Entry<TPoint, Integer> object(ValueEnum key) {
             return $entry(key);
         }
 
@@ -84,47 +83,47 @@ public final class TPointUtils {
     //      punkty suma < 100
     //      wartości mniejsze < 100
 
-    private static final EnumMap<TValueEnum, TPoint> M_KEYS = new EnumMap<>(TValueEnum.class);
+    private static final EnumMap<ValueEnum, TPoint> M_KEYS = new EnumMap<>(ValueEnum.class);
     
     static {
-        M_KEYS.put(TValueEnum.A1,    new TPoint(7, 4, 6));                // 17
-        M_KEYS.put(TValueEnum.A1_EQ, new TPoint(7, 1, 9));                // 17
-        M_KEYS.put(TValueEnum.A1_NE, new TPoint(7, 1, 2));                // 9
-        M_KEYS.put(TValueEnum.B1,    new TPoint(8, 4, 12));               // 24
-        M_KEYS.put(TValueEnum.C1,    new TPoint(9, 4, 13));               // 26
-        M_KEYS.put(TValueEnum.D1,    new TPoint(20, 40, 3));              // 63
-        M_KEYS.put(TValueEnum.D2,    new TPoint(20, 40, 4));              // 64
-        M_KEYS.put(TValueEnum.D3,    new TPoint(20, 40, 5));              // 65
-        M_KEYS.put(TValueEnum.D4,    new TPoint(20, 40, 6));              // 66
-        M_KEYS.put(TValueEnum.E1,    new TPoint(33, 42, 6));              // 81
-        M_KEYS.put(TValueEnum.E1_EQ, new TPoint(33, 42, 6+0x10000));      // 81
-        M_KEYS.put(TValueEnum.E1_NE, new TPoint(33, 42, 17));             // 92
+        M_KEYS.put(ValueEnum.A1,    new TPoint(7, 4, 6));                // 17
+        M_KEYS.put(ValueEnum.A1_EQ, new TPoint(7, 1, 9));                // 17
+        M_KEYS.put(ValueEnum.A1_NE, new TPoint(7, 1, 2));                // 9
+        M_KEYS.put(ValueEnum.B1,    new TPoint(8, 4, 12));               // 24
+        M_KEYS.put(ValueEnum.C1,    new TPoint(9, 4, 13));               // 26
+        M_KEYS.put(ValueEnum.D1,    new TPoint(20, 40, 3));              // 63
+        M_KEYS.put(ValueEnum.D2,    new TPoint(20, 40, 4));              // 64
+        M_KEYS.put(ValueEnum.D3,    new TPoint(20, 40, 5));              // 65
+        M_KEYS.put(ValueEnum.D4,    new TPoint(20, 40, 6));              // 66
+        M_KEYS.put(ValueEnum.E1,    new TPoint(33, 42, 6));              // 81
+        M_KEYS.put(ValueEnum.E1_EQ, new TPoint(33, 42, 6+0x10000));      // 81
+        M_KEYS.put(ValueEnum.E1_NE, new TPoint(33, 42, 17));             // 92
         
-        M_KEYS.put(TValueEnum.SUB_MIN, new TPoint(3, 2, 1));              // 6
-        M_KEYS.put(TValueEnum.SUB_MAX, new TPoint(44, 43, 12));           // 99
+        M_KEYS.put(ValueEnum.SUB_MIN, new TPoint(3, 2, 1));              // 6
+        M_KEYS.put(ValueEnum.SUB_MAX, new TPoint(44, 43, 12));           // 99
     }
     
-    private static final EnumMap<TValueEnum, Integer> M_VALS = new EnumMap<>(TValueEnum.class);
+    private static final EnumMap<ValueEnum, Integer> M_VALS = new EnumMap<>(ValueEnum.class);
     
     static {
-        M_VALS.put(TValueEnum.A1,    17);
-        M_VALS.put(TValueEnum.A1_EQ, 19);
-        M_VALS.put(TValueEnum.A1_NE, 20);
-        M_VALS.put(TValueEnum.B1,    21);
-        M_VALS.put(TValueEnum.C1,    22);
-        M_VALS.put(TValueEnum.D1,    31);
-        M_VALS.put(TValueEnum.D2,    32);
-        M_VALS.put(TValueEnum.D3,    33);
-        M_VALS.put(TValueEnum.D4,    34);
-        M_VALS.put(TValueEnum.E1,    81);
-        M_VALS.put(TValueEnum.E1_EQ, 81);
-        M_VALS.put(TValueEnum.E1_NE, 81);
-        M_VALS.put(TValueEnum.SUB_MIN, 91);
-        M_VALS.put(TValueEnum.SUB_MAX, 92);
+        M_VALS.put(ValueEnum.A1,    17);
+        M_VALS.put(ValueEnum.A1_EQ, 19);
+        M_VALS.put(ValueEnum.A1_NE, 20);
+        M_VALS.put(ValueEnum.B1,    21);
+        M_VALS.put(ValueEnum.C1,    22);
+        M_VALS.put(ValueEnum.D1,    31);
+        M_VALS.put(ValueEnum.D2,    32);
+        M_VALS.put(ValueEnum.D3,    33);
+        M_VALS.put(ValueEnum.D4,    34);
+        M_VALS.put(ValueEnum.E1,    81);
+        M_VALS.put(ValueEnum.E1_EQ, 81);
+        M_VALS.put(ValueEnum.E1_NE, 81);
+        M_VALS.put(ValueEnum.SUB_MIN, 91);
+        M_VALS.put(ValueEnum.SUB_MAX, 92);
     }
     
-    public static void $put(Map<TPoint, Integer> target, TValueEnum... items) {
-        for(TValueEnum item : items) {
+    public static void $put(Map<TPoint, Integer> target, ValueEnum... items) {
+        for(ValueEnum item : items) {
             target.put($key(item), $value(item));
         }
     }
@@ -135,7 +134,7 @@ public final class TPointUtils {
         }
     }
     
-    public static Entry<TPoint, Integer> $find(Map<TPoint, Integer> target, TValueEnum key) {
+    public static Entry<TPoint, Integer> $find(Map<TPoint, Integer> target, ValueEnum key) {
         for(Entry<TPoint, Integer> entry : target.entrySet()) {
             if($equals(entry.getKey(), key)) {
                 return entry;
@@ -184,11 +183,11 @@ public final class TPointUtils {
 		}
 	}
 
-    public static TPoint $key(TValueEnum type) {
+    public static TPoint $key(ValueEnum type) {
         return M_KEYS.get(type);
     }
     
-    public static TPoint[] $keys(TValueEnum... values) {
+    public static TPoint[] $keys(ValueEnum... values) {
         TPoint[] array = new TPoint[values.length];
         for(int i=0; i<values.length; i++) {
             array[i] = $key(values[i]);
@@ -234,7 +233,7 @@ public final class TPointUtils {
         return array;
     }
 
-    public static int $value(TValueEnum type) {
+    public static int $value(ValueEnum type) {
         return M_VALS.get(type);
     }
 
@@ -247,7 +246,7 @@ public final class TPointUtils {
         return array;
     }
     
-    public static int[] $values(TValueEnum... values) {
+    public static int[] $values(ValueEnum... values) {
         int[] array = new int[values.length];
         for(int i=0; i<values.length; i++) {
             array[i] = $value(values[i]);
@@ -255,7 +254,7 @@ public final class TPointUtils {
         return array;
     }
 
-    public static Integer $object(TValueEnum type) {
+    public static Integer $object(ValueEnum type) {
         return M_VALS.get(type);
     }
 
@@ -268,7 +267,7 @@ public final class TPointUtils {
         return array;
     }
     
-    public static Integer[] $objects(TValueEnum... values) {
+    public static Integer[] $objects(ValueEnum... values) {
         Integer[] array = new Integer[values.length];
         for(int i=0; i<values.length; i++) {
             array[i] = $object(values[i]);
@@ -305,7 +304,7 @@ public final class TPointUtils {
         return TPoint.SUM.equals(point1, point2);
     }
     
-    public static boolean $equals(TPoint point1, TValueEnum point2) {
+    public static boolean $equals(TPoint point1, ValueEnum point2) {
         return TPoint.SUM.equals(point1, $key(point2));
     }
 
@@ -313,7 +312,7 @@ public final class TPointUtils {
         return TPoint.SUM.hashCode(point);
     }
     
-    public static int $hashcode(TValueEnum point) {
+    public static int $hashcode(ValueEnum point) {
         return TPoint.SUM.hashCode($key(point));
     }
     
@@ -321,12 +320,12 @@ public final class TPointUtils {
         return new AbstractMap.SimpleEntry<>(key, value);
     }
     
-    public static Entry<TPoint, Integer> $entry(TValueEnum point){
+    public static Entry<TPoint, Integer> $entry(ValueEnum point){
         return new Lookup.BasicEntry<>($key(point), $value(point));
     }
     
     @SuppressWarnings("unchecked")
-    public static Entry<TPoint, Integer>[] $entries(TValueEnum... values) {
+    public static Entry<TPoint, Integer>[] $entries(ValueEnum... values) {
         Entry<TPoint, Integer>[] array = new Entry[values.length];
         for(int i=0; i<values.length; i++) {
             array[i] = $entry(values[i]);

assira/src/test/java/net/ranides/assira/collection/mockup/TValueEnum.java

@@ -10,7 +10,7 @@ package net.ranides.assira.collection.mockup;
  *
  * @author Ranides Atterwim <ranides@gmail.com>
  */
-public enum TValueEnum {
+public enum ValueEnum {
     A1,
     A1_EQ,
     A1_NE,

assira/src/test/java/net/ranides/assira/collection/mockup/ObjectGenerator.java

@@ -15,12 +15,12 @@ import net.ranides.assira.generic.CompareUtils;
  *
  * @author Ranides Atterwim <ranides@gmail.com>
  */
-public abstract class ObjectGenerator<Q, E extends Enum<E>> {
+public abstract class ValueGenerator<Q, E extends Enum<E>> {
     
     private final Class<Q> clazz;
 
     @SuppressWarnings("unchecked")
-    public ObjectGenerator(Class clazz) {
+    public ValueGenerator(Class clazz) {
         this.clazz = clazz;
     }
     

assira/src/test/java/net/ranides/assira/collection/suite/LookupTester.java

@@ -13,8 +13,8 @@ import net.ranides.assira.collection.IntCollection;
 import net.ranides.assira.collection.iterators.IntIterator;
 import net.ranides.assira.collection.lookups.Lookup;
 import net.ranides.assira.collection.mockup.TPoint;
-import net.ranides.assira.collection.mockup.TValueEnum;
-import static net.ranides.assira.collection.mockup.TValueEnum.*;
+import net.ranides.assira.collection.mockup.ValueEnum;
+import static net.ranides.assira.collection.mockup.ValueEnum.*;
 import static net.ranides.assira.collection.mockup.TPointUtils.*;
 import net.ranides.assira.junit.QAssert;
 import net.ranides.assira.junit.QTester;
@@ -294,24 +294,24 @@ public final class LookupTester {
         assertEquals(0, target.size());
 	}
         
-    private static void assertRemove(Lookup<TPoint> target, TValueEnum key, TValueEnum prev) {
+    private static void assertRemove(Lookup<TPoint> target, ValueEnum key, ValueEnum prev) {
         int size = target.size();
         assertEquals($value(prev), target.removeInt($key(key)));
         assertEquals(size-1, target.size());
     }
     
-    private static void assertNotRemove(Lookup<TPoint> target, TValueEnum key) {
+    private static void assertNotRemove(Lookup<TPoint> target, ValueEnum key) {
         int size = target.size();
         assertEquals(target.defaultReturnValue(), target.removeInt($key(key)));
         assertEquals(size, target.size());
     }
     
-    private static void assertContains(Lookup<TPoint> target, TValueEnum key, TValueEnum value) {
+    private static void assertContains(Lookup<TPoint> target, ValueEnum key, ValueEnum value) {
         assertEquals(true, target.containsKey($key(key)));
         assertEquals($value(value), target.getInt($key(key)));
     }
     
-    private static void assertNotContains(Lookup<TPoint> target, TValueEnum key) {
+    private static void assertNotContains(Lookup<TPoint> target, ValueEnum key) {
         assertEquals(false, target.containsKey($key(key)));
         assertEquals(target.defaultReturnValue(), target.getInt($key(key)));
     }

assira/src/test/java/net/ranides/assira/collection/suite/MapTester.java

@@ -14,8 +14,8 @@ import java.util.NoSuchElementException;
 import java.util.Set;
 import java.util.function.Supplier;
 import net.ranides.assira.collection.mockup.TPoint;
-import net.ranides.assira.collection.mockup.TValueEnum;
-import static net.ranides.assira.collection.mockup.TValueEnum.*;
+import net.ranides.assira.collection.mockup.ValueEnum;
+import static net.ranides.assira.collection.mockup.ValueEnum.*;
 import static net.ranides.assira.collection.mockup.TPointUtils.*;
 import net.ranides.assira.junit.QAssert;
 import net.ranides.assira.junit.QTester;
@@ -500,24 +500,24 @@ public final class MapTester {
         assertEquals(0, target.size());
 	}
     
-    private static void assertRemove(Map<TPoint, Integer> target, TValueEnum key, TValueEnum prev) {
+    private static void assertRemove(Map<TPoint, Integer> target, ValueEnum key, ValueEnum prev) {
         int size = target.size();
         assertEquals($object(prev), target.remove($key(key)));
         assertEquals(size-1, target.size());
     }
     
-    private static void assertNotRemove(Map<TPoint, Integer> target, TValueEnum key) {
+    private static void assertNotRemove(Map<TPoint, Integer> target, ValueEnum key) {
         int size = target.size();
         assertEquals(null, target.remove($key(key)));
         assertEquals(size, target.size());
     }
     
-    private static void assertContains(Map<TPoint, Integer> target, TValueEnum key, TValueEnum value) {
+    private static void assertContains(Map<TPoint, Integer> target, ValueEnum key, ValueEnum value) {
         assertEquals(true, target.containsKey($key(key)));
         assertEquals($object(value), target.get($key(key)));
     }
     
-    private static void assertNotContains(Map<TPoint, Integer> target, TValueEnum key) {
+    private static void assertNotContains(Map<TPoint, Integer> target, ValueEnum key) {
         assertEquals(false, target.containsKey($key(key)));
         assertEquals(null, target.get($key(key)));
     }

assira/src/test/java/net/ranides/assira/collection/suite/SetTester.java

@@ -9,9 +9,9 @@ package net.ranides.assira.collection.suite;
 import java.util.NoSuchElementException;
 import java.util.SortedSet;
 import net.ranides.assira.collection.arrays.ArrayUtils;
-import net.ranides.assira.collection.mockup.ObjectGenerator;
-import net.ranides.assira.collection.mockup.TValueEnum;
-import static net.ranides.assira.collection.mockup.TValueEnum.*;
+import net.ranides.assira.collection.mockup.ValueGenerator;
+import net.ranides.assira.collection.mockup.ValueEnum;
+import static net.ranides.assira.collection.mockup.ValueEnum.*;
 import net.ranides.assira.junit.QAssert;
 import static org.junit.Assert.*;
 import org.junit.Ignore;
@@ -23,11 +23,11 @@ import org.junit.Ignore;
 public class SetTester {
     
     @Ignore
-    public static <V> void checkHead(ObjectGenerator<V, TValueEnum> generator, SortedSet<V> target, V[] content) {
+    public static <V> void checkHead(ValueGenerator<V, ValueEnum> generator, SortedSet<V> target, V[] content) {
         checkHead(true, generator, target, content);
     }
     
-    private static <V> void checkHead(boolean nested, ObjectGenerator<V, TValueEnum> generator, SortedSet<V> target, V[] content) {
+    private static <V> void checkHead(boolean nested, ValueGenerator<V, ValueEnum> generator, SortedSet<V> target, V[] content) {
         int n = content.length;
         assertEquals(0, target.headSet(generator.object(SUB_MIN)).size());
         assertEquals(n, target.headSet(generator.object(SUB_MAX)).size());
@@ -49,11 +49,11 @@ public class SetTester {
     }
     
     @Ignore
-    public static <V> void checkTail(ObjectGenerator<V, TValueEnum> generator, SortedSet<V> target, V[] content) {
+    public static <V> void checkTail(ValueGenerator<V, ValueEnum> generator, SortedSet<V> target, V[] content) {
         checkTail(true, generator, target, content);
     }
     
-    private static <V> void checkTail(boolean nested, ObjectGenerator<V, TValueEnum> generator, SortedSet<V> target, V[] content) {
+    private static <V> void checkTail(boolean nested, ValueGenerator<V, ValueEnum> generator, SortedSet<V> target, V[] content) {
         int n = content.length;
         assertEquals(n, target.tailSet(generator.object(SUB_MIN)).size());
         assertEquals(0, target.tailSet(generator.object(SUB_MAX)).size());
@@ -73,11 +73,11 @@ public class SetTester {
     }
     
     @Ignore
-    public static <V> void checkSub(ObjectGenerator<V, TValueEnum> generator, SortedSet<V> target, V[] content) {
+    public static <V> void checkSub(ValueGenerator<V, ValueEnum> generator, SortedSet<V> target, V[] content) {
         checkSub(true, generator, target, content);
     }
     
-    private static <V> void checkSub(boolean nested, ObjectGenerator<V, TValueEnum> generator, SortedSet<V> target, V[] content) {
+    private static <V> void checkSub(boolean nested, ValueGenerator<V, ValueEnum> generator, SortedSet<V> target, V[] content) {
         checkSub(nested, generator, target, A1, SUB_MAX, content);
         checkSub(nested, generator, target, C1, SUB_MAX, content);
             
@@ -94,7 +94,7 @@ public class SetTester {
         checkSub(nested, generator, target, SUB_MIN, SUB_MAX, content);
     }
     
-    private static <V> void checkSub(boolean nested, ObjectGenerator<V, TValueEnum> generator, SortedSet<V> target, TValueEnum ibegin, TValueEnum iend, V[] content) {
+    private static <V> void checkSub(boolean nested, ValueGenerator<V, ValueEnum> generator, SortedSet<V> target, ValueEnum ibegin, ValueEnum iend, V[] content) {
         V begin = generator.object(ibegin);
         V end = generator.object(iend);
         V[] exp = ArrayUtils.slice(content, begin, end, generator.comparator());

assira/src/test/java/net/ranides/assira/collection/suite/SortedLookupTester.java

@@ -11,7 +11,7 @@ import java.util.SortedSet;
 import net.ranides.assira.collection.lookups.Lookup.LookupEntry;
 import net.ranides.assira.collection.lookups.SortedLookup;
 import net.ranides.assira.collection.mockup.TPoint;
-import static net.ranides.assira.collection.mockup.TValueEnum.*;
+import static net.ranides.assira.collection.mockup.ValueEnum.*;
 import static net.ranides.assira.collection.mockup.TPointUtils.*;
 import net.ranides.assira.junit.QAssert;
 import net.ranides.assira.junit.QTester;
@@ -43,24 +43,24 @@ public final class SortedLookupTester {
     }
     
 //        
-//    private static void assertRemove(Lookup<TPoint> target, TValueEnum key, TValueEnum prev) {
+//    private static void assertRemove(Lookup<TPoint> target, ValueEnum key, ValueEnum prev) {
 //        int size = target.size();
 //        assertEquals($value(prev), target.removeInt($key(key)));
 //        assertEquals(size-1, target.size());
 //    }
 //    
-//    private static void assertNotRemove(Lookup<TPoint> target, TValueEnum key) {
+//    private static void assertNotRemove(Lookup<TPoint> target, ValueEnum key) {
 //        int size = target.size();
 //        assertEquals(target.defaultReturnValue(), target.removeInt($key(key)));
 //        assertEquals(size, target.size());
 //    }
 //    
-//    private static void assertContains(Lookup<TPoint> target, TValueEnum key, TValueEnum value) {
+//    private static void assertContains(Lookup<TPoint> target, ValueEnum key, ValueEnum value) {
 //        assertEquals(true, target.containsKey($key(key)));
 //        assertEquals($value(value), target.getInt($key(key)));
 //    }
 //    
-//    private static void assertNotContains(Lookup<TPoint> target, TValueEnum key) {
+//    private static void assertNotContains(Lookup<TPoint> target, ValueEnum key) {
 //        assertEquals(false, target.containsKey($key(key)));
 //        assertEquals(target.defaultReturnValue(), target.getInt($key(key)));
 //    }

assira/src/test/java/net/ranides/assira/collection/suite/SortedMapTester.java

@@ -14,7 +14,7 @@ import java.util.SortedMap;
 import java.util.SortedSet;
 import net.ranides.assira.collection.arrays.ArrayUtils;
 import net.ranides.assira.collection.mockup.TPoint;
-import static net.ranides.assira.collection.mockup.TValueEnum.*;
+import static net.ranides.assira.collection.mockup.ValueEnum.*;
 import static net.ranides.assira.collection.mockup.TPointUtils.*;
 import net.ranides.assira.collection.sets.ASortedSet;
 import net.ranides.assira.junit.QAssert;