From 6b885a44c39ff3abcd5cb6c6c44eaa4004979aa7 Mon Sep 17 00:00:00 2001
From: Ekaterina Dimitrova <ekaterina.dimitrova@datastax.com>
Date: Fri, 21 Jul 2023 11:09:02 -0400
Subject: [PATCH] Fix MemtableSizeTestBase#testSize (now
 MemtableSizeTest#testSize) was not running in CI

patch by Ekaterina Dimitrova; reviewed by Brandon Williams and Michael Semb Wever for CASSANDRA-18329
---
 .../cassandra/db/memtable/MemtableSizeHeapBuffersTest.java    | 2 +-
 .../cassandra/db/memtable/MemtableSizeOffheapBuffersTest.java | 2 +-
 .../cassandra/db/memtable/MemtableSizeOffheapObjectsTest.java | 2 +-
 .../{MemtableSizeTestBase.java => MemtableSizeTest.java}      | 4 ++--
 .../cassandra/db/memtable/MemtableSizeUnslabbedTest.java      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename test/unit/org/apache/cassandra/db/memtable/{MemtableSizeTestBase.java => MemtableSizeTest.java} (99%)

diff --git a/test/unit/org/apache/cassandra/db/memtable/MemtableSizeHeapBuffersTest.java b/test/unit/org/apache/cassandra/db/memtable/MemtableSizeHeapBuffersTest.java
index 4497e8cd8312..2d7febdb47c8 100644
--- a/test/unit/org/apache/cassandra/db/memtable/MemtableSizeHeapBuffersTest.java
+++ b/test/unit/org/apache/cassandra/db/memtable/MemtableSizeHeapBuffersTest.java
@@ -25,7 +25,7 @@
 import org.apache.cassandra.utils.memory.MemtablePool;
 import org.apache.cassandra.utils.memory.SlabPool;
 
-public class MemtableSizeHeapBuffersTest extends MemtableSizeTestBase
+public class MemtableSizeHeapBuffersTest extends MemtableSizeTest
 {
     // Overrides CQLTester.setUpClass to run before it
     @BeforeClass
diff --git a/test/unit/org/apache/cassandra/db/memtable/MemtableSizeOffheapBuffersTest.java b/test/unit/org/apache/cassandra/db/memtable/MemtableSizeOffheapBuffersTest.java
index 022f4f1792f1..b7d224eedb6d 100644
--- a/test/unit/org/apache/cassandra/db/memtable/MemtableSizeOffheapBuffersTest.java
+++ b/test/unit/org/apache/cassandra/db/memtable/MemtableSizeOffheapBuffersTest.java
@@ -25,7 +25,7 @@
 import org.apache.cassandra.utils.memory.MemtablePool;
 import org.apache.cassandra.utils.memory.SlabPool;
 
-public class MemtableSizeOffheapBuffersTest extends MemtableSizeTestBase
+public class MemtableSizeOffheapBuffersTest extends MemtableSizeTest
 {
     // Overrides CQLTester.setUpClass to run before it
     @BeforeClass
diff --git a/test/unit/org/apache/cassandra/db/memtable/MemtableSizeOffheapObjectsTest.java b/test/unit/org/apache/cassandra/db/memtable/MemtableSizeOffheapObjectsTest.java
index 559f456d14a9..5fa67fedbfea 100644
--- a/test/unit/org/apache/cassandra/db/memtable/MemtableSizeOffheapObjectsTest.java
+++ b/test/unit/org/apache/cassandra/db/memtable/MemtableSizeOffheapObjectsTest.java
@@ -25,7 +25,7 @@
 import org.apache.cassandra.utils.memory.MemtablePool;
 import org.apache.cassandra.utils.memory.NativePool;
 
-public class MemtableSizeOffheapObjectsTest extends MemtableSizeTestBase
+public class MemtableSizeOffheapObjectsTest extends MemtableSizeTest
 {
     // Overrides CQLTester.setUpClass to run before it
     @BeforeClass
diff --git a/test/unit/org/apache/cassandra/db/memtable/MemtableSizeTestBase.java b/test/unit/org/apache/cassandra/db/memtable/MemtableSizeTest.java
similarity index 99%
rename from test/unit/org/apache/cassandra/db/memtable/MemtableSizeTestBase.java
rename to test/unit/org/apache/cassandra/db/memtable/MemtableSizeTest.java
index 77605279b996..acbdc899936a 100644
--- a/test/unit/org/apache/cassandra/db/memtable/MemtableSizeTestBase.java
+++ b/test/unit/org/apache/cassandra/db/memtable/MemtableSizeTest.java
@@ -43,14 +43,14 @@
 // Note: This test can be run in idea with the allocation type configured in the test yaml and memtable using the
 // value memtableClass is initialized with.
 @RunWith(Parameterized.class)
-public abstract class MemtableSizeTestBase extends CQLTester
+public class MemtableSizeTest extends CQLTester
 {
     // Note: To see a printout of the usage for each object, add .enableDebug() here (most useful with smaller number of
     // partitions).
     static MemoryMeter meter = new MemoryMeter().ignoreKnownSingletons()
                                                 .withGuessing(MemoryMeter.Guess.FALLBACK_UNSAFE);
 
-    static final Logger logger = LoggerFactory.getLogger(MemtableSizeTestBase.class);
+    static final Logger logger = LoggerFactory.getLogger(MemtableSizeTest.class);
 
     static final int partitions = 50_000;
     static final int rowsPerPartition = 4;
diff --git a/test/unit/org/apache/cassandra/db/memtable/MemtableSizeUnslabbedTest.java b/test/unit/org/apache/cassandra/db/memtable/MemtableSizeUnslabbedTest.java
index b59a4749f089..67042bf85675 100644
--- a/test/unit/org/apache/cassandra/db/memtable/MemtableSizeUnslabbedTest.java
+++ b/test/unit/org/apache/cassandra/db/memtable/MemtableSizeUnslabbedTest.java
@@ -25,7 +25,7 @@
 import org.apache.cassandra.utils.memory.HeapPool;
 import org.apache.cassandra.utils.memory.MemtablePool;
 
-public class MemtableSizeUnslabbedTest extends MemtableSizeTestBase
+public class MemtableSizeUnslabbedTest extends MemtableSizeTest
 {
     // Overrides CQLTester.setUpClass to run before it
     @BeforeClass