X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/6311e4f71d2aac179fa3841d47302cdb642e487d..30ab7d895a0230ae3aff5cfa49ea85d2926ffca1:/t/t-ec.py

diff --git a/t/t-ec.py b/t/t-ec.py
index 467ead5..b85105d 100644
--- a/t/t-ec.py
+++ b/t/t-ec.py
@@ -59,7 +59,8 @@ class TestCurvelessPoints (U.TestCase):
     me.assertRaises(ValueError, C.ECPt, "12345")
     me.assertRaises(ValueError, C.ECPt, "12345,")
     me.assertRaises(ValueError, C.ECPt, "12345, xyzzy")
-    me.assertRaises(TypeError, C.ECPt, (1, 2, 3))
+    me.assertRaises(ValueError, C.ECPt, "12345, 67890!??")
+    me.assertRaises(ValueError, C.ECPt, (1, 2, 3))
     me.assertRaises(TypeError, C.ECPt, 1, 2, 3)
     me.assertRaises(TypeError, C.ECPt, 1234)
     me.assertRaises(TypeError, C.ECPt, object())
@@ -92,7 +93,9 @@ class TestCurvelessPoints (U.TestCase):
     me.assertRaises(ValueError, C.ECPt.frombuf, C.bytes("0001fe000201"))
 
     ## String conversion and parsing.
+    me.assertEqual(str(P), "(254, 291)")
     me.assertEqual(C.ECPt.parse("254, 291)"), (P, ")"))
+    me.assertEqual(C.ECPt.parse("(254, 291)"), (P, ""))
     me.assertRaises(ValueError, C.ECPt.parse, "(254, 291")
 
 ###--------------------------------------------------------------------------
@@ -144,6 +147,7 @@ class TestCurves (T.GenericTestMixin):
     me.assertEqual(E("%s, %s" % (P.ix, P.iy)), P)
     me.assertRaises(ValueError, E, "1234")
     me.assertRaises(ValueError, E, "1234,")
+    me.assertRaises(ValueError, E, "1234, 5678?")
     me.assertRaises(TypeError, E, 1, None)
     Q = E(P.ix); me.assertTrue(Q == P or Q == -P)
     for i in T.range(128):
@@ -180,7 +184,8 @@ class TestCurves (T.GenericTestMixin):
     me.assertRaises(TypeError, T.add, Q.point, R.point)
     me.assertRaises(TypeError, T.mul, kk(1), Q)
     me.assertEqual(Q - R, 11*P)
-    #me.assertEqual(P*l(17), Q)
+    me.assertEqual(l(17)*P, Q)
+    me.assertEqual(P*l(17), Q)
 
     ## Ordering.
     me.assertTrue(P == P)
@@ -237,6 +242,7 @@ class TestCurves (T.GenericTestMixin):
 
     ## Simultaneous multiplication.
     Q, R, S = 5*P, 7*P, 11*P
+    me.assertEqual(E.mmul(set([(Q, 9), (R, 8), (S, 5)])), 156*P)
     me.assertEqual(E.mmul([Q, 9, R, 8, S, 5]), 156*P)
     me.assertEqual(E.mmul(Q, 9, R, 8, S, 5), 156*P)
 
@@ -246,7 +252,7 @@ class TestCurves (T.GenericTestMixin):
 
   def test_tinycurves(me):
     me._test_curve(C.ECInfo(E, 2*P, 13, 2), checkfail = True)
-    ei, _ = C.ECInfo.parse("binpoly: 0x13; bin: 0x01, 0x08; 0x02, 0x0c: 5*4")
+    ei = C.ECInfo.fromstring("binpoly: 0x13; bin: 0x01, 0x08; 0x02, 0x0c: 5*4")
     me._test_curve(ei, checkfail = True)
 
 TestCurves.generate_testcases((name, C.eccurves[name]) for name in