Repository: cassandra
Updated Branches:
  refs/heads/trunk ba71c4707 -> 70b51ff32


ninja fix MessagePayloadTest


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/70b51ff3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70b51ff3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70b51ff3

Branch: refs/heads/trunk
Commit: 70b51ff327ec5d984f14e5fdb7862ed50dcd92b4
Parents: ba71c47
Author: Robert Stupp <sn...@snazy.de>
Authored: Mon Apr 6 19:20:47 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Mon Apr 6 19:20:47 2015 +0200

----------------------------------------------------------------------
 .../cassandra/transport/MessagePayloadTest.java     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/70b51ff3/test/unit/org/apache/cassandra/transport/MessagePayloadTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/transport/MessagePayloadTest.java 
b/test/unit/org/apache/cassandra/transport/MessagePayloadTest.java
index afb738a..1049d63 100644
--- a/test/unit/org/apache/cassandra/transport/MessagePayloadTest.java
+++ b/test/unit/org/apache/cassandra/transport/MessagePayloadTest.java
@@ -210,9 +210,9 @@ public class MessagePayloadTest extends CQLTester
                     client.execute(queryMessage);
                     Assert.fail();
                 }
-                catch (ProtocolException e)
+                catch (RuntimeException e)
                 {
-                    // that's what we want
+                    Assert.assertTrue(e.getCause() instanceof 
ProtocolException);
                 }
                 queryMessage.setCustomPayload(null);
                 client.execute(queryMessage);
@@ -225,9 +225,9 @@ public class MessagePayloadTest extends CQLTester
                     client.execute(prepareMessage);
                     Assert.fail();
                 }
-                catch (ProtocolException e)
+                catch (RuntimeException e)
                 {
-                    // that's what we want
+                    Assert.assertTrue(e.getCause() instanceof 
ProtocolException);
                 }
                 prepareMessage.setCustomPayload(null);
                 ResultMessage.Prepared prepareResponse = 
(ResultMessage.Prepared) client.execute(prepareMessage);
@@ -241,9 +241,9 @@ public class MessagePayloadTest extends CQLTester
                     client.execute(executeMessage);
                     Assert.fail();
                 }
-                catch (ProtocolException e)
+                catch (RuntimeException e)
                 {
-                    // that's what we want
+                    Assert.assertTrue(e.getCause() instanceof 
ProtocolException);
                 }
 
                 BatchMessage batchMessage = new 
BatchMessage(BatchStatement.Type.UNLOGGED,
@@ -258,9 +258,9 @@ public class MessagePayloadTest extends CQLTester
                     client.execute(batchMessage);
                     Assert.fail();
                 }
-                catch (ProtocolException e)
+                catch (RuntimeException e)
                 {
-                    // that's what we want
+                    Assert.assertTrue(e.getCause() instanceof 
ProtocolException);
                 }
             }
             finally

Reply via email to