Ranides Atterwim 10 лет назад
Родитель
Сommit
a2fb0f7139

+ 66 - 66
assira/src/test/java/net/ranides/assira/collection/ACollectionTest.java

@@ -1,66 +1,66 @@
-/*
- * @author Ranides Atterwim <ranides@gmail.com>
- * @copyright Ranides Atterwim
- * @license WTFPL
- * @url http://ranides.net/projects/assira
- */
-package net.ranides.assira.collection;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import net.ranides.assira.collection.mockup.CollectionSuite;
-import net.ranides.assira.collection.mockup.TMaps;
-import net.ranides.assira.collection.mockup.TPoint;
-import net.ranides.assira.test.TCollection;
-import static org.junit.Assert.*;
-import org.junit.Test;
-
-/**
- *
- * @author Ranides Atterwim <ranides@gmail.com>
- */
-public class ACollectionTest {
-    
-    private final TCollection<TPoint> $var = TMaps.MAP_PI.keys();
-
-    @Test
-    public void testSuite() {
-        CollectionSuite.SUITE
-			.param("collection!", $var)
-			.param("nest!", true)
-			.run((array) -> new MCollection($var.list(array)));
-    }
-    
-    @Test
-    public void testToString() {
-        MCollection target = new MCollection($var.list(1,2,3,4,5));
-        assertEquals("[(1:1:10), (2:2:20), (3:3:30), (4:4:40), (5:5:50)]", target.toString());
-    }
-    
-    private static final class MCollection<T> extends ACollection<T> {
-        
-        private final List<T> list;
-
-        public MCollection(TCollection.TItems<T> list) {
-            this.list = list.into(new ArrayList<>());
-        }
-
-        @Override
-        public boolean add(T e) {
-            return list.add(e);
-        }
-        
-        @Override
-        public int size() {
-            return list.size();
-        }
-
-        @Override
-        public Iterator<T> iterator() {
-            return list.iterator();
-        }
-        
-    }
-    
-}
+/*
+ * @author Ranides Atterwim <ranides@gmail.com>
+ * @copyright Ranides Atterwim
+ * @license WTFPL
+ * @url http://ranides.net/projects/assira
+ */
+package net.ranides.assira.collection;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import net.ranides.assira.collection.mockup.CollectionSuite;
+import net.ranides.assira.collection.mockup.TMaps;
+import net.ranides.assira.collection.mockup.TPoint;
+import net.ranides.assira.test.TCollection;
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+/**
+ *
+ * @author Ranides Atterwim <ranides@gmail.com>
+ */
+public class ACollectionTest {
+    
+    private final TCollection<TPoint> $var = TMaps.MAP_PI.keys();
+
+    @Test
+    public void testSuite() {
+        CollectionSuite.SUITE
+			.param("collection!", $var)
+			.param("nest!", true)
+			.run((array) -> new MCollection<>($var.list(array)));
+    }
+    
+    @Test
+    public void testToString() {
+        MCollection<TPoint> target = new MCollection<>($var.list(1,2,3,4,5));
+        assertEquals("[(1:1:10), (2:2:20), (3:3:30), (4:4:40), (5:5:50)]", target.toString());
+    }
+    
+    private static final class MCollection<T> extends ACollection<T> {
+        
+        private final List<T> list;
+
+        public MCollection(TCollection.TItems<T> list) {
+            this.list = list.into(new ArrayList<>());
+        }
+
+        @Override
+        public boolean add(T e) {
+            return list.add(e);
+        }
+        
+        @Override
+        public int size() {
+            return list.size();
+        }
+
+        @Override
+        public Iterator<T> iterator() {
+            return list.iterator();
+        }
+        
+    }
+    
+}

+ 122 - 122
assira/src/test/java/net/ranides/assira/collection/maps/AIntMapTest.java

