fix bugs

assira.core/src/main/java/net/ranides/assira/collection/prototype/PrototypeMap.java

@@ -38,7 +38,7 @@ public class PrototypeMap extends AMap<Object, Object> implements Map<Object, Ob
      * Creates new map without prototype
      */
     public PrototypeMap() {
-        this(null, new OpenMap<>());
+        this(null, new HashMap<>());
     }
 
     /**
@@ -47,7 +47,7 @@ public class PrototypeMap extends AMap<Object, Object> implements Map<Object, Ob
      * @param parent parent
      */
     public PrototypeMap(PrototypeMap parent) {
-        this(parent, new OpenMap<>());
+        this(parent, new HashMap<>());
     }
 
     /**
@@ -56,7 +56,7 @@ public class PrototypeMap extends AMap<Object, Object> implements Map<Object, Ob
      * @param content content
      */
     public PrototypeMap(Map<Object, ?> content) {
-        this(null, new OpenMap<>(content));
+        this(null, new HashMap<>(content));
     }
 
     /**
@@ -67,7 +67,7 @@ public class PrototypeMap extends AMap<Object, Object> implements Map<Object, Ob
      */
     public PrototypeMap(PrototypeMap parent, Map<Object, ?> content) {
         this.parent = parent;
-        this.declared = new OpenMap<>(content);
+        this.declared = new HashMap<>(content);
     }
 
     private PrototypeMap(boolean empty) {
@@ -433,6 +433,7 @@ public class PrototypeMap extends AMap<Object, Object> implements Map<Object, Ob
 
         @Override
         public Iterator<Map.Entry<Object, Object>> iterator() {
+            // @todo #82 fix bug inside "AOpenMap.PEntry" and then replace HashMap by OpenMap
             return new RemoveIterator<>(aggregate().iterator(), this::remove);
         }
 

assira.core/src/main/java/net/ranides/assira/collection/query/CQuery.java

@@ -1102,7 +1102,7 @@ public interface CQuery<T> extends Iterable<T> {
          * @return query
          */
         public final <T extends F> CQuery<T> iterator(CheckedSupplier<Iterator<T>, ?> source) {
-            return iterator(() -> source.$get());
+            return CQIterator.from(source::$get);
         }
 
         /**

assira.core/src/test/java/net/ranides/assira/collection/prototype/PrototypeMapTest.java

@@ -8,9 +8,7 @@ import net.ranides.test.data.TMaps;
 import net.ranides.assira.collection.sets.OpenSet;
 import net.ranides.test.data.TMap;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Set;
+import java.util.*;
 import java.util.regex.Pattern;
 
 import static org.junit.Assert.*;
@@ -92,4 +90,19 @@ public class PrototypeMapTest {
         assertEquals(dec3, map3.getDeclaredMap().keySet());
         assertEquals(dec4, map4.getDeclaredMap().keySet());
     }
+
+    @Test
+    public void entrySet_remove() {
+        System.out.println(map1.entrySet());
+//        System.out.println(map2.entrySet());
+
+
+        Iterator<Map.Entry<Object, Object>> a = map1.entrySet().iterator();
+        a.next();
+        a.remove();
+
+        System.out.println(map1.entrySet());
+        System.out.println(map1.size());
+//        System.out.println(map2.entrySet());
+    }
 }

assira.core/src/test/java/net/ranides/assira/collection/query/CQueryUtilsTest.java

@@ -1,24 +0,0 @@
-package net.ranides.assira.collection.query;
-
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import static org.junit.Assert.assertEquals;
-
-public class CQueryUtilsTest {
-
-    @Test
-    public void into() {
-        CQuery<Integer> q1 = CQuery.from().collection(Arrays.asList(1, 2, 3));
-        CQuery<Integer> q2 = CQuery.from().collection(Arrays.asList(5,4,3,6));
-        CQuery<Integer> q3 = CQuery.from().collection(Arrays.asList(1,7,8,9,5));
-
-        Set<Integer> set = CQueryUtils.into(new LinkedHashSet<>(), q1, q2, q3);
-
-        assertEquals(Arrays.asList(1,2,3,5,4,6,7,8,9), new ArrayList<>(set));
-    }
-}