From 40148a178bd9b74b731591aa46b4158efb16b742 Mon Sep 17 00:00:00 2001 From: Dave Brosius Date: Thu, 8 Feb 2018 17:49:40 -0500 Subject: [PATCH] fix test due to change in exception message --- test/unit/org/apache/cassandra/cql3/ViewComplexTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java b/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java index d0f80f815b..464cc39d6b 100644 --- a/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java +++ b/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java @@ -424,7 +424,7 @@ public class ViewComplexTest extends CQLTester { execute("USE " + keyspace()); executeNet(protocolVersion, "USE " + keyspace()); - createTable("CREATE TABLE %s (k int, c int, a int, b int, l list, s set, m map, PRIMARY KEY (k, c))"); + String baseTableName = createTable("CREATE TABLE %s (k int, c int, a int, b int, l list, s set, m map, PRIMARY KEY (k, c))"); createView("mv", "CREATE MATERIALIZED VIEW %s AS SELECT a, b FROM %%s WHERE k IS NOT NULL AND c IS NOT NULL PRIMARY KEY (c, k)"); Keyspace ks = Keyspace.open(keyspace()); @@ -460,7 +460,7 @@ public class ViewComplexTest extends CQLTester assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s"), row(1, 1, null, null)); assertRowsIgnoringOrder(execute("SELECT * from mv"), row(1, 1, null, null)); - assertInvalidMessage("Cannot drop column m on base table with materialized views", "ALTER TABLE %s DROP m"); + assertInvalidMessage("Cannot drop column m on base table " + baseTableName + " with materialized views", "ALTER TABLE %s DROP m"); // executeNet(protocolVersion, "ALTER TABLE %s DROP m"); // ks.getColumnFamilyStore("mv").forceMajorCompaction(); // assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s WHERE k = 1 AND c = 1"));