[GNUnet-SVN] r21940 - in gnunet-java: src/org/gnunet/testing test/org test/org/gnunet/statistics

[gnunet]

Author: dold
Date: 2012-06-13 02:57:28 +0200 (Wed, 13 Jun 2012)
New Revision: 21940

Removed:
   gnunet-java/test/org/org/
Modified:
   gnunet-java/src/org/gnunet/testing/TestingSubsystem.java
   gnunet-java/test/org/gnunet/statistics/StatisticsTest.java
Log:
test

Modified: gnunet-java/src/org/gnunet/testing/TestingSubsystem.java
===================================================================
--- gnunet-java/src/org/gnunet/testing/TestingSubsystem.java    2012-06-13 
00:43:05 UTC (rev 21939)
+++ gnunet-java/src/org/gnunet/testing/TestingSubsystem.java    2012-06-13 
00:57:28 UTC (rev 21940)
@@ -33,6 +33,7 @@
 public class TestingSubsystem {
     private Process p;
     private BufferedReader reader;
+    private BufferedReader errReader;
     private OutputStreamWriter writer;
     private Configuration cfg;
 
@@ -47,6 +48,7 @@
             throw new TestingSetup.SetupException(e);
         }
         reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
+        errReader = new BufferedReader(new 
InputStreamReader(p.getErrorStream()));
 
         writer = new OutputStreamWriter(p.getOutputStream());
 
@@ -89,7 +91,7 @@
             throw new TestingSetup.SetupException(e);
         }
         if (p.exitValue() != 0) {
-            throw new TestingSetup.SetupException("wrong exit value");
+            throw new TestingSetup.SetupException("failed, got error message 
from wrapper");
         }
     }
 

Modified: gnunet-java/test/org/gnunet/statistics/StatisticsTest.java
===================================================================
--- gnunet-java/test/org/gnunet/statistics/StatisticsTest.java  2012-06-13 
00:43:05 UTC (rev 21939)
+++ gnunet-java/test/org/gnunet/statistics/StatisticsTest.java  2012-06-13 
00:57:28 UTC (rev 21940)
@@ -113,6 +113,14 @@
         stat1.update("gnj-test", "test3", 5, true);
         stat1.update("gnj-test", "test3", -1, true);
 
+
+        try {
+            // wait for the values to be set
+            Thread.sleep(200);
+        } catch (InterruptedException e) {
+            Assert.fail();
+        }
+
         stat1.destroy();
 
         System.out.println("starting get tests");
@@ -156,6 +164,7 @@
             @Override
             public void run(Scheduler.RunContext ctx) {
                 stat.set("gnj-test", "test", 42, false);
+                System.out.println("set 1");
             }
         });
 
@@ -163,6 +172,7 @@
             @Override
             public void run(Scheduler.RunContext ctx) {
                 stat.set("gnj-test", "test", 43, false);
+                System.out.println("set 2");
             }
         });
 
@@ -170,6 +180,7 @@
             @Override
             public void run(Scheduler.RunContext ctx) {
                 ts.restart();
+                System.out.println("restart");
             }
         });
 
@@ -179,6 +190,7 @@
                 ts.restart();
                 System.out.println("restarted!!!!!");
                 stat.set("gnj-test", "test", 43, false);
+                System.out.println("set 3");
             }
         });
 
@@ -187,6 +199,7 @@
             public void run(Scheduler.RunContext ctx) {
                 ts.restart();
                 stat.set("gnj-test", "test", 42, false);
+                System.out.println("set 4");
             }
         });