You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/07/07 04:03:52 UTC

[shardingsphere] branch master updated: Refactor OptimizerContextTest (#18915)

This is an automated email from the ASF dual-hosted git repository.

zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 187e442ef45 Refactor OptimizerContextTest (#18915)
187e442ef45 is described below

commit 187e442ef451af9c3620a3b4455d4bfe258d78a2
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Jul 7 12:03:45 2022 +0800

    Refactor OptimizerContextTest (#18915)
---
 .../optimizer/context/OptimizerContextTest.java    | 25 ++++++++++------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/test/java/org/apache/shardingsphere/infra/federation/optimizer/context/OptimizerContextTest.java b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/test/java/org/apache/shardingsphere/infra/federation/optimizer/context/OptimizerContextTest.java
index 5ba9bbf512b..247714074aa 100644
--- a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/test/java/org/apache/shardingsphere/infra/federation/optimizer/context/OptimizerContextTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/test/java/org/apache/shardingsphere/infra/federation/optimizer/context/OptimizerContextTest.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.infra.federation.optimizer.context;
 
 import org.apache.shardingsphere.infra.database.type.dialect.H2DatabaseType;
 import org.apache.shardingsphere.infra.federation.optimizer.context.planner.OptimizerPlannerContext;
-import org.apache.shardingsphere.infra.federation.optimizer.metadata.FederationDatabaseMetaData;
 import org.apache.shardingsphere.infra.federation.optimizer.metadata.FederationSchemaMetaData;
 import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
 import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResource;
@@ -34,13 +33,23 @@ import java.util.Optional;
 
 import static org.hamcrest.CoreMatchers.not;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 
 public final class OptimizerContextTest {
     
+    @Test
+    public void assertDropDatabase() {
+        String databaseName = "foo_db";
+        String schemaName = "foo_schema";
+        ShardingSphereDatabase database = new ShardingSphereDatabase(databaseName,
+                new H2DatabaseType(), mock(ShardingSphereResource.class), null, Collections.singletonMap(schemaName, mock(ShardingSphereSchema.class)));
+        OptimizerContext optimizerContext = OptimizerContextFactory.create(Collections.singletonMap(databaseName, database), mock(ShardingSphereRuleMetaData.class));
+        optimizerContext.dropDatabase(databaseName);
+        assertFalse(optimizerContext.getFederationMetaData().getDatabases().containsKey(databaseName));
+    }
+    
     @Test
     public void assertAlterTable() {
         String databaseName = "foo_db";
@@ -75,16 +84,4 @@ public final class OptimizerContextTest {
         assertTrue(schemaMetadata.isPresent());
         assertFalse(schemaMetadata.get().getTables().containsKey(tableName));
     }
-    
-    @Test
-    public void assertDropDatabase() {
-        String databaseName = "foo_db";
-        String schemaName = "foo_schema";
-        ShardingSphereDatabase database = new ShardingSphereDatabase(databaseName, new H2DatabaseType(), mock(ShardingSphereResource.class),
-                null, Collections.singletonMap(schemaName, mock(ShardingSphereSchema.class)));
-        OptimizerContext optimizerContext = OptimizerContextFactory.create(Collections.singletonMap(databaseName, database), mock(ShardingSphereRuleMetaData.class));
-        optimizerContext.dropDatabase(databaseName);
-        FederationDatabaseMetaData federationDatabaseMetaData = optimizerContext.getFederationMetaData().getDatabases().get(databaseName);
-        assertNull(federationDatabaseMetaData);
-    }
 }