@@ -1,122 +1,122 @@
-/*
- * @author Ranides Atterwim <ranides@gmail.com>
- * @copyright Ranides Atterwim
- * @license WTFPL
- * @url http://ranides.net/projects/assira
- */
-package net.ranides.assira.collection.maps;
-
-import java.util.AbstractSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import net.ranides.assira.collection.HashComparator;
-import net.ranides.assira.collection.iterators.IteratorAdapters;
-import net.ranides.assira.collection.mockup.TMaps;
-import net.ranides.assira.collection.mockup.CollectionSuite;
-import net.ranides.assira.generic.CompareUtils;
-import net.ranides.assira.test.TMap;
-import org.junit.Test;
-
-/**
- *
- * @author Ranides Atterwim <ranides@gmail.com>
- */
-public class AIntMapTest {
-    
-    private final TMap<Integer, String> $map = TMaps.MAP_IS;
-    
-    @Test
-    public void testSuite() {
-        CollectionSuite.SUITE
-            .param("map!", $map)
-            .run(() -> new ATMap($map.comparator()));
-    }
-    
-    private static class ATMap extends AIntMap<String> {
-        
-        private final Map<Integer, String> data;
-
-        public ATMap(HashComparator<Integer> cmp) {
-            data = new TreeMap<>(cmp);
-        }
-
-        @Override
-        public String put(int key, String value) {
-            return data.put(key, value);
-        }
-
-        @Override
-        public boolean containsKey(int key) {
-            return data.containsKey(key);
-        }
-        
-        @Override
-        public boolean containsValue(Object v) {
-            return data.containsValue(v);
-        }
-
-        @Override
-        public String get(int key) {
-            return data.get(key);
-        }
-        
-        @Override
-        public void clear() {
-            data.clear();
-        }
-        
-        @Override
-        public int size() {
-            return data.size();
-        }
-        
-        @Override
-        public String remove(int key) {
-            return data.remove(key);
-        }
-
-        @Override
-        public Set<IntEntry<String>> fastEntrySet() {
-            return new AbstractSet<IntEntry<String>>() {
-
-                @Override
-                public Iterator<IntEntry<String>> iterator() {
-                    return IteratorAdapters.apply(data.entrySet().iterator(), (entry)-> new BasicEntry<>(entry.getKey(), entry.getValue()));
-                }
-
-                @Override
-                public int size() {
-                    return data.size();
-                }
-                
-                @SuppressWarnings("unchecked")
-                @Override
-                public boolean remove(Object object) {
-                    if(object instanceof Entry) {
-                        Entry<Integer, String> entry = (Entry<Integer, String>)object;
-                        return data.remove(entry.getKey(), entry.getValue());
-                    }
-                    return false;
-                }
-
-                @SuppressWarnings("unchecked")
-                @Override
-                public boolean contains(Object object) {
-                    if(!(object instanceof Entry)) {
-                        return false;
-                    }
-                    Entry<Integer, String> entry = (Entry<Integer, String>)object;
-                    if(!data.containsKey(entry.getKey())) {
-                        return false;
-                    }
-                    return CompareUtils.equals(data.get(entry.getKey()), entry.getValue());
-                }
-                
-            };
-        }
-
-    }
-    
-}
+/*
+ * @author Ranides Atterwim <ranides@gmail.com>
+ * @copyright Ranides Atterwim
+ * @license WTFPL
+ * @url http://ranides.net/projects/assira
+ */
+package net.ranides.assira.collection.maps;
+
+import java.util.AbstractSet;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import net.ranides.assira.collection.iterators.IteratorAdapters;
+import net.ranides.assira.collection.mockup.TMaps;
+import net.ranides.assira.collection.mockup.CollectionSuite;
+import net.ranides.assira.generic.CompareUtils;
+import net.ranides.assira.test.TMap;
+import org.junit.Test;
+
+/**
+ *
+ * @author Ranides Atterwim <ranides@gmail.com>
+ */
+public class AIntMapTest {
+    
+    private final TMap<Integer, String> $map = TMaps.MAP_IS;
+    
+    @Test
+    public void testSuite() {
+        CollectionSuite.SUITE
+            .param("map!", $map)
+            .run(() -> new ATMap($map.comparator()));
+    }
+    
+    private static class ATMap extends AIntMap<String> {
+        
+        private final Map<Integer, String> data;
+
+        public ATMap(Comparator<Integer> cmp) {
+            data = new TreeMap<>(cmp);
+        }
+
+        @Override
+        public String put(int key, String value) {
+            return data.put(key, value);
+        }
+
+        @Override
+        public boolean containsKey(int key) {
+            return data.containsKey(key);
+        }
+        
+        @Override
+        public boolean containsValue(Object v) {
+            return data.containsValue(v);
+        }
+
+        @Override
+        public String get(int key) {
+            return data.get(key);
+        }
+        
+        @Override
+        public void clear() {
+            data.clear();
+        }
+        
+        @Override
+        public int size() {
+            return data.size();
+        }
+        
+        @Override
+        public String remove(int key) {
+            return data.remove(key);
+        }
+
+        @Override
+        public Set<IntEntry<String>> fastEntrySet() {
+            return new AbstractSet<IntEntry<String>>() {
+
+                @Override
+                public Iterator<IntEntry<String>> iterator() {
+                    return IteratorAdapters.apply(data.entrySet().iterator(), (entry)-> new BasicEntry<>(entry.getKey(), entry.getValue()));
+                }
+
+                @Override
+                public int size() {
+                    return data.size();
+                }
+                
+                @SuppressWarnings("unchecked")
+                @Override
+                public boolean remove(Object object) {
+                    if(object instanceof Entry) {
+                        Entry<Integer, String> entry = (Entry<Integer, String>)object;
+                        return data.remove(entry.getKey(), entry.getValue());
+                    }
+                    return false;
+                }
+
+                @SuppressWarnings("unchecked")
+                @Override
+                public boolean contains(Object object) {
+                    if(!(object instanceof Entry)) {
+                        return false;
+                    }
+                    Entry<Integer, String> entry = (Entry<Integer, String>)object;
+                    if(!data.containsKey(entry.getKey())) {
+                        return false;
+                    }
+                    return CompareUtils.equals(data.get(entry.getKey()), entry.getValue());
+                }
+                
+            };
+        }
+
+    }
+    
+}

