[test] Rename to RESTSimpleTableTest and RESTCatalogTest

Author: JingsongLi

…che/paimon/rest/RESTCatalogMockTest.java …che/paimon/rest/MockRESTCatalogTest.javapaimon-core/src/test/java/org/apache/paimon/rest/RESTCatalogMockTest.java renamed to paimon-core/src/test/java/org/apache/paimon/rest/MockRESTCatalogTest.java paimon-core/src/test/java/org/apache/paimon/rest/RESTCatalogMockTest.java renamed to paimon-core/src/test/java/org/apache/paimon/rest/MockRESTCatalogTest.java

@@ -51,10 +51,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /** Test REST Catalog on Mocked REST server. */
-class RESTCatalogMockTest extends RESTCatalogTestBase {
+class MockRESTCatalogTest extends RESTCatalogTest {
 
     private RESTCatalogServer restCatalogServer;
-    private final String initToken = "init_token";
     private final String serverDefineHeaderName = "test-header";
     private final String serverDefineHeaderValue = "test-value";
     private String dataPath;
@@ -66,6 +65,7 @@ class RESTCatalogMockTest extends RESTCatalogTestBase {
     public void setUp() throws Exception {
         super.setUp();
         dataPath = warehouse;
+        String initToken = "init_token";
         this.authProvider = new BearTokenAuthProvider(initToken);
         this.authMap =
                 ImmutableMap.of(

…le/SimpleTableInRESTCatalogMockTest.java …paimon/rest/MockRESTSimpleTableTest.javapaimon-core/src/test/java/org/apache/paimon/table/SimpleTableInRESTCatalogMockTest.java renamed to paimon-core/src/test/java/org/apache/paimon/rest/MockRESTSimpleTableTest.java paimon-core/src/test/java/org/apache/paimon/table/SimpleTableInRESTCatalogMockTest.java renamed to paimon-core/src/test/java/org/apache/paimon/rest/MockRESTSimpleTableTest.java

@@ -16,15 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.paimon.table;
+package org.apache.paimon.rest;
 
 import org.apache.paimon.catalog.CatalogContext;
 import org.apache.paimon.options.CatalogOptions;
 import org.apache.paimon.options.Options;
-import org.apache.paimon.rest.RESTCatalog;
-import org.apache.paimon.rest.RESTCatalogInternalOptions;
-import org.apache.paimon.rest.RESTCatalogOptions;
-import org.apache.paimon.rest.RESTCatalogServer;
 import org.apache.paimon.rest.auth.AuthProvider;
 import org.apache.paimon.rest.auth.AuthProviderEnum;
 import org.apache.paimon.rest.auth.BearTokenAuthProvider;
@@ -35,8 +31,8 @@
 import java.io.IOException;
 import java.util.UUID;
 
-/** test table in rest catalog. */
-public class SimpleTableInRESTCatalogMockTest extends SimpleTableInRESTCatalogTestBase {
+/** Base simple table test in mock rest catalog. */
+public class MockRESTSimpleTableTest extends RESTSimpleTableTest {
 
     @Override
     protected RESTCatalog createRESTCatalog() throws IOException {

…che/paimon/rest/RESTCatalogTestBase.java …/apache/paimon/rest/RESTCatalogTest.javapaimon-core/src/test/java/org/apache/paimon/rest/RESTCatalogTestBase.java renamed to paimon-core/src/test/java/org/apache/paimon/rest/RESTCatalogTest.java paimon-core/src/test/java/org/apache/paimon/rest/RESTCatalogTestBase.java renamed to paimon-core/src/test/java/org/apache/paimon/rest/RESTCatalogTest.java

@@ -87,7 +87,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /** Base test class for {@link RESTCatalog}. */
-public abstract class RESTCatalogTestBase extends CatalogTestBase {
+public abstract class RESTCatalogTest extends CatalogTestBase {
 
     protected ConfigResponse config;
     protected Options options = new Options();

…le/SimpleTableInRESTCatalogTestBase.java …che/paimon/rest/RESTSimpleTableTest.javapaimon-core/src/test/java/org/apache/paimon/table/SimpleTableInRESTCatalogTestBase.java renamed to paimon-core/src/test/java/org/apache/paimon/rest/RESTSimpleTableTest.java paimon-core/src/test/java/org/apache/paimon/table/SimpleTableInRESTCatalogTestBase.java renamed to paimon-core/src/test/java/org/apache/paimon/rest/RESTSimpleTableTest.java

@@ -16,17 +16,18 @@
  * limitations under the License.
  */
 
-package org.apache.paimon.table;
+package org.apache.paimon.rest;
 
 import org.apache.paimon.catalog.Identifier;
 import org.apache.paimon.fs.local.LocalFileIO;
 import org.apache.paimon.options.Options;
-import org.apache.paimon.rest.RESTCatalog;
 import org.apache.paimon.schema.Schema;
 import org.apache.paimon.schema.SchemaChange;
 import org.apache.paimon.schema.SchemaManager;
 import org.apache.paimon.schema.SchemaUtils;
 import org.apache.paimon.schema.TableSchema;
+import org.apache.paimon.table.FileStoreTable;
+import org.apache.paimon.table.SimpleTableTestBase;
 import org.apache.paimon.types.RowType;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -41,8 +42,9 @@
 import static org.apache.paimon.CoreOptions.BUCKET;
 import static org.apache.paimon.CoreOptions.BUCKET_KEY;
 
-/** base test table in rest catalog. */
-public abstract class SimpleTableInRESTCatalogTestBase extends SimpleTableTestBase {
+/** Base simple table test in rest catalog. */
+public abstract class RESTSimpleTableTest extends SimpleTableTestBase {
+
     protected RESTCatalog restCatalog;
     protected String dataPath;