Add composite PQ tests. Better order tests by EC_Data id.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/cz/crcs/ectester/data/EC_Store.java b/src/cz/crcs/ectester/data/EC_Store.java
index d2c8224..db8371c 100644
--- a/src/cz/crcs/ectester/data/EC_Store.java
+++ b/src/cz/crcs/ectester/data/EC_Store.java
@@ -327,6 +327,9 @@ public class EC_Store {
             curveKeys.add(item);
             curves.putIfAbsent(curve, curveKeys);
         }
+        for (List<T> keyList : curves.values()) {
+            Collections.sort(keyList);
+        }
         List<Map.Entry<EC_Curve, List<T>>> curveList = new LinkedList<>();
         curveList.addAll(curves.entrySet());
         Comparator<Map.Entry<EC_Curve, List<T>>> c = Comparator.comparing(o -> o.getKey().getBits());
@@ -350,6 +353,9 @@ public class EC_Store {
             group.add(item);
             groups.putIfAbsent(prefix, group);
         }
+        for (List<T> itemList : groups.values()) {
+            Collections.sort(itemList);
+        }
         List<Map.Entry<String, List<T>>> result = new LinkedList<>();
         result.addAll(groups.entrySet());
         result.sort(Comparator.comparing(Map.Entry::getKey));