+ 129 - 129
assira/src/test/java/net/ranides/assira/collection/maps/AMapTest.java

@@ -1,129 +1,129 @@
-/*
- * @author Ranides Atterwim <ranides@gmail.com>
- * @copyright Ranides Atterwim
- * @license WTFPL
- * @url http://ranides.net/projects/assira
- */
-package net.ranides.assira.collection.maps;
-
-import java.util.AbstractSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import net.ranides.assira.collection.HashComparator;
-import net.ranides.assira.collection.iterators.IteratorAdapters;
-import net.ranides.assira.collection.mockup.TMaps;
-import net.ranides.assira.collection.mockup.TPoint;
-import net.ranides.assira.collection.mockup.CollectionSuite;
-import net.ranides.assira.generic.CompareUtils;
-import net.ranides.assira.test.TMap;
-import org.junit.Test;
-
-/**
- *
- * @author Ranides Atterwim <ranides@gmail.com>
- */
-public class AMapTest {
-    
-    private final TMap<TPoint, Integer> $map = TMaps.MAP_PI;
-    
-    @Test
-    public void testSuite() {
-        CollectionSuite.SUITE
-            .param("map!", $map)
-            .run(() -> new ATMap($map.comparator()));
-    }
-    
-    private static class ATMap extends AMap<TPoint, Integer> {
-        
-        private final Map<TPoint, Integer> data;
-
-        public ATMap(HashComparator<TPoint> cmp) {
-            data = new TreeMap<>(cmp);
-        }
-
-        @Override
-        public Integer put(TPoint key, Integer value) {
-            return data.put(key, value);
-        }
-
-        @Override
-        public Integer remove(Object key) {
-            if(!(key instanceof TPoint)) {
-                return null;
-            }
-            return data.remove(key);
-        }
-
-        @Override
-        public void clear() {
-            data.clear();
-        }
-
-        @Override
-        public boolean containsValue(Object v) {
-            return data.containsValue(v);
-        }
-
-        @Override
-        public boolean containsKey(Object key) {
-            if(!(key instanceof TPoint)) {
-                return false;
-            }
-            return data.containsKey(key);
-        }
-
-        @Override
-        public Integer get(Object key) {
-            return data.get(key);
-        }
-
-        @Override
-        public Set<Entry<TPoint, Integer>> entrySet() {
-            return new AbstractSet<Entry<TPoint, Integer>>() {
-
-                @Override
-                public Iterator<Entry<TPoint, Integer>> iterator() {
-                    return IteratorAdapters.apply(data.entrySet().iterator(), (entry)-> new BasicEntry<>(entry.getKey(), entry.getValue()));
-                }
-
-                @Override
-                public int size() {
-                    return data.size();
-                }
-                
-                @SuppressWarnings("unchecked")
-                @Override
-                public boolean remove(Object object) {
-                    if(object instanceof Entry) {
-                        Entry<TPoint, Integer> entry = (Entry<TPoint, Integer>)object;
-                        return data.remove(entry.getKey(), entry.getValue());
-                    }
-                    return false;
-                }
-
-                @SuppressWarnings("unchecked")
-                @Override
-                public boolean contains(Object object) {
-                    if(!(object instanceof Entry)) {
-                        return false;
-                    }
-                    Entry<TPoint, Integer> entry = (Entry<TPoint, Integer>)object;
-                    if(!data.containsKey(entry.getKey())) {
-                        return false;
-                    }
-                    return CompareUtils.equals(data.get(entry.getKey()), entry.getValue());
-                }
-                
-            };
-        }
-
-        @Override
-        public int size() {
-            return data.size();
-        }
-
-    }
-    
-}
+/*
+ * @author Ranides Atterwim <ranides@gmail.com>
+ * @copyright Ranides Atterwim
+ * @license WTFPL
+ * @url http://ranides.net/projects/assira
+ */
+package net.ranides.assira.collection.maps;
+
+import java.util.AbstractSet;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import net.ranides.assira.collection.iterators.IteratorAdapters;
+import net.ranides.assira.collection.mockup.TMaps;
+import net.ranides.assira.collection.mockup.TPoint;
+import net.ranides.assira.collection.mockup.CollectionSuite;
+import net.ranides.assira.generic.CompareUtils;
+import net.ranides.assira.test.TMap;
+import org.junit.Test;
+
+/**
+ *
+ * @author Ranides Atterwim <ranides@gmail.com>
+ */
+public class AMapTest {
+    
+    private final TMap<TPoint, Integer> $map = TMaps.MAP_PI;
+    
+    @Test
+    public void testSuite() {
+        CollectionSuite.SUITE
+            .param("map!", $map)
+            .run(() -> new ATMap($map.comparator()));
+    }
+    
+    private static class ATMap extends AMap<TPoint, Integer> {
+        
+        private final Map<TPoint, Integer> data;
+
+        public ATMap(Comparator<TPoint> cmp) {
+            data = new TreeMap<>(cmp);
+        }
+
+        @Override
+        public Integer put(TPoint key, Integer value) {
+            return data.put(key, value);
+        }
+
+        @Override
+        public Integer remove(Object key) {
+            if(!(key instanceof TPoint)) {
+                return null;
+            }
+            return data.remove(key);
+        }
+
+        @Override
+        public void clear() {
+            data.clear();
+        }
+
+        @Override
+        public boolean containsValue(Object v) {
+            return data.containsValue(v);
+        }
+
+        @Override
+        public boolean containsKey(Object key) {
+            if(!(key instanceof TPoint)) {
+                return false;
+            }
+            return data.containsKey(key);
+        }
+
+        @Override
+        public Integer get(Object key) {
+            return data.get(key);
+        }
+
+        @Override
+        public Set<Entry<TPoint, Integer>> entrySet() {
+            return new AbstractSet<Entry<TPoint, Integer>>() {
+
+                @Override
+                public Iterator<Entry<TPoint, Integer>> iterator() {
+                    return IteratorAdapters.apply(data.entrySet().iterator(), (entry)-> new BasicEntry<>(entry.getKey(), entry.getValue()));
+                }
+
+                @Override
+                public int size() {
+                    return data.size();
+                }
+                
+                @SuppressWarnings("unchecked")
+                @Override
+                public boolean remove(Object object) {
+                    if(object instanceof Entry) {
+                        Entry<TPoint, Integer> entry = (Entry<TPoint, Integer>)object;
+                        return data.remove(entry.getKey(), entry.getValue());
+                    }
+                    return false;
+                }
+
+                @SuppressWarnings("unchecked")
+                @Override
+                public boolean contains(Object object) {
+                    if(!(object instanceof Entry)) {
+                        return false;
+                    }
+                    Entry<TPoint, Integer> entry = (Entry<TPoint, Integer>)object;
+                    if(!data.containsKey(entry.getKey())) {
+                        return false;
+                    }
+                    return CompareUtils.equals(data.get(entry.getKey()), entry.getValue());
+                }
+                
+            };
+        }
+
+        @Override
+        public int size() {
+            return data.size();
+        }
+
+    }
+    
+}

