- fix scheduler

- thread-safe scheduler
- work on voting

2 files changed, 62 insertions, 15 deletions

diff --git a/src/test/java/org/gnunet/testbed/TestbedTest.java b/src/test/java/org/gnunet/testbed/TestbedTest.java
index 4e1af03..732e4d4 100644
--- a/src/test/java/org/gnunet/testbed/TestbedTest.java
+++ b/src/test/java/org/gnunet/testbed/TestbedTest.java
@@ -1,22 +1,22 @@
 package org.gnunet.testbed;
 
 
+import org.gnunet.testbed.callbacks.ControllerEventCallback;
+import org.gnunet.testbed.callbacks.ControllerStatusCallback;
+import org.gnunet.testbed.callbacks.PeerCreateCallback;
 import org.gnunet.testing.TestingFixture;
 import org.gnunet.util.Configuration;
 import org.gnunet.util.Program;
-import org.gnunet.util.Scheduler;
 import org.gnunet.util.Wrapper;
 import org.junit.Assert;
 import org.junit.Test;
 
 public class TestbedTest extends TestingFixture {
 
-
     @Test
     public void test_controller_proc() {
         final Wrapper<Boolean> success = new Wrapper<Boolean>(false);
-        new Program() {
-
+        new Program("-LDEBUG") {
             @Override
             public void run() {
                 // use local peer's config, does that really make sense?
@@ -31,11 +31,59 @@ public class TestbedTest extends TestingFixture {
                     @Override
                     public void onStartupFailure() {
                         Assert.fail();
-                        //To change body of implemented methods use File | Settings | File Templates.
                     }
                 });
             }
         }.start();
         Assert.assertTrue(success.get());
     }
+
+
+
+
+    @Test
+    public void test_peer_create() {
+        new Program("-LDEBUG") {
+            ControllerProc cp;
+            Host h;
+            Controller c;
+
+            class CEC extends ControllerEventCallback {
+            }
+
+            class PCB implements PeerCreateCallback {
+                @Override
+                public void onPeerCreated(Controller.Peer peer) {
+                    System.out.println("peer created!");
+                    c.disconnect();
+                    cp.stop();
+                }
+
+                @Override
+                public void onError(String errorMessage) {
+                    Assert.fail();
+                }
+            }
+
+            @Override
+            public void run() {
+                // use local peer's config, does that really make sense?
+                h = new Host(null, null, getConfiguration(), 0);
+                cp = new ControllerProc();
+                cp.start("127.0.0.1", h, new ControllerStatusCallback() {
+                    @Override
+                    public void onStartupSuccess(Configuration cfg) {
+                        System.out.println("startup success");
+                        c = new Controller(h, 1 | 2 | 4 | 8 | 32, new CEC());
+                        // FIXME: use config from resource
+                        c.createPeer(h, getConfiguration(), new PCB());
+                    }
+                    @Override
+                    public void onStartupFailure() {
+                        Assert.fail();
+                    }
+                });
+            }
+        }.start();
+    }
 }
diff --git a/src/test/java/org/gnunet/util/CryptoECCTest.java b/src/test/java/org/gnunet/util/CryptoECCTest.java
index cc88409..c4c85d2 100644
--- a/src/test/java/org/gnunet/util/CryptoECCTest.java
+++ b/src/test/java/org/gnunet/util/CryptoECCTest.java
@@ -14,7 +14,7 @@ public class CryptoECCTest {
     public void test_sign_success() {
         Random r = new Random();
         // the test uses random data, repeat it multiple times!
-        for (int i = 0; i < 10; i++) {
+        for (int i = 0; i < 5; i++) {
             byte[] msg = new byte[16];
             r.nextBytes(msg);
 
@@ -22,11 +22,11 @@ public class CryptoECCTest {
             privateKey.d = new byte[32];
             r.nextBytes(privateKey.d);
             CryptoECC.PublicKey publicKey = CryptoECC.computePublicKey(privateKey);
-
+            System.out.println("gen");
             CryptoECC.Signature sig = CryptoECC.sign(msg, privateKey, publicKey);
-
+            System.out.println("sign");
             boolean valid = CryptoECC.verify(sig, msg, publicKey);
-
+            System.out.println("verify");
             Assert.assertTrue(valid);
         }
     }
@@ -38,21 +38,20 @@ public class CryptoECCTest {
     public void test_sign_failure() {
         Random r = new Random();
         // the test uses random data, repeat it multiple times!
-        for (int i = 0; i < 10; i++) {
+        for (int i = 0; i < 5; i++) {
             byte[] msg = new byte[16];
             r.nextBytes(msg);
-
             CryptoECC.PrivateKey privateKey = new CryptoECC.PrivateKey();
             privateKey.d = new byte[32];
             r.nextBytes(privateKey.d);
             CryptoECC.PublicKey publicKey = CryptoECC.computePublicKey(privateKey);
-
+            System.out.println("gen");
             CryptoECC.Signature sig = CryptoECC.sign(msg, privateKey, publicKey);
-
+            System.out.println("sign");
+            // corrupt the message
             msg[0] = (byte) (msg[0] + 1);
-
             boolean valid = CryptoECC.verify(sig, msg, publicKey);
-
+            System.out.println("verify");
             Assert.assertFalse(valid);
         }
     }