ns

belaban · Feb 9, 2012 · 56ec291 · 56ec291
1 parent 6921978
commit 56ec291
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/tests/junit-functional/org/jgroups/protocols/NAKACK_StressTest.java b/tests/junit-functional/org/jgroups/protocols/NAKACK_StressTest.java
@@ -34,11 +34,11 @@ public class NAKACK_StressTest {
     static final short NAKACK_ID=ClassConfigurator.getProtocolId(NAKACK2.class);
 
 
-    public static void stressTest() {
+    public static void testStress() {
         start(NUM_THREADS, NUM_MSGS, false);
     }
 
-    public static void stressTestOOB() {
+    public static void testStressOOB() {
         start(NUM_THREADS, NUM_MSGS, true);
     }
 

diff --git a/tests/junit-functional/org/jgroups/tests/AckCollectorTest.java b/tests/junit-functional/org/jgroups/tests/AckCollectorTest.java
@@ -130,7 +130,7 @@ public void run() {
             }
         }.start();
         System.out.println("initial AckCollector: " + ac);
-        ac.waitForAllAcks(5000);
+        ac.waitForAllAcks(30000);
         System.out.println("new AckCollector: " + ac);
     }
 

diff --git a/tests/junit-functional/org/jgroups/tests/SeqnoComparatorTest.java b/tests/junit-functional/org/jgroups/tests/SeqnoComparatorTest.java
@@ -25,7 +25,7 @@ public static void testTwoSeqnos() {
     }
 
 
-    public static void compareDummyWithSeqnoRange() {
+    public static void testCompareDummyWithSeqnoRange() {
         Seqno s1=new Seqno(10, true), s2=new SeqnoRange(1, 100);
         assert comp.compare(s1, s2) == 0;
         s1=new Seqno(1, true);
@@ -40,7 +40,7 @@ public static void compareDummyWithSeqnoRange() {
         assert comp.compare(s1, s2) == 1;
     }
 
-    public static void compareDummyWithSeqno() {
+    public static void testCompareDummyWithSeqno() {
         Seqno s1=new Seqno(10, true), s2=new Seqno(10);
         assert comp.compare(s1, s2) == 0;
 
@@ -50,7 +50,7 @@ public static void compareDummyWithSeqno() {
         assert comp.compare(s1, s2) == 1;
     }
 
-    public static void compareSeqnoRangeWithDummy() {
+    public static void testCompareSeqnoRangeWithDummy() {
         Seqno s1=new SeqnoRange(1, 100), s2=new Seqno(10, true);
         assert comp.compare(s1, s2) == 0;
         s2=new Seqno(1, true);
@@ -66,7 +66,7 @@ public static void compareSeqnoRangeWithDummy() {
     }
 
 
-    public static void compareSeqnoWithDummy() {
+    public static void testCompareSeqnoWithDummy() {
         Seqno s1=new Seqno(10), s2=new Seqno(10, true);
         assert comp.compare(s1, s2) == 0;
 

diff --git a/tests/junit-functional/org/jgroups/tests/UtilTest.java b/tests/junit-functional/org/jgroups/tests/UtilTest.java
@@ -448,7 +448,7 @@ public static void testWriteString() throws Exception {
         Assert.assertEquals(s2, s4);
     }
 
-    public static void writeAddress() throws Exception {
+    public static void testWriteAddress() throws Exception {
         Address a1=Util.createRandomAddress();
         Address a2=Util.createRandomAddress();
         Address a4=Util.createRandomAddress();
@@ -468,7 +468,7 @@ public static void writeAddress() throws Exception {
         Assert.assertEquals(a4, Util.readAddress(dis));
     }
 
-    public static void writeNullAddress() throws Exception {
+    public static void testWriteNullAddress() throws Exception {
         Address a1=null;
         ByteArrayOutputStream outstream=new ByteArrayOutputStream();
         DataOutputStream dos=new DataOutputStream(outstream);
@@ -567,7 +567,7 @@ public static void testEncodeAndDecodeLongSequence() {
     }
 
 
-    public static String printBuffer(byte[] buf) {
+    static String printBuffer(byte[] buf) {
         StringBuilder sb=new StringBuilder();
         if(buf != null) {
             for(byte b: buf)

diff --git a/tests/junit/org/jgroups/tests/ConcurrentFlushTest.java b/tests/junit/org/jgroups/tests/ConcurrentFlushTest.java
@@ -24,7 +24,7 @@ void tearDown() throws Exception {
         Util.close(c3, c2, c1);
     }
 
-    public boolean useBlocking() {
+    protected boolean useBlocking() {
         return true;
     }
 

diff --git a/tests/junit/org/jgroups/tests/OverlappingUnicastMergeTest.java b/tests/junit/org/jgroups/tests/OverlappingUnicastMergeTest.java
@@ -162,7 +162,7 @@ private static void checkReceivedMessages(int num_ucasts, MyReceiver ... receive
         }
     }
 
-    public static String print(List<Message> list) {
+    static String print(List<Message> list) {
         StringBuilder sb=new StringBuilder();
         for(Message msg: list) {
             sb.append(msg.getSrc()).append(": ").append(msg.getObject()).append(" ");