+ 76 - 76
assira/src/test/java/net/ranides/assira/collection/sets/AIntSetTest.java

@@ -1,76 +1,76 @@
-/*
- * @author Ranides Atterwim <ranides@gmail.com>
- * @copyright Ranides Atterwim
- * @license WTFPL
- * @url http://ranides.net/projects/assira
- */
-package net.ranides.assira.collection.sets;
-
-import java.util.Set;
-import java.util.TreeSet;
-import net.ranides.assira.collection.HashComparator;
-import net.ranides.assira.collection.iterators.IntIterator;
-import net.ranides.assira.collection.mockup.CollectionSuite;
-import net.ranides.assira.collection.mockup.TMaps;
-import net.ranides.assira.test.TCollection;
-import org.junit.Test;
-
-/**
- *
- * @author Ranides Atterwim <ranides@gmail.com>
- */
-public class AIntSetTest {
-    
-    private final TCollection<Integer> $var = TMaps.MAP_IS.keys();
-    
-    @Test
-    public void testSuite() {
-        CollectionSuite.SUITE
-            .debug(true)
-            .param("collection!", $var)
-            .run((array) -> $var.list(array).into(new ATSet($var.comparator())));
-    }
-    
-    private static class ATSet extends AIntSet {
-        
-        private final Set<Integer> data;
-
-        public ATSet(HashComparator<Integer> cmp) {
-            data = new TreeSet<>(cmp);
-        }
-
-        @Override
-        public boolean add(int key) {
-            return data.add(key);
-        }
-
-        @Override
-        public boolean contains(int key) {
-            return data.contains(key);
-        }
-        
-        @Override
-        public void clear() {
-            data.clear();
-        }
-        
-        @Override
-        public int size() {
-            return data.size();
-        }
-        
-        @Override
-        public boolean remove(int key) {
-            return data.remove(key);
-        }
-
-        @Override
-        public IntIterator iterator() {
-            return IntIterator.wrap(data.iterator());
-        }
-
-        
-
-    }
-    
-}
+/*
+ * @author Ranides Atterwim <ranides@gmail.com>
+ * @copyright Ranides Atterwim
+ * @license WTFPL
+ * @url http://ranides.net/projects/assira
+ */
+package net.ranides.assira.collection.sets;
+
+import java.util.Comparator;
+import java.util.Set;
+import java.util.TreeSet;
+import net.ranides.assira.collection.iterators.IntIterator;
+import net.ranides.assira.collection.mockup.CollectionSuite;
+import net.ranides.assira.collection.mockup.TMaps;
+import net.ranides.assira.test.TCollection;
+import org.junit.Test;
+
+/**
+ *
+ * @author Ranides Atterwim <ranides@gmail.com>
+ */
+public class AIntSetTest {
+    
+    private final TCollection<Integer> $var = TMaps.MAP_IS.keys();
+    
+    @Test
+    public void testSuite() {
+        CollectionSuite.SUITE
+            .debug(true)
+            .param("collection!", $var)
+            .run((array) -> $var.list(array).into(new ATSet($var.comparator())));
+    }
+    
+    private static class ATSet extends AIntSet {
+        
+        private final Set<Integer> data;
+
+        public ATSet(Comparator<Integer> cmp) {
+            data = new TreeSet<>(cmp);
+        }
+
+        @Override
+        public boolean add(int key) {
+            return data.add(key);
+        }
+
+        @Override
+        public boolean contains(int key) {
+            return data.contains(key);
+        }
+        
+        @Override
+        public void clear() {
+            data.clear();
+        }
+        
+        @Override
+        public int size() {
+            return data.size();
+        }
+        
+        @Override
+        public boolean remove(int key) {
+            return data.remove(key);
+        }
+
+        @Override
+        public IntIterator iterator() {
+            return IntIterator.wrap(data.iterator());
+        }
+
+        
+
+    }
+    
+}

