This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit a42f922eed50d63d853c7bc054aee81f32c0b7d4
Merge: 14911e628b 666f7df803
Author: Bereng <berenguerbl...@gmail.com>
AuthorDate: Thu Jan 18 07:12:35 2024 +0100
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
Enhanced usage of test method names in CQLTester for better test debugging
test/unit/org/apache/cassandra/cql3/CQLTester.java | 49 +++++++++++++++++++---
...tabilityTest.java => JMXCompatibilityTest.java} | 3 +-
2 files changed, 45 insertions(+), 7 deletions(-)
diff --cc test/unit/org/apache/cassandra/cql3/CQLTester.java
index 965474a9c0,be3aa01dff..04b9b7b7e7
--- a/test/unit/org/apache/cassandra/cql3/CQLTester.java
+++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java
@@@ -177,8 -184,13 +181,13 @@@ import static org.apache.cassandra.conf
import static
org.apache.cassandra.config.CassandraRelevantProperties.TEST_REUSE_PREPARED;
import static
org.apache.cassandra.config.CassandraRelevantProperties.TEST_ROW_CACHE_SIZE;
import static
org.apache.cassandra.config.CassandraRelevantProperties.TEST_USE_PREPARED;
+ import static
org.apache.cassandra.cql3.SchemaElement.SchemaElementType.AGGREGATE;
+ import static
org.apache.cassandra.cql3.SchemaElement.SchemaElementType.FUNCTION;
+ import static
org.apache.cassandra.cql3.SchemaElement.SchemaElementType.MATERIALIZED_VIEW;
+ import static org.apache.cassandra.cql3.SchemaElement.SchemaElementType.TABLE;
+ import static org.apache.cassandra.cql3.SchemaElement.SchemaElementType.TYPE;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
