Merge pull request #24 from crocs-muni/feat/pseudoprime-p

Add pseudoprime-p curves.

common/src/main/java/cz/crcs/ectester/common/output/BaseTextTestWriter.java

@@ -113,6 +113,23 @@ private String testString(Test t, String prefix, int index) {
         return line + out.toString();
     }
 
+    @Override
+    public void beginTest(Test t) {
+        if (t instanceof CompoundTest) {
+            CompoundTest test = (CompoundTest) t;
+        } else {
+            SimpleTest<? extends BaseTestable> test = (SimpleTest<? extends BaseTestable>) t;
+        }
+        output.print("Running ▶ " + t.getDescription());
+        output.flush();
+    }
+
+
+    @Override
+    public void endTest(Test t) {
+        output.print("\33[2K\r");
+    }
+
     @Override
     public void outputTest(Test t, int index) {
         if (!t.hasRun())

common/src/main/java/cz/crcs/ectester/common/output/BaseXMLTestWriter.java

@@ -115,6 +115,16 @@ private Element testElement(Test t, int index) {
         return testElem;
     }
 
+    @Override
+    public void beginTest(Test t) {
+
+    }
+
+    @Override
+    public void endTest(Test t) {
+
+    }
+
     @Override
     public void outputTest(Test t, int index) {
         if (!t.hasRun())

common/src/main/java/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java

@@ -91,6 +91,16 @@ private Map<String, Object> testObject(Test t, int index) {
         return testObj;
     }
 
+    @Override
+    public void beginTest(Test t) {
+
+    }
+
+    @Override
+    public void endTest(Test t) {
+
+    }
+
     @Override
     public void outputTest(Test t, int index) {
         if (!t.hasRun())

common/src/main/java/cz/crcs/ectester/common/output/TeeTestWriter.java

@@ -20,6 +20,20 @@ public void begin(TestSuite suite) {
         }
     }
 
+    @Override
+    public void beginTest(Test t) {
+        for (TestWriter writer : writers) {
+            writer.beginTest(t);
+        }
+    }
+
+    @Override
+    public void endTest(Test t) {
+        for (TestWriter writer : writers) {
+            writer.endTest(t);
+        }
+    }
+
     @Override
     public void outputTest(Test t, int index) {
         for (TestWriter writer : writers) {

common/src/main/java/cz/crcs/ectester/common/output/TestWriter.java

@@ -19,20 +19,32 @@ public interface TestWriter {
     void begin(TestSuite suite);
 
     /**
-     * @param t
-     * @param index
+     * Begin the test (before it is run).
+     * @param t Test to begin output of.
+     */
+    void beginTest(Test t);
+
+    /**
+     * End the test (after it is run, or errored out).
+     * @param t Test to end output of.
+     */
+    void endTest(Test t);
+
+    /**
+     * @param t Test to output.
+     * @param index Index of the test.
      */
     void outputTest(Test t, int index);
 
     /**
-     * @param t
-     * @param cause
-     * @param index
+     * @param t Test to output the error from.
+     * @param cause Throwable to output.
+     * @param index Index of the test.
      */
     void outputError(Test t, Throwable cause, int index);
 
     /**
-     *
+     * End writing the TestSuite.
      */
     void end();
 }

common/src/main/java/cz/crcs/ectester/common/test/TestSuite.java

@@ -55,7 +55,9 @@ public void run(int from, int to) {
      */
     protected <T extends Test> T runTest(T t) {
         running = t;
+        writer.beginTest(t);
         t.run();
+        writer.endTest(t);
         running = null;
         return t;
     }

common/src/main/resources/cz/crcs/ectester/data/wrong/curves.xml

@@ -92,4 +92,46 @@
         <file>wrongt571.csv</file>
         <desc>The field polynomial is not irreducible in F_2^571[x].</desc>
     </curve>
+    <curve>
+        <id>pseudo192</id>
+        <bits>192</bits>
+        <field>prime</field>
+        <file>pseudo192.csv</file>
+        <desc>The field is not prime (but a Carmichael pseudoprime, see https://github.com/crocs-muni/fooling-primality-tests/).</desc>
+    </curve>
+    <curve>
+        <id>pseudo224</id>
+        <bits>224</bits>
+        <field>prime</field>
+        <file>pseudo224.csv</file>
+        <desc>The field is not prime (but a Carmichael pseudoprime, see https://github.com/crocs-muni/fooling-primality-tests/).</desc>
+    </curve>
+    <curve>
+        <id>pseudo256</id>
+        <bits>256</bits>
+        <field>prime</field>
+        <file>pseudo256.csv</file>
+        <desc>The field is not prime (but a Carmichael pseudoprime, see https://github.com/crocs-muni/fooling-primality-tests/).</desc>
+    </curve>
+    <curve>
+        <id>pseudo384</id>
+        <bits>384</bits>
+        <field>prime</field>
+        <file>pseudo384.csv</file>
+        <desc>The field is not prime (but a Carmichael pseudoprime, see https://github.com/crocs-muni/fooling-primality-tests/).</desc>
+    </curve>
+    <curve>
+        <id>pseudo512</id>
+        <bits>512</bits>
+        <field>prime</field>
+        <file>pseudo512.csv</file>
+        <desc>The field is not prime (but a Carmichael pseudoprime, see https://github.com/crocs-muni/fooling-primality-tests/).</desc>
+    </curve>
+    <curve>
+        <id>pseudo521</id>
+        <bits>521</bits>
+        <field>prime</field>
+        <file>pseudo521.csv</file>
+        <desc>The field is not prime (but a Carmichael pseudoprime, see https://github.com/crocs-muni/fooling-primality-tests/).</desc>
+    </curve>
 </curves>

common/src/main/resources/cz/crcs/ectester/data/wrong/pseudo192.csv

@@ -0,0 +1 @@
+0xf7601c102e5605a4510b865b28287060ae6002956371b4f7,0x429c8107ce7063a45234aeadd30c021acc6bdaff6531af7d,0x9637284c287bc5c97c574dc8f91d03e5f58f516bfdb77601,0x1f7fe14d44df79fcfbd9225173d39784374bc08a80a8dc40,0xdb2ff34213f3214f1aa4e273e48efaf8362292f4e0ed0b9f,0xf7601c102487dad5b1e6fbcb61193546c31f16a71903f85d,0x0001

common/src/main/resources/cz/crcs/ectester/data/wrong/pseudo224.csv

@@ -0,0 +1 @@
+0xf54255f919b6fec4c9c9788c0dc432b8a50b7331e836a4fff9c5bc7f,0x270b8817bc48b1d56401abf8964e6fc785771d2a26130f8a572682f1,0xe28250a72ac83dd064b08cb83e8d2b678330d4dfd5193179088cb5cb,0xd0a2d469eda6a9c5bf9568459a02e2e65901f907f766891ad2a323cd,0x580e1fbfb94793f5880e36d6a2229c2fb082db0f3270f0b3ec4ce2a8,0xf54255f9581e15675cedd50065fa01410df6bfb6e17a2c69747246e5,0x0001

common/src/main/resources/cz/crcs/ectester/data/wrong/pseudo256.csv

@@ -0,0 +1 @@
+0x89ae5b1ffa52bd5a6e1e9627d2fef2b1658f5ae93ce0dabecead0f8cf294909b,0x35fe79c1bdac3f16080f6f763f1947c97fe841510d807e632fdb0abca45b539d,0x1da2a1152d54cc6d19da48bfbd8c31f6d7aba41fdbb744ef60c3ffb0a1b1b3cb,0x6ef9419070b90eaec6914e8c4809c3fe1c868b9857874abc4929321a021ef679,0x2391630ddc525199e2f65883d35623545cccd58496caa8b2e3fb8a84df6996e6,0x89ae5b1ffad4189f719eb3801d3a65986202d48cbab151d32b992e92dd589161,0x0001

common/src/main/resources/cz/crcs/ectester/data/wrong/pseudo384.csv

@@ -0,0 +1 @@
+0xbddc881aa619fc8a2f4dedb315f0b55c8c0cca4d7aac4e595c96504eb2e8860489bd824340028f49ca90272998729fe7,0x1595f6abcbb9bea724adb7df2129472f9f4d7ed83e2c9e7a52dc8cd12ef36b7a209f46afa553901d7ecf0d98618dabcf,0xb6bf3f61901462bf181b096d61aa7ee00310d110f739cbf95fccf7faa7f529052ee8758210a9d6c10de2790e4ab7f1e3,0x6525e4141411e472233e794116f285835ed743c77d21cac612c9b8a5000fa58407754ff242671f4ca8478b6bece46ad9,0x335f77556d279a9fd8701c26f14a13646b927d3ab86c165fafb5e3ee08f3797b819eb0eea2e6e3a569c63271c406d3bb,0xbddc881aa619fc85d46958aae14456922f956e5a8bf1d5f3f889d9d14ff5ae4ef373c260215503b442e5a6f88e1b609d,0x0001

common/src/main/resources/cz/crcs/ectester/data/wrong/pseudo512.csv

@@ -0,0 +1 @@
+0xd7489dfb959fd93de1b90bcdd949ea38d11c7e3637ab48f56fb1b2b34e6593fe3cf189e9c2f3166ddefc270747002d1914c558a23dceab08875e75a6b3b3c88f,0x15ae03d8fdf64becd183b64e8a235322be8342124a3e88ae8691ac7e635f424afad39da56169deb4ee25bfb4538054f6208f1bcb7abff14d6ea61ae9f8d2349b,0x7d22f3ece4a500edd384cae7de2f60377a6852e6d3a417374a881b0d83b8f747fba5106a011c76b2176916cd5fa68371c0ba0b2786b1dcdac80ad329b1a83f28,0x0aead0caddeda9ee70fe1976af1a96a410f96fbe65273a986bc88e3e7f3bd6e24d1dc728a04fecfd17e9ddfdfe9472359d39f877761dcdc73a0ee6514ba4894b,0x03f830aef9bfd770119e28a8de3f94119517508839df651129e8a6819c4e86df580179f97821d266d0e205f7536ab49cc04298aa88dde463d638689645188d86,0xd7489dfb959fd93de1b8fe30119d6f138fbeef529543d12c03f91d34c545a75197f79a0083650dbebee8fa12d39f2902101eed3f2e1963470d77dfe2204a02c7,0x0001

common/src/main/resources/cz/crcs/ectester/data/wrong/pseudo521.csv

@@ -0,0 +1 @@
+0x153212291c26fe063b78bbca97d35dda6b0b349fe3fc1d4dee21786fc85296e22d93ce855a2d3ed048498c6a1f378cea240f029df302cffb658efe9e12379629acb,0x5a4b83e21db14397282aab529b230058a165962eadf8e8f15703ca5b91501463fc8bf866d7f1a2ce785c4ff0c5797e20e3fb6952bd42e3421ed1c589b2853a0c30,0x1196a7bc6d754b0224fcace252f9056acebba295a7a0763a95fd0fa90cca4bbcc1d030cbee049d06e103bb28c8b870a1d5989d9c56870ff7fde969f3bfd0278fbf7,0xd74e5bf4d166a2d75d57d49be58f9bf3900bda81bbb283a8f311d9972c7cd1ed547403b52c657af133297f852f938b6a7ba8ef52c2ca8eb79799b15f7123c5d2af,0x7ed2303056596fb09cfade2ca0f691c515da266565ba5afa4700c6c6ed38091f3cf4fdc67ee1426b849bb9be26c1e8c3b53530fc4510dad8b7badc81bad7276c5b,0x153212291c26fe063b78bc114fd2c18a365faa9b5b3fecbb87c2690125099ddd8baa5052aa2fda7f14120d3d6af0ac185902f97bae06a009588286cf5ce93b1cce3,0x0001