ZOOKEEPER-1328. Misplaced assertion for the test case 'FLELostMessageTest' and not identifying misfunctions. (Rakesh R via mahadev)

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

CHANGES.txt

@@ -231,6 +231,9 @@ BUGFIXES:
 
   ZOOKEEPER-1481 allow the C cli to run exists with a watcher (phunt via michim)
 
+  ZOOKEEPER-1328. Misplaced assertion for the test case 'FLELostMessageTest'
+  and not identifying misfunctions. (Rakesh R via mahadev)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

src/java/main/org/apache/zookeeper/Environment.java

@@ -30,7 +30,7 @@ import org.slf4j.Logger;
  *
  */
 public class Environment {
-    public static String JAAS_CONF_KEY = "java.security.auth.login.config";
+    public static final String JAAS_CONF_KEY = "java.security.auth.login.config";
 
     public static class Entry {
         private String k;

src/java/test/org/apache/zookeeper/test/FLEBackwardElectionRoundTest.java

@@ -134,6 +134,9 @@ public class FLEBackwardElectionRoundTest extends ZKTestCase {
          * Run another instance of leader election.
          */
         thread.join(5000);
+        Assert.assertTrue("State is not leading. Current state:"
+                + peer.getPeerState(),
+                peer.getPeerState() == ServerState.LEADING);
         thread = new FLETestUtils.LEThread(peer, 0);
         thread.start();
         
@@ -145,7 +148,9 @@ public class FLEBackwardElectionRoundTest extends ZKTestCase {
         
         
         thread.join(5000);
-        
+        Assert.assertTrue("State is not looking. Current state:"
+                + peer.getPeerState(),
+                peer.getPeerState() == ServerState.LOOKING);
         if (!thread.isAlive()) {
             Assert.fail("Should not have joined");
         }

src/java/test/org/apache/zookeeper/test/FLELostMessageTest.java

@@ -91,6 +91,9 @@ public class FLELostMessageTest extends ZKTestCase {
          */
         mockServer();
         thread.join(5000);
+        Assert.assertTrue("State is not leading. Current state:"
+                + peer.getPeerState(),
+                peer.getPeerState() == ServerState.LEADING);
         if (thread.isAlive()) {
             Assert.fail("Threads didn't join");
         }

src/java/test/org/apache/zookeeper/test/FLETestUtils.java

@@ -65,8 +65,7 @@ public class FLETestUtils {
                 peer.setCurrentVote(v);
 
                 LOG.info("Finished election: " + i + ", " + v.getId());
-
-                Assert.assertTrue("State is not leading.", peer.getPeerState() == ServerState.LEADING);
+                LOG.info("QuorumPeer state: " + peer.getPeerState());
             } catch (Exception e) {
                 e.printStackTrace();
             }