From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 28 Sep 2011 20:36:42 +0000 (+0000)
Subject: Improve TestGroupChannelMemberArrival
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=269978fb82bed026b43344ec5c21867901704ff8;p=tomcat7.0

Improve TestGroupChannelMemberArrival
1. Add synchronization when accessing TestMbrListener.members.
This should fix the failures observed by Gump.
2. Remove unused method #clear().
3. Improve messages printed to System.out during the test:
- Add timestamps
- Add hash code of threads (because thread names are not unique: They all are either "Membership-MemberAdded." or "Membership-MemberDisappeared.").
- Add current length of members list
4. Print messages when memberAdded()/memberDisappeared() performed no work.
That is if notification arrives twice for the same Member. I have not observed such events when running the tests.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1177050 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java b/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
index 9ee22aec0..d871daa27 100644
--- a/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
+++ b/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
@@ -41,13 +41,6 @@ public class TestGroupChannelMemberArrival {
             channels[i].getMembershipService().setPayload( ("Channel-" + (i + 1)).getBytes("ASCII"));
             listeners[i] = new TestMbrListener( ("Listener-" + (i + 1)));
             channels[i].addMembershipListener(listeners[i]);
-
-        }
-    }
-
-    public void clear() {
-        for (int i = 0; i < channels.length; i++) {
-            listeners[i].members.clear();
         }
     }
 
@@ -70,11 +63,24 @@ public class TestGroupChannelMemberArrival {
             };
             threads[i] = t;
         }
-        for (int i=0; i<threads.length; i++ ) threads[i].start();
-        for (int i=0; i<threads.length; i++ ) threads[i].join();
+        for (int i = 0; i < threads.length; i++) {
+            threads[i].start();
+        }
+        for (int i = 0; i < threads.length; i++) {
+            threads[i].join();
+        }
         Thread.sleep(2000);
-        System.out.println("All channels started.");
-        for (int i=listeners.length-1; i>=0; i-- ) assertEquals("Checking member arrival length",channels.length-1,listeners[i].members.size());
+        System.out.println(System.currentTimeMillis()
+                + " All channels started.");
+        for (int i = listeners.length - 1; i >= 0; i--) {
+            TestMbrListener listener = listeners[i];
+            synchronized (listener.members) {
+                assertEquals("Checking member arrival length (" + listener.name
+                        + ")", channels.length - 1, listener.members.size());
+            }
+        }
+        System.out.println(System.currentTimeMillis()
+                + " Members arrival counts checked.");
     }
 
     @After
@@ -96,31 +102,55 @@ public class TestGroupChannelMemberArrival {
             this.name = name;
         }
 
-        public ArrayList<Member> members = new ArrayList<Member>();
+        public ArrayList<Member> members = new ArrayList<Member>(1);
+
         @Override
         public void memberAdded(Member member) {
-            if (!members.contains(member)) {
-                members.add(member);
-                try {
-                    System.out.println(name + ":member added[" + new String(member.getPayload(), "ASCII") + "; Thread:"+Thread.currentThread().getName()+"]");
-                } catch (Exception x) {
-                    System.out.println(name + ":member added[unknown]");
+            String msg;
+            int count;
+            synchronized (members) {
+                if (!members.contains(member)) {
+                    members.add(member);
+                    msg = "member added";
+                } else {
+                    msg = "member added called, but member is already in the list";
                 }
+                count = members.size();
             }
+            report(msg, member, count);
         }
 
         @Override
         public void memberDisappeared(Member member) {
-            if (members.contains(member)) {
-                members.remove(member);
-                try {
-                    System.out.println(name + ":member disappeared[" + new String(member.getPayload(), "ASCII") + "; Thread:"+Thread.currentThread().getName()+"]");
-                } catch (Exception x) {
-                    System.out.println(name + ":member disappeared[unknown]");
+            String msg;
+            int count;
+            synchronized (members) {
+                if (members.contains(member)) {
+                    members.remove(member);
+                    msg = "member disappeared";
+                } else {
+                    msg = "member disappeared called, but there is no such member in the list";
                 }
+                count = members.size();
             }
+            report(msg, member, count);
         }
 
+        private void report(String event, Member member, int count) {
+            StringBuilder message = new StringBuilder(100);
+            message.append(System.currentTimeMillis()).append(' ').append(name)
+                    .append(':').append(event).append(", has ").append(count)
+                    .append(" members now. Member:[");
+            try {
+                message.append(new String(member.getPayload(), "ASCII"));
+            } catch (Exception x) {
+                message.append("unknown");
+            }
+            Thread t = Thread.currentThread();
+            message.append("]; Thread:").append(t.getName()).append(", hash:")
+                    .append(t.hashCode());
+            System.out.println(message);
+        }
     }
 
 }