+ 80 - 80
assira/src/test/java/net/ranides/assira/collection/sets/ASetTest.java

@@ -1,80 +1,80 @@
-/*
- * @author Ranides Atterwim <ranides@gmail.com>
- * @copyright Ranides Atterwim
- * @license WTFPL
- * @url http://ranides.net/projects/assira
- */
-package net.ranides.assira.collection.sets;
-
-import java.util.Iterator;
-import java.util.Set;
-import java.util.TreeSet;
-import net.ranides.assira.collection.HashComparator;
-import net.ranides.assira.collection.mockup.CollectionSuite;
-import net.ranides.assira.collection.mockup.TMaps;
-import net.ranides.assira.collection.mockup.TPoint;
-import net.ranides.assira.test.TCollection;
-import org.junit.Test;
-
-/**
- *
- * @author Ranides Atterwim <ranides@gmail.com>
- */
-public class ASetTest {
-    
-    private final TCollection<TPoint> $var = TMaps.MAP_PI.keys();
-    
-    @Test
-    public void testSuite() {
-        CollectionSuite.SUITE
-            .param("collection!", $var)
-            .run((array) -> $var.list(array).into(new ATSet($var.comparator())));
-    }
-    
-    private static class ATSet extends ASet<TPoint> {
-        
-        private final Set<TPoint> data;
-
-        public ATSet(HashComparator<TPoint> cmp) {
-            data = new TreeSet<>(cmp);
-        }
-
-        @Override
-        public Iterator<TPoint> iterator() {
-            return data.iterator();
-        }
-
-        @Override
-        public boolean add(TPoint key) {
-            return data.add(key);
-        }
-
-        @Override
-        public boolean remove(Object key) {
-            if(!(key instanceof TPoint)) {
-                return false;
-            }
-            return data.remove(key);
-        }
-
-        @Override
-        public void clear() {
-            data.clear();
-        }
-
-        @Override
-        public boolean contains(Object key) {
-            if(!(key instanceof TPoint)) {
-                return false;
-            }
-            return data.contains(key);
-        }
-
-        @Override
-        public int size() {
-            return data.size();
-        }
-
-    }
-    
-}
+/*
+ * @author Ranides Atterwim <ranides@gmail.com>
+ * @copyright Ranides Atterwim
+ * @license WTFPL
+ * @url http://ranides.net/projects/assira
+ */
+package net.ranides.assira.collection.sets;
+
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.TreeSet;
+import net.ranides.assira.collection.mockup.CollectionSuite;
+import net.ranides.assira.collection.mockup.TMaps;
+import net.ranides.assira.collection.mockup.TPoint;
+import net.ranides.assira.test.TCollection;
+import org.junit.Test;
+
+/**
+ *
+ * @author Ranides Atterwim <ranides@gmail.com>
+ */
+public class ASetTest {
+    
+    private final TCollection<TPoint> $var = TMaps.MAP_PI.keys();
+    
+    @Test
+    public void testSuite() {
+        CollectionSuite.SUITE
+            .param("collection!", $var)
+            .run((array) -> $var.list(array).into(new ATSet($var.comparator())));
+    }
+    
+    private static class ATSet extends ASet<TPoint> {
+        
+        private final Set<TPoint> data;
+
+        public ATSet(Comparator<TPoint> cmp) {
+            data = new TreeSet<>(cmp);
+        }
+
+        @Override
+        public Iterator<TPoint> iterator() {
+            return data.iterator();
+        }
+
+        @Override
+        public boolean add(TPoint key) {
+            return data.add(key);
+        }
+
+        @Override
+        public boolean remove(Object key) {
+            if(!(key instanceof TPoint)) {
+                return false;
+            }
+            return data.remove(key);
+        }
+
+        @Override
+        public void clear() {
+            data.clear();
+        }
+
+        @Override
+        public boolean contains(Object key) {
+            if(!(key instanceof TPoint)) {
+                return false;
+            }
+            return data.contains(key);
+        }
+
+        @Override
+        public int size() {
+            return data.size();
+        }
+
+    }
+    
+}

