This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 c7ff730 Refactor GovernanceFacadeTest (#10344)
c7ff730 is described below
commit c7ff73042729d9e05fd67f34069b7bbca102f666
Author: Liang Zhang <[email protected]>
AuthorDate: Fri May 14 23:21:38 2021 +0800
Refactor GovernanceFacadeTest (#10344)
* Remove FieldUtil
* Remove useless TestAllRegistryCenterRepository
* Refactor GovernanceFacadeTest
* Rename RegistryCenterRepositoryFixture
---
.../governance/core/facade/GovernanceFacade.java | 8 +--
.../core/facade/GovernanceFacadeTest.java | 57 +++++++---------
...y.java => RegistryCenterRepositoryFixture.java} | 4 +-
.../fixture/TestRegistryCenterRepository.java | 77 ----------------------
.../governance/core/facade/util/FieldUtil.java | 45 -------------
...ernance.repository.spi.RegistryCenterRepository | 3 +-
6 files changed, 32 insertions(+), 162 deletions(-)
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacade.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacade.java
index 6bf04bd..98679e4 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacade.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacade.java
@@ -56,15 +56,15 @@ public final class GovernanceFacade implements
AutoCloseable {
isOverwrite = config.isOverwrite();
registryCenterRepository =
RegistryCenterRepositoryFactory.newInstance(config);
registryCenter = new RegistryCenter(registryCenterRepository);
- listenerManager = new
GovernanceListenerManager(registryCenterRepository, schemaNames.isEmpty()
- ? registryCenter.getAllSchemaNames() :
Stream.of(registryCenter.getAllSchemaNames(),
schemaNames).flatMap(Collection::stream).distinct().collect(Collectors.toList()));
+ listenerManager = new
GovernanceListenerManager(registryCenterRepository,
+ Stream.of(registryCenter.getAllSchemaNames(),
schemaNames).flatMap(Collection::stream).distinct().collect(Collectors.toList()));
}
/**
* Online instance.
*
- * @param dataSourceConfigMap schema data source configuration map
- * @param schemaRuleMap schema rule map
+ * @param dataSourceConfigMap schema and data source configuration map
+ * @param schemaRuleMap schema and rule map
* @param globalRuleConfigs global rule configurations
* @param props properties
*/
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacadeTest.java
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacadeTest.java
index 1c939a3..3a4f566 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacadeTest.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacadeTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.governance.core.facade;
-import org.apache.shardingsphere.governance.core.facade.util.FieldUtil;
+import lombok.SneakyThrows;
import org.apache.shardingsphere.governance.core.registry.RegistryCenter;
import
org.apache.shardingsphere.governance.core.registry.listener.GovernanceListenerManager;
import
org.apache.shardingsphere.governance.repository.api.config.GovernanceConfiguration;
@@ -25,69 +25,62 @@ import
org.apache.shardingsphere.governance.repository.api.config.RegistryCenter
import
org.apache.shardingsphere.governance.repository.spi.RegistryCenterRepository;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
-import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.Properties;
+import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-@RunWith(MockitoJUnitRunner.class)
public final class GovernanceFacadeTest {
private final GovernanceFacade governanceFacade = new GovernanceFacade();
- @Mock
- private RegistryCenterRepository registryCenterRepository;
-
- @Mock
- private RegistryCenter registryCenter;
-
- @Mock
- private GovernanceListenerManager listenerManager;
-
- @Before
- public void setUp() {
- GovernanceConfiguration governanceConfig = new
GovernanceConfiguration("test_name", new RegistryCenterConfiguration("ALL",
"127.0.0.1", new Properties()), false);
- governanceFacade.init(governanceConfig, Arrays.asList("sharding_db",
"replica_query_db"));
- FieldUtil.setField(governanceFacade, "registryCenterRepository",
registryCenterRepository);
- FieldUtil.setField(governanceFacade, "registryCenter", registryCenter);
- FieldUtil.setField(governanceFacade, "listenerManager",
listenerManager);
+ @Test
+ public void assertInit() {
+ GovernanceConfiguration config = new
GovernanceConfiguration("test_name", new RegistryCenterConfiguration("TEST",
"127.0.0.1", new Properties()), false);
+ governanceFacade.init(config, Arrays.asList("schema_0", "schema_1"));
+ assertNotNull(governanceFacade.getRegistryCenter());
+ // TODO use reflection to assert attributes of GovernanceFacade
}
@Test
- public void assertOnlineInstanceWithParameters() {
+ public void assertOnlineInstance() {
+ RegistryCenter registryCenter = mock(RegistryCenter.class);
+ GovernanceListenerManager listenerManager =
mock(GovernanceListenerManager.class);
+ setField(governanceFacade, "registryCenter", registryCenter);
+ setField(governanceFacade, "listenerManager", listenerManager);
Map<String, DataSourceConfiguration> dataSourceConfigMap =
Collections.singletonMap("test_ds", mock(DataSourceConfiguration.class));
Map<String, Collection<RuleConfiguration>> ruleConfigurationMap =
Collections.singletonMap("sharding_db",
Collections.singletonList(mock(RuleConfiguration.class)));
Collection<RuleConfiguration> globalRuleConfigs =
Collections.singleton(mock(RuleConfiguration.class));
Properties props = new Properties();
governanceFacade.onlineInstance(Collections.singletonMap("sharding_db",
dataSourceConfigMap), ruleConfigurationMap, globalRuleConfigs, props);
- verify(registryCenter).persistConfigurations("sharding_db",
dataSourceConfigMap, ruleConfigurationMap.get("sharding_db"), false);
verify(registryCenter).persistGlobalConfiguration(globalRuleConfigs,
props, false);
+ verify(registryCenter).persistConfigurations("sharding_db",
dataSourceConfigMap, ruleConfigurationMap.get("sharding_db"), false);
verify(registryCenter).persistInstanceOnline();
verify(registryCenter).persistDataNodes();
- verify(listenerManager).initListeners();
- }
-
- @Test
- public void assertOnlineInstanceWithoutParameters() {
- governanceFacade.onlineInstance();
- verify(registryCenter).persistInstanceOnline();
- verify(registryCenter).persistDataNodes();
+ verify(registryCenter).persistPrimaryNodes();
verify(listenerManager).initListeners();
}
@Test
public void assertClose() {
+ RegistryCenterRepository registryCenterRepository =
mock(RegistryCenterRepository.class);
+ setField(governanceFacade, "registryCenterRepository",
registryCenterRepository);
governanceFacade.close();
verify(registryCenterRepository).close();
}
+
+ @SneakyThrows(ReflectiveOperationException.class)
+ public static void setField(final Object target, final String fieldName,
final Object fieldValue) {
+ Field field = target.getClass().getDeclaredField(fieldName);
+ field.setAccessible(true);
+ field.set(target, fieldValue);
+ }
}
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestAllRegistryCenterRepository.java
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/RegistryCenterRepositoryFixture.java
similarity index 96%
rename from
shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestAllRegistryCenterRepository.java
rename to
shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/RegistryCenterRepositoryFixture.java
index 2902bdb..4361505 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestAllRegistryCenterRepository.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/RegistryCenterRepositoryFixture.java
@@ -25,7 +25,7 @@ import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
-public final class TestAllRegistryCenterRepository implements
RegistryCenterRepository {
+public final class RegistryCenterRepositoryFixture implements
RegistryCenterRepository {
@Override
public void init(final String name, final RegistryCenterConfiguration
config) {
@@ -72,6 +72,6 @@ public final class TestAllRegistryCenterRepository implements
RegistryCenterRepo
@Override
public String getType() {
- return "ALL";
+ return "TEST";
}
}
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestRegistryCenterRepository.java
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestRegistryCenterRepository.java
deleted file mode 100644
index b582acb..0000000
---
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestRegistryCenterRepository.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.governance.core.facade.fixture;
-
-import
org.apache.shardingsphere.governance.repository.spi.RegistryCenterRepository;
-import
org.apache.shardingsphere.governance.repository.api.config.RegistryCenterConfiguration;
-import
org.apache.shardingsphere.governance.repository.api.listener.DataChangedEventListener;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-public final class TestRegistryCenterRepository implements
RegistryCenterRepository {
-
- @Override
- public void init(final String name, final RegistryCenterConfiguration
config) {
- }
-
- @Override
- public String get(final String key) {
- return "";
- }
-
- @Override
- public List<String> getChildrenKeys(final String key) {
- return Collections.emptyList();
- }
-
- @Override
- public void persist(final String key, final String value) {
- }
-
- @Override
- public void persistEphemeral(final String key, final String value) {
- }
-
- @Override
- public void delete(final String key) {
- }
-
- @Override
- public void watch(final String key, final DataChangedEventListener
listener) {
- }
-
- @Override
- public boolean tryLock(final String key, final long time, final TimeUnit
unit) {
- return false;
- }
-
- @Override
- public void releaseLock(final String key) {
- }
-
- @Override
- public void close() {
- }
-
- @Override
- public String getType() {
- return "REG";
- }
-}
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/util/FieldUtil.java
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/util/FieldUtil.java
deleted file mode 100644
index fec9223..0000000
---
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/util/FieldUtil.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.governance.core.facade.util;
-
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import lombok.SneakyThrows;
-
-import java.lang.reflect.Field;
-
-/**
- * Field Utility.
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class FieldUtil {
-
- /**
- * Set field.
- *
- * @param target target to be settled
- * @param fieldName field name to be settled
- * @param fieldValue field value to be settled
- */
- @SneakyThrows(ReflectiveOperationException.class)
- public static void setField(final Object target, final String fieldName,
final Object fieldValue) {
- Field field = target.getClass().getDeclaredField(fieldName);
- field.setAccessible(true);
- field.set(target, fieldValue);
- }
-}
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.spi.RegistryCenterRepository
b/shardingsphere-governance/shardingsphere-governance-core/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.spi.RegistryCenterRepository
index d51af80..defa6ee 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.spi.RegistryCenterRepository
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.spi.RegistryCenterRepository
@@ -15,5 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.governance.core.facade.fixture.TestRegistryCenterRepository
-org.apache.shardingsphere.governance.core.facade.fixture.TestAllRegistryCenterRepository
+org.apache.shardingsphere.governance.core.facade.fixture.RegistryCenterRepositoryFixture
