You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/03/09 14:48:08 UTC

[shardingsphere] branch master updated: Revise #15918 (#15947)

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

panjuan 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 be98035  Revise #15918 (#15947)
be98035 is described below

commit be98035632ac5049cec34317ab3856c1646799c8
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed Mar 9 22:47:13 2022 +0800

    Revise #15918 (#15947)
---
 .../schema/builder/util/TableMetaDataUtilTest.java | 47 +++++-----------------
 1 file changed, 9 insertions(+), 38 deletions(-)

diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/builder/util/TableMetaDataUtilTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/builder/util/TableMetaDataUtilTest.java
index a7ee872..30cf606 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/builder/util/TableMetaDataUtilTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/builder/util/TableMetaDataUtilTest.java
@@ -17,56 +17,27 @@
 
 package org.apache.shardingsphere.infra.metadata.schema.builder.util;
 
+import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
+import org.apache.shardingsphere.infra.database.type.DatabaseType;
 import org.apache.shardingsphere.infra.metadata.schema.builder.SchemaBuilderMaterials;
-import org.apache.shardingsphere.infra.metadata.schema.builder.loader.TableMetaDataLoaderMaterial;
-import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
 import org.apache.shardingsphere.infra.rule.identifier.type.DataNodeContainedRule;
 import org.apache.shardingsphere.infra.rule.identifier.type.DataSourceContainedRule;
+import org.apache.shardingsphere.test.mock.MockedDataSource;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
 
-import javax.sql.DataSource;
-import java.util.Collection;
+import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Map;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.mock;
 
-@RunWith(MockitoJUnitRunner.class)
 public final class TableMetaDataUtilTest {
-
-    @Mock
-    private SchemaBuilderMaterials materials;
-
-    @Mock
-    private DataSourceContainedRule dataSourceContainedRule;
-
-    @Mock
-    private DataNodeContainedRule dataNodeContainedRule;
-
-    @Mock
-    private DataSource dataSource1;
-
-    @Mock
-    private DataSource dataSource2;
-
+    
     @Test
     public void assertGetTableMetaDataLoadMaterial() {
-        Collection<ShardingSphereRule> rules = new LinkedList<>();
-        rules.add(dataNodeContainedRule);
-        rules.add(dataSourceContainedRule);
-        when(materials.getRules()).thenReturn(rules);
-        Map<String, DataSource> dataSourceMap = new HashMap<>();
-        dataSourceMap.put("ds0", dataSource1);
-        dataSourceMap.put("ds1", dataSource2);
-        when(materials.getDataSourceMap()).thenReturn(dataSourceMap);
-        Collection<TableMetaDataLoaderMaterial> results = TableMetaDataUtil.getTableMetaDataLoadMaterial(Collections.singletonList("t_user"), materials, false);
-        assertThat(results.size(), is(1));
+        SchemaBuilderMaterials materials = new SchemaBuilderMaterials(mock(DatabaseType.class), 
+                Collections.singletonMap("foo_ds", new MockedDataSource()), Arrays.asList(mock(DataNodeContainedRule.class), mock(DataSourceContainedRule.class)), mock(ConfigurationProperties.class));
+        assertThat(TableMetaDataUtil.getTableMetaDataLoadMaterial(Collections.singleton("t_user"), materials, false).size(), is(1));
     }
 }