+ 154 - 154
assira/src/test/java/net/ranides/assira/collection/suite/CollectionTester.java

@@ -1,154 +1,154 @@
-/*
- * @author Ranides Atterwim <ranides@gmail.com>
- * @copyright Ranides Atterwim
- * @license WTFPL
- * @url http://ranides.net/projects/assira
- */
-package net.ranides.assira.collection.suite;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Resource;
-import net.ranides.assira.junit.InterfaceTest;
-import static net.ranides.assira.junit.NewAssert.*;
-import net.ranides.assira.test.TCollection;
-
-/**
- *
- * @author Ranides Atterwim <ranides@gmail.com>
- */
-public class CollectionTester<T> {
-    
-    @Resource(name = "collection!")
-    private TCollection<T> $var;
-    
-    @InterfaceTest
-    public void basicAdd(Collection<T> target) {
-		target.add($var.item(0).value());
-        assertEquals(1, target.size());
-		
-        target.add($var.item(1).value());
-        assertEquals(2, target.size());
-        
-		target.add($var.item(2).value());
-        assertEquals(3, target.size());
-    }
-    
-    @InterfaceTest
-    public void basicAddContains(Collection<T> target) {
-		target.add($var.item(0).value());
-        assertEquals(1, target.size());
-		
-        target.add($var.item(1).value());
-        assertEquals(2, target.size());
-        
-		target.add($var.item(2).value());
-        assertEquals(3, target.size());
-        
-        assertTrue( target.contains($var.item(0).value()));
-        assertTrue( target.contains($var.item(1).value()));
-        assertTrue( target.contains($var.item(2).value()));
-        assertFalse( target.contains($var.item(3).value()));
-    }
-    
-    @InterfaceTest
-    public void basicContains(Function<int[], Collection<T>> f) {
-        Collection<T> target = f.apply(new int[]{1,2,3,4,5});
-		
-        assertTrue( target.contains($var.item(1).value()));
-        assertFalse( target.contains($var.item(6).value()));
-        
-        assertTrue( target.containsAll($list(1,2,3)) );
-        assertTrue( target.containsAll($list(3,4,5)) );
-        assertTrue( target.containsAll($list(1,2,3,4,5)) );
-        
-        assertFalse( target.containsAll($list(6)) );
-        assertFalse( target.containsAll($list(1,2,6)) );
-        assertFalse( target.containsAll($list(1,6,2,3)) );
-    }
-    
-    @InterfaceTest
-    public void basicRemove(Function<int[], Collection<T>> f) {
-        Collection<T> target = f.apply(new int[]{1,2,3,4,5});
-        assertContentEquals($list(1,2,3,4,5), target);
-
-        assertTrue(target.remove($var.item(2).value()));
-        assertContentEquals($list(1,3,4,5), target);
-        
-        assertTrue(target.remove($var.item(4).value()));
-        assertContentEquals($list(1,3,5), target);
-        
-        assertFalse(target.remove($var.item(7).value()));
-        assertContentEquals($list(1,3,5), target);
-        
-        assertFalse(target.removeAll($list(10,11)));
-        assertContentEquals($list(1,3,5), target);
-        
-        assertTrue(target.removeAll($list(1,3,5,9)));
-        assertEmpty(target);
-    }
-    
-    @InterfaceTest
-    public void basicRetainAll(Function<int[], Collection<T>> f) {
-        Collection<T> target = f.apply(new int[]{1,2,3,4,5});
-        assertContentEquals($list(1,2,3,4,5), target);
-
-        assertFalse(target.retainAll($list(1,2,3,4,5,9)));
-        assertContentEquals($list(1,2,3,4,5), target);
-        
-        assertTrue(target.retainAll($list(1,3,10)));
-        assertContentEquals($list(1,3), target);
-
-        assertTrue(target.retainAll($list(12)));
-        assertEmpty(target);
-    }
-    
-    @InterfaceTest
-    public void basicToArray(Function<int[], Collection<T>> f) {
-        Collection<T> target = f.apply(new int[]{1,2,3,4,5});
-        Object[] t = target.toArray();
-        Object[] e = $list(1,2,3,4,5).toArray();
-        assertArrayContentEquals(e, t);
-    }
-    
-    @InterfaceTest
-    public void basicToArrayG(Function<int[], Collection<T>> f) {
-        // strasznie tu oszukujemy, licząc na type erasure
-        Collection<T> target = f.apply(new int[]{1,2,3,4,5});
-        Object[] e = $list(1,2,3,4,5).toArray();
-        
-        assertArrayContentEquals(e, target.toArray((T[])new Object[0]));
-        assertArrayContentEquals(e, target.toArray((T[])new Object[3]));
-        
-        List<T> list = $list(1,2,3,4,5);
-        list.add(null);
-        list.add(null);
-        list.add(null);
-        Object[] e8 = list.toArray();
-        assertArrayContentEquals(e8, target.toArray((T[])new Object[8]));
-    }
-    
-    private List $list(int... values) {
-        return $var.list(values).into(new ArrayList<T>());
-    }
-    
-    private static <Q> void assertContentEquals(Collection<Q> a, Collection<Q> b) {
-        assertTrue("assertContentEquals", a.containsAll(b) && b.containsAll(a));
-    }
-    
-    private static void assertArrayContentEquals(Object[] a, Object[] b) {
-        List<Object> alist = Arrays.asList(a);
-        List<Object> blist = Arrays.asList(b);
-        assertTrue("assertContentEquals", alist.containsAll(blist) && blist.containsAll(alist));
-    }
-    
-    private void assertEmpty(Collection<T> target) {
-        assertEquals(0, target.size());
-        assertTrue(target.isEmpty());
-        assertContentEquals($list(), target);
-    }
-
-}
+/*
+ * @author Ranides Atterwim <ranides@gmail.com>
+ * @copyright Ranides Atterwim
+ * @license WTFPL
+ * @url http://ranides.net/projects/assira
+ */
+package net.ranides.assira.collection.suite;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Resource;
+import net.ranides.assira.junit.InterfaceTest;
+import static net.ranides.assira.junit.NewAssert.*;
+import net.ranides.assira.test.TCollection;
+
+/**
+ *
+ * @author Ranides Atterwim <ranides@gmail.com>
+ */
+public class CollectionTester<T> {
+    
+    @Resource(name = "collection!")
+    private TCollection<T> $var;
+    
+    @InterfaceTest
+    public void basicAdd(Collection<T> target) {
+		target.add($var.item(0).value());
+        assertEquals(1, target.size());
+		
+        target.add($var.item(1).value());
+        assertEquals(2, target.size());
+        
+		target.add($var.item(2).value());
+        assertEquals(3, target.size());
+    }
+    
+    @InterfaceTest
+    public void basicAddContains(Collection<T> target) {
+		target.add($var.item(0).value());
+        assertEquals(1, target.size());
+		
+        target.add($var.item(1).value());
+        assertEquals(2, target.size());
+        
+		target.add($var.item(2).value());
+        assertEquals(3, target.size());
+        
+        assertTrue( target.contains($var.item(0).value()));
+        assertTrue( target.contains($var.item(1).value()));
+        assertTrue( target.contains($var.item(2).value()));
+        assertFalse( target.contains($var.item(3).value()));
+    }
+    
+    @InterfaceTest
+    public void basicContains(Function<int[], Collection<T>> f) {
+        Collection<T> target = f.apply(new int[]{1,2,3,4,5});
+		
+        assertTrue( target.contains($var.item(1).value()));
+        assertFalse( target.contains($var.item(6).value()));
+        
+        assertTrue( target.containsAll($list(1,2,3)) );
+        assertTrue( target.containsAll($list(3,4,5)) );
+        assertTrue( target.containsAll($list(1,2,3,4,5)) );
+        
+        assertFalse( target.containsAll($list(6)) );
+        assertFalse( target.containsAll($list(1,2,6)) );
+        assertFalse( target.containsAll($list(1,6,2,3)) );
+    }
+    
+    @InterfaceTest
+    public void basicRemove(Function<int[], Collection<T>> f) {
+        Collection<T> target = f.apply(new int[]{1,2,3,4,5});
+        assertContentEquals($list(1,2,3,4,5), target);
+
+        assertTrue(target.remove($var.item(2).value()));
+        assertContentEquals($list(1,3,4,5), target);
+        
+        assertTrue(target.remove($var.item(4).value()));
+        assertContentEquals($list(1,3,5), target);
+        
+        assertFalse(target.remove($var.item(7).value()));
+        assertContentEquals($list(1,3,5), target);
+        
+        assertFalse(target.removeAll($list(10,11)));
+        assertContentEquals($list(1,3,5), target);
+        
+        assertTrue(target.removeAll($list(1,3,5,9)));
+        assertEmpty(target);
+    }
+    
+    @InterfaceTest
+    public void basicRetainAll(Function<int[], Collection<T>> f) {
+        Collection<T> target = f.apply(new int[]{1,2,3,4,5});
+        assertContentEquals($list(1,2,3,4,5), target);
+
+        assertFalse(target.retainAll($list(1,2,3,4,5,9)));
+        assertContentEquals($list(1,2,3,4,5), target);
+        
+        assertTrue(target.retainAll($list(1,3,10)));
+        assertContentEquals($list(1,3), target);
+
+        assertTrue(target.retainAll($list(12)));
+        assertEmpty(target);
+    }
+    
+    @InterfaceTest
+    public void basicToArray(Function<int[], Collection<T>> f) {
+        Collection<T> target = f.apply(new int[]{1,2,3,4,5});
+        Object[] t = target.toArray();
+        Object[] e = $list(1,2,3,4,5).toArray();
+        assertArrayContentEquals(e, t);
+    }
+    
+    @InterfaceTest
+    public void basicToArrayG(Function<int[], Collection<T>> f) {
+        // strasznie tu oszukujemy, licząc na type erasure
+        Collection<T> target = f.apply(new int[]{1,2,3,4,5});
+        Object[] e = $list(1,2,3,4,5).toArray();
+        
+        assertArrayContentEquals(e, target.toArray((T[])new Object[0]));
+        assertArrayContentEquals(e, target.toArray((T[])new Object[3]));
+        
+        List<T> list = $list(1,2,3,4,5);
+        list.add(null);
+        list.add(null);
+        list.add(null);
+        Object[] e8 = list.toArray();
+        assertArrayContentEquals(e8, target.toArray((T[])new Object[8]));
+    }
+    
+    private List<T> $list(int... values) {
+        return $var.list(values).into(new ArrayList<T>());
+    }
+    
+    private static <Q> void assertContentEquals(Collection<Q> a, Collection<Q> b) {
+        assertTrue("assertContentEquals", a.containsAll(b) && b.containsAll(a));
+    }
+    
+    private static void assertArrayContentEquals(Object[] a, Object[] b) {
+        List<Object> alist = Arrays.asList(a);
+        List<Object> blist = Arrays.asList(b);
+        assertTrue("assertContentEquals", alist.containsAll(blist) && blist.containsAll(alist));
+    }
+    
+    private void assertEmpty(Collection<T> target) {
+        assertEquals(0, target.size());
+        assertTrue(target.isEmpty());
+        assertContentEquals($list(), target);
+    }
+
+}