Sort tests better in a few test suites.

3 files changed, 6 insertions, 24 deletions

diff --git a/src/cz/crcs/ectester/reader/test/CardCofactorTestSuite.java b/src/cz/crcs/ectester/reader/test/CardCofactorTestSuite.java
index de44d4e..cd7a85d 100644
--- a/src/cz/crcs/ectester/reader/test/CardCofactorTestSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CardCofactorTestSuite.java
@@ -27,14 +27,8 @@ public class CardCofactorTestSuite extends CardTestSuite {
     @Override
     protected void runTests() throws Exception {
         Map<String, EC_Key.Public> pubkeys = EC_Store.getInstance().getObjects(EC_Key.Public.class, "cofactor");
-        Map<EC_Curve, List<EC_Key.Public>> curves = new TreeMap<>();
-        for (EC_Key.Public key : pubkeys.values()) {
-            EC_Curve curve = EC_Store.getInstance().getObject(EC_Curve.class, key.getCurve());
-            List<EC_Key.Public> keys = curves.getOrDefault(curve, new LinkedList<>());
-            keys.add(key);
-            curves.putIfAbsent(curve, keys);
-        }
-        for (Map.Entry<EC_Curve, List<EC_Key.Public>> e : curves.entrySet()) {
+        List<Map.Entry<EC_Curve, List<EC_Key.Public>>> curveList = EC_Store.mapToCurve(pubkeys.values());
+        for (Map.Entry<EC_Curve, List<EC_Key.Public>> e : curveList) {
             EC_Curve curve = e.getKey();
             List<EC_Key.Public> keys = e.getValue();
 
diff --git a/src/cz/crcs/ectester/reader/test/CardInvalidCurvesSuite.java b/src/cz/crcs/ectester/reader/test/CardInvalidCurvesSuite.java
index 10e0cdf..8af7c77 100644
--- a/src/cz/crcs/ectester/reader/test/CardInvalidCurvesSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CardInvalidCurvesSuite.java
@@ -32,14 +32,8 @@ public class CardInvalidCurvesSuite extends CardTestSuite {
          * Try ECDH with invalid public keys of increasing order.
          */
         Map<String, EC_Key.Public> pubkeys = EC_Store.getInstance().getObjects(EC_Key.Public.class, "invalid");
-        Map<EC_Curve, List<EC_Key.Public>> curves = new TreeMap<>();
-        for (EC_Key.Public key : pubkeys.values()) {
-            EC_Curve curve = EC_Store.getInstance().getObject(EC_Curve.class, key.getCurve());
-            List<EC_Key.Public> keys = curves.getOrDefault(curve, new LinkedList<>());
-            keys.add(key);
-            curves.putIfAbsent(curve, keys);
-        }
-        for (Map.Entry<EC_Curve, List<EC_Key.Public>> e : curves.entrySet()) {
+        List<Map.Entry<EC_Curve, List<EC_Key.Public>>> curveList = EC_Store.mapToCurve(pubkeys.values());
+        for (Map.Entry<EC_Curve, List<EC_Key.Public>> e : curveList) {
             EC_Curve curve = e.getKey();
             List<EC_Key.Public> keys = e.getValue();
 
diff --git a/src/cz/crcs/ectester/reader/test/CardTwistTestSuite.java b/src/cz/crcs/ectester/reader/test/CardTwistTestSuite.java
index 0f2ec91..4ddd74f 100644
--- a/src/cz/crcs/ectester/reader/test/CardTwistTestSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CardTwistTestSuite.java
@@ -26,14 +26,8 @@ public class CardTwistTestSuite extends CardTestSuite {
     @Override
     protected void runTests() throws Exception {
         Map<String, EC_Key.Public> pubkeys = EC_Store.getInstance().getObjects(EC_Key.Public.class, "twist");
-        Map<EC_Curve, List<EC_Key.Public>> curves = new TreeMap<>();
-        for (EC_Key.Public key : pubkeys.values()) {
-            EC_Curve curve = EC_Store.getInstance().getObject(EC_Curve.class, key.getCurve());
-            List<EC_Key.Public> keys = curves.getOrDefault(curve, new LinkedList<>());
-            keys.add(key);
-            curves.putIfAbsent(curve, keys);
-        }
-        for (Map.Entry<EC_Curve, List<EC_Key.Public>> e : curves.entrySet()) {
+        List<Map.Entry<EC_Curve, List<EC_Key.Public>>> curveList = EC_Store.mapToCurve(pubkeys.values());
+        for (Map.Entry<EC_Curve, List<EC_Key.Public>> e : curveList) {
             EC_Curve curve = e.getKey();
             List<EC_Key.Public> keys = e.getValue();