Refactor testing, add Config class, make EC_Data read bytes

 - The ECTester.Config class now stores and reads all CLI options
 - Testing with the -t / --test option was partially refactored
into:
   - Test:
     Encapsulates one Command and Response pair with expected result,
a real result and a callback to dynamically assign result
   - TestSuite:
     Encapsulates a bunch of tests, represents a whole category of
tests either that can be run on any curve or only on some.

1 files changed, 6 insertions, 2 deletions

diff --git a/src/cz/crcs/ectester/data/EC_Store.java b/src/cz/crcs/ectester/data/EC_Store.java
index 0571cd8..ccd3586 100644
--- a/src/cz/crcs/ectester/data/EC_Store.java
+++ b/src/cz/crcs/ectester/data/EC_Store.java
@@ -151,12 +151,13 @@ public class EC_Store {
                     }
                     short bitsize = Short.parseShort(bits.getTextContent());
 
-                    EC_Curve curve = new EC_Curve(bitsize, alg, descs);
+                    EC_Curve curve = new EC_Curve(id.getTextContent(), bitsize, alg, descs);
 
                     InputStream csv = parseDataElement(dir, curveElem);
                     if (!curve.readCSV(csv)) {
                         throw new IOException("Invalid csv data.");
                     }
+                    csv.close();
 
                     objMap.put(id.getTextContent(), curve);
                 } else {
@@ -233,12 +234,13 @@ public class EC_Store {
                         kab = EC_Consts.KA_ECDHC;
                     }
 
-                    EC_KAResult kaResult = new EC_KAResult(kab, curve.getTextContent(), onekey.getTextContent(), otherkey.getTextContent(), descs);
+                    EC_KAResult kaResult = new EC_KAResult(id.getTextContent(), kab, curve.getTextContent(), onekey.getTextContent(), otherkey.getTextContent(), descs);
 
                     InputStream csv = parseDataElement(dir, elem);
                     if (!kaResult.readCSV(csv)) {
                         throw new IOException("Invalid csv data.");
                     }
+                    csv.close();
 
                     objMap.put(id.getTextContent(), kaResult);
                 } else {
@@ -276,6 +278,8 @@ public class EC_Store {
         if (!result.readCSV(csv)) {
             throw new IOException("Invalid CSV data.");
         }
+        csv.close();
+
         return result;
     }