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 2025/02/27 13:49:24 UTC
(shardingsphere) branch master updated: Add YamlRuleConfigurationFixture (#34809)
This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 f0523a94fcf Add YamlRuleConfigurationFixture (#34809)
f0523a94fcf is described below
commit f0523a94fcf5ff8ff59471c93a400ba366302ce1
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Feb 27 21:49:18 2025 +0800
Add YamlRuleConfigurationFixture (#34809)
* Add YamlRuleConfigurationFixture
* Add YamlRuleConfigurationFixture
* Add YamlRuleConfigurationFixture
---
features/broadcast/core/pom.xml | 5 +++
mode/core/pom.xml | 6 +++
.../database/DatabaseRulePersistServiceTest.java | 10 ++---
...abaseRuleRepositoryTuplePersistServiceTest.java | 16 +++----
...atabaseYamlRuleConfigurationSwapperFixture.java | 51 ----------------------
.../global/GlobalRulePersistServiceTest.java | 18 ++++----
.../MetaDataYamlRuleConfigurationFixture.java | 36 ---------------
...onfig.swapper.rule.YamlRuleConfigurationSwapper | 2 -
mode/type/cluster/core/pom.xml | 6 +++
.../rule/RuleConfigurationChangedHandlerTest.java | 18 ++++----
.../fixture/YamlRuleConfigurationFixture.java | 44 -------------------
.../YamlRuleConfigurationSwapperFixture.java | 9 ++--
test/fixture/infra/pom.xml | 5 +++
.../test/fixture/infra/rule/MockedRule.java | 2 +-
.../infra/rule/MockedRuleConfiguration.java | 11 ++++-
.../infra/rule/global/MockedGlobalRule.java | 25 ++++++-----
.../rule/global/MockedGlobalRuleConfiguration.java | 10 +++--
.../infra/yaml/MockedYamlRuleConfiguration.java | 15 ++++---
.../yaml/MockedYamlRuleConfigurationSwapper.java | 20 +++++----
.../global/MockedYamlGlobalRuleConfiguration.java | 15 ++++---
.../MockedYamlGlobalRuleConfigurationSwapper.java | 30 +++++++------
...onfig.swapper.rule.YamlRuleConfigurationSwapper | 3 +-
22 files changed, 140 insertions(+), 217 deletions(-)
diff --git a/features/broadcast/core/pom.xml b/features/broadcast/core/pom.xml
index 08c53ed6c4c..fa174f62a40 100644
--- a/features/broadcast/core/pom.xml
+++ b/features/broadcast/core/pom.xml
@@ -38,6 +38,11 @@
<artifactId>shardingsphere-infra-route</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-mode-spi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-mode-node</artifactId>
diff --git a/mode/core/pom.xml b/mode/core/pom.xml
index 1e31f07776b..20ed386927c 100644
--- a/mode/core/pom.xml
+++ b/mode/core/pom.xml
@@ -44,6 +44,12 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-test-fixture-database</artifactId>
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistServiceTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistServiceTest.java
index 244c0f4f347..95d548e97ae 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistServiceTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistServiceTest.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.mode.metadata.persist.config.database;
import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
import org.apache.shardingsphere.mode.metadata.persist.fixture.NoTupleRuleConfigurationFixture;
-import org.apache.shardingsphere.mode.metadata.persist.fixture.MetaDataRuleConfigurationFixture;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
+import org.apache.shardingsphere.test.fixture.infra.rule.MockedRuleConfiguration;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -63,15 +63,15 @@ class DatabaseRulePersistServiceTest {
@Test
void assertPersistWithoutActiveVersion() {
- Collection<MetaDataVersion> actual = persistService.persist("foo_db", Arrays.asList(new MetaDataRuleConfigurationFixture("test"), new NoTupleRuleConfigurationFixture("test")));
+ Collection<MetaDataVersion> actual = persistService.persist("foo_db", Arrays.asList(new MockedRuleConfiguration("test"), new NoTupleRuleConfigurationFixture("test")));
assertThat(actual.size(), is(1));
assertThat(actual.iterator().next().getActiveVersion(), is(0));
}
@Test
void assertPersistWithActiveVersion() {
- when(repository.getChildrenKeys("/metadata/foo_db/rules/fixture/fixture/versions")).thenReturn(Collections.singletonList("10"));
- Collection<MetaDataVersion> actual = persistService.persist("foo_db", Collections.singleton(new MetaDataRuleConfigurationFixture("test")));
+ when(repository.getChildrenKeys("/metadata/foo_db/rules/fixture/unique/versions")).thenReturn(Collections.singletonList("10"));
+ Collection<MetaDataVersion> actual = persistService.persist("foo_db", Collections.singleton(new MockedRuleConfiguration("test")));
assertThat(actual.size(), is(1));
assertThat(actual.iterator().next().getActiveVersion(), is(10));
}
@@ -84,7 +84,7 @@ class DatabaseRulePersistServiceTest {
@Test
void assertDeleteWithRuleConfigurations() {
- Collection<MetaDataVersion> actual = persistService.delete("foo_db", Arrays.asList(new MetaDataRuleConfigurationFixture("test"), new NoTupleRuleConfigurationFixture("test")));
+ Collection<MetaDataVersion> actual = persistService.delete("foo_db", Arrays.asList(new MockedRuleConfiguration("test"), new NoTupleRuleConfigurationFixture("test")));
assertThat(actual.size(), is(1));
assertNull(actual.iterator().next().getActiveVersion());
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/database/RuleDatabaseRuleRepositoryTuplePersistServiceTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/database/RuleDatabaseRuleRepositoryTuplePersistServiceTest.java
index ba190973df5..c1a18f08a9d 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/database/RuleDatabaseRuleRepositoryTuplePersistServiceTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/database/RuleDatabaseRuleRepositoryTuplePersistServiceTest.java
@@ -50,17 +50,17 @@ class RuleDatabaseRuleRepositoryTuplePersistServiceTest {
@Test
void assertLoadWithChildrenPath() {
- when(repository.getChildrenKeys("/metadata/foo_db/rules")).thenReturn(Collections.singletonList("database_rule_fixture"));
- when(repository.query("/metadata/foo_db/rules/database_rule_fixture/unique/active_version")).thenReturn("0");
- when(repository.query("/metadata/foo_db/rules/database_rule_fixture/unique/versions/0")).thenReturn("unique_content");
- when(repository.getChildrenKeys("/metadata/foo_db/rules/database_rule_fixture/named")).thenReturn(Collections.singletonList("rule_item"));
- when(repository.query("/metadata/foo_db/rules/database_rule_fixture/named/rule_item/active_version")).thenReturn("0");
- when(repository.query("/metadata/foo_db/rules/database_rule_fixture/named/rule_item/versions/0")).thenReturn("named_content");
+ when(repository.getChildrenKeys("/metadata/foo_db/rules")).thenReturn(Collections.singletonList("fixture"));
+ when(repository.query("/metadata/foo_db/rules/fixture/unique/active_version")).thenReturn("0");
+ when(repository.query("/metadata/foo_db/rules/fixture/unique/versions/0")).thenReturn("unique_content");
+ when(repository.getChildrenKeys("/metadata/foo_db/rules/fixture/named")).thenReturn(Collections.singletonList("rule_item"));
+ when(repository.query("/metadata/foo_db/rules/fixture/named/rule_item/active_version")).thenReturn("0");
+ when(repository.query("/metadata/foo_db/rules/fixture/named/rule_item/versions/0")).thenReturn("named_content");
List<RuleRepositoryTuple> actual = new ArrayList<>(persistService.load("foo_db"));
assertThat(actual.size(), is(2));
- assertThat(actual.get(0).getKey(), is("/metadata/foo_db/rules/database_rule_fixture/unique"));
+ assertThat(actual.get(0).getKey(), is("/metadata/foo_db/rules/fixture/unique"));
assertThat(actual.get(0).getValue(), is("unique_content"));
- assertThat(actual.get(1).getKey(), is("/metadata/foo_db/rules/database_rule_fixture/named/rule_item"));
+ assertThat(actual.get(1).getKey(), is("/metadata/foo_db/rules/fixture/named/rule_item"));
assertThat(actual.get(1).getValue(), is("named_content"));
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/database/fixture/DatabaseYamlRuleConfigurationSwapperFixture.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/database/fixture/DatabaseYamlRuleConfigurationSwapperFixture.java
deleted file mode 100644
index b692f58eb0d..00000000000
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/database/fixture/DatabaseYamlRuleConfigurationSwapperFixture.java
+++ /dev/null
@@ -1,51 +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.mode.metadata.persist.config.database.fixture;
-
-import org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapper;
-
-public final class DatabaseYamlRuleConfigurationSwapperFixture implements YamlRuleConfigurationSwapper<DatabaseYamlRuleConfigurationFixture, DatabaseRuleConfigurationFixture> {
-
- @Override
- public DatabaseYamlRuleConfigurationFixture swapToYamlConfiguration(final DatabaseRuleConfigurationFixture data) {
- DatabaseYamlRuleConfigurationFixture result = new DatabaseYamlRuleConfigurationFixture();
- result.setUnique(data.getUnique());
- result.setNamed(data.getNamed());
- return result;
- }
-
- @Override
- public DatabaseRuleConfigurationFixture swapToObject(final DatabaseYamlRuleConfigurationFixture yamlConfig) {
- return new DatabaseRuleConfigurationFixture(yamlConfig.getUnique(), yamlConfig.getNamed());
- }
-
- @Override
- public String getRuleTagName() {
- return "DATABASE.RULE.FIXTURE";
- }
-
- @Override
- public int getOrder() {
- return -410;
- }
-
- @Override
- public Class<DatabaseRuleConfigurationFixture> getTypeClass() {
- return DatabaseRuleConfigurationFixture.class;
- }
-}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistServiceTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistServiceTest.java
index a9d82f2339f..c9631a36431 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistServiceTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistServiceTest.java
@@ -21,9 +21,9 @@ import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.spi.type.ordered.OrderedSPILoader;
import org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
import org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapper;
-import org.apache.shardingsphere.mode.metadata.persist.fixture.MetaDataYamlRuleConfigurationFixture;
import org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
+import org.apache.shardingsphere.test.fixture.infra.yaml.global.MockedYamlGlobalRuleConfiguration;
import org.apache.shardingsphere.test.mock.AutoMockExtension;
import org.apache.shardingsphere.test.mock.StaticMockSettings;
import org.junit.jupiter.api.BeforeEach;
@@ -81,12 +81,12 @@ class GlobalRulePersistServiceTest {
RuleConfiguration ruleConfig = mock(RuleConfiguration.class);
YamlRuleConfigurationSwapper swapper = mock(YamlRuleConfigurationSwapper.class);
when(OrderedSPILoader.getServices(YamlRuleConfigurationSwapper.class, Collections.singleton(ruleConfig))).thenReturn(Collections.singletonMap(ruleConfig, swapper));
- YamlRuleConfiguration yamlRuleConfig = new MetaDataYamlRuleConfigurationFixture();
+ YamlRuleConfiguration yamlRuleConfig = new MockedYamlGlobalRuleConfiguration();
when(swapper.swapToYamlConfiguration(ruleConfig)).thenReturn(yamlRuleConfig);
- when(repository.getChildrenKeys("/rules/fixture/versions")).thenReturn(Collections.singletonList("10"));
+ when(repository.getChildrenKeys("/rules/global_fixture/versions")).thenReturn(Collections.singletonList("10"));
globalRulePersistService.persist(Collections.singleton(ruleConfig));
- verify(repository).persist("/rules/fixture/versions/11", "{}" + System.lineSeparator());
- verify(repository, times(0)).persist("/rules/fixture/active_version", "0");
+ verify(repository).persist("/rules/global_fixture/versions/11", "{}" + System.lineSeparator());
+ verify(repository, times(0)).persist("/rules/global_fixture/active_version", "0");
}
@SuppressWarnings({"rawtypes", "unchecked"})
@@ -95,11 +95,11 @@ class GlobalRulePersistServiceTest {
RuleConfiguration ruleConfig = mock(RuleConfiguration.class);
YamlRuleConfigurationSwapper swapper = mock(YamlRuleConfigurationSwapper.class);
when(OrderedSPILoader.getServices(YamlRuleConfigurationSwapper.class, Collections.singleton(ruleConfig))).thenReturn(Collections.singletonMap(ruleConfig, swapper));
- YamlRuleConfiguration yamlRuleConfig = new MetaDataYamlRuleConfigurationFixture();
+ YamlRuleConfiguration yamlRuleConfig = new MockedYamlGlobalRuleConfiguration();
when(swapper.swapToYamlConfiguration(ruleConfig)).thenReturn(yamlRuleConfig);
- when(repository.getChildrenKeys("/rules/fixture/versions")).thenReturn(Collections.emptyList());
+ when(repository.getChildrenKeys("/rules/global_fixture/versions")).thenReturn(Collections.emptyList());
globalRulePersistService.persist(Collections.singleton(ruleConfig));
- verify(repository).persist("/rules/fixture/versions/0", "{}" + System.lineSeparator());
- verify(repository).persist("/rules/fixture/active_version", "0");
+ verify(repository).persist("/rules/global_fixture/versions/0", "{}" + System.lineSeparator());
+ verify(repository).persist("/rules/global_fixture/active_version", "0");
}
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/fixture/MetaDataYamlRuleConfigurationFixture.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/fixture/MetaDataYamlRuleConfigurationFixture.java
deleted file mode 100644
index 536180f736f..00000000000
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/fixture/MetaDataYamlRuleConfigurationFixture.java
+++ /dev/null
@@ -1,36 +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.mode.metadata.persist.fixture;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import org.apache.shardingsphere.mode.node.rule.tuple.annotation.RuleRepositoryTupleEntity;
-
-@RuleRepositoryTupleEntity(value = "fixture", leaf = true)
-@Getter
-@Setter
-public final class MetaDataYamlRuleConfigurationFixture implements YamlRuleConfiguration {
-
- private String name;
-
- @Override
- public Class<MetaDataRuleConfigurationFixture> getRuleConfigurationType() {
- return MetaDataRuleConfigurationFixture.class;
- }
-}
diff --git a/mode/core/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapper b/mode/core/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapper
index 51fe08d5d8a..2465bf1fced 100644
--- a/mode/core/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapper
+++ b/mode/core/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapper
@@ -15,6 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.mode.metadata.persist.fixture.MetaDataYamlRuleConfigurationSwapperFixture
org.apache.shardingsphere.mode.metadata.persist.fixture.NoTupleYamlRuleConfigurationSwapperFixture
-org.apache.shardingsphere.mode.metadata.persist.config.database.fixture.DatabaseYamlRuleConfigurationSwapperFixture
diff --git a/mode/type/cluster/core/pom.xml b/mode/type/cluster/core/pom.xml
index b5836700f60..0804740bcb3 100644
--- a/mode/type/cluster/core/pom.xml
+++ b/mode/type/cluster/core/pom.xml
@@ -54,6 +54,12 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-test-fixture-database</artifactId>
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandlerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandlerTest.java
index 6b60ceec56b..db902e9a57d 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandlerTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandlerTest.java
@@ -59,58 +59,58 @@ class RuleConfigurationChangedHandlerTest {
@Test
void assertHandleWithEmptyValue() throws SQLException {
- handler.handle("foo_db", new DataChangedEvent("/metadata/foo_db/rules/foo_rule/versions/0", "", Type.ADDED));
+ handler.handle("foo_db", new DataChangedEvent("/metadata/foo_db/rules/fixture/versions/0", "", Type.ADDED));
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager(), times(0)).alter(any());
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager(), times(0)).drop(any());
}
@Test
void assertHandleWithPathNotFound() throws SQLException {
- handler.handle("foo_db", new DataChangedEvent("/metadata/foo_db/rules/foo_rule/versions/0", "foo", Type.ADDED));
+ handler.handle("foo_db", new DataChangedEvent("/metadata/foo_db/rules/fixture/versions/0", "foo", Type.ADDED));
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager(), times(0)).alter(any());
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager(), times(0)).drop(any());
}
@Test
void assertHandleWithIgnoreType() throws SQLException {
- handler.handle("foo_db", new DataChangedEvent("/metadata/foo_db/rules/foo_rule/named/foo_rule_item/active_version", "foo", Type.IGNORED));
+ handler.handle("foo_db", new DataChangedEvent("/metadata/foo_db/rules/fixture/named/foo_rule_item/active_version", "foo", Type.IGNORED));
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager(), times(0)).alter(any());
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager(), times(0)).drop(any());
}
@Test
void assertHandleWithNamedRuleItemAdded() throws SQLException {
- handler.handle("foo_db", new DataChangedEvent("/metadata/foo_db/rules/foo_rule/named/foo_rule_item/active_version", "0", Type.ADDED));
+ handler.handle("foo_db", new DataChangedEvent("/metadata/foo_db/rules/fixture/named/foo_rule_item/active_version", "0", Type.ADDED));
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager()).alter(any(AlterNamedRuleItem.class));
}
@Test
void assertHandleWithNamedRuleItemAltered() throws SQLException {
- handler.handle("foo_db", new DataChangedEvent("/metadata/foo_db/rules/foo_rule/named/foo_rule_item/active_version", "0", Type.UPDATED));
+ handler.handle("foo_db", new DataChangedEvent("/metadata/foo_db/rules/fixture/named/foo_rule_item/active_version", "0", Type.UPDATED));
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager()).alter(any(AlterNamedRuleItem.class));
}
@Test
void assertHandleWithNamedRuleItemDropped() throws SQLException {
- handler.handle("foo_db", new DataChangedEvent("/metadata/foo_db/rules/foo_rule/named/foo_rule_item", "foo", Type.DELETED));
+ handler.handle("foo_db", new DataChangedEvent("/metadata/foo_db/rules/fixture/named/foo_rule_item", "foo", Type.DELETED));
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager()).drop(any(DropNamedRuleItem.class));
}
@Test
void assertHandleWithUniqueRuleItemAdded() throws SQLException {
- handler.handle("foo_db", new DataChangedEvent("/metadata/foo_db/rules/foo_rule/unique/active_version", "0", Type.ADDED));
+ handler.handle("foo_db", new DataChangedEvent("/metadata/foo_db/rules/fixture/unique/active_version", "0", Type.ADDED));
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager()).alter(any(AlterUniqueRuleItem.class));
}
@Test
void assertHandleWithUniqueRuleItemAltered() throws SQLException {
- handler.handle("foo_db", new DataChangedEvent("/metadata/foo_db/rules/foo_rule/unique/active_version", "0", Type.UPDATED));
+ handler.handle("foo_db", new DataChangedEvent("/metadata/foo_db/rules/fixture/unique/active_version", "0", Type.UPDATED));
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager()).alter(any(AlterUniqueRuleItem.class));
}
@Test
void assertHandleWithUniqueRuleItemDropped() throws SQLException {
- handler.handle("foo_db", new DataChangedEvent("/metadata/foo_db/rules/foo_rule/unique/active_version", "foo", Type.DELETED));
+ handler.handle("foo_db", new DataChangedEvent("/metadata/foo_db/rules/fixture/unique/active_version", "foo", Type.DELETED));
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager()).drop(any(DropUniqueRuleItem.class));
}
}
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/fixture/YamlRuleConfigurationFixture.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/fixture/YamlRuleConfigurationFixture.java
deleted file mode 100644
index faa609da6ec..00000000000
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/fixture/YamlRuleConfigurationFixture.java
+++ /dev/null
@@ -1,44 +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.mode.manager.cluster.fixture;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import org.apache.shardingsphere.mode.node.rule.tuple.annotation.RuleRepositoryTupleEntity;
-import org.apache.shardingsphere.mode.node.rule.tuple.annotation.RuleRepositoryTupleField;
-import org.apache.shardingsphere.mode.node.rule.tuple.annotation.RuleRepositoryTupleField.Type;
-
-import java.util.Map;
-
-@Getter
-@Setter
-@RuleRepositoryTupleEntity("foo_rule")
-public final class YamlRuleConfigurationFixture implements YamlRuleConfiguration {
-
- @RuleRepositoryTupleField(type = Type.OTHER)
- private String unique;
-
- @RuleRepositoryTupleField(type = Type.OTHER)
- private Map<String, String> named;
-
- @Override
- public Class<RuleConfigurationFixture> getRuleConfigurationType() {
- return RuleConfigurationFixture.class;
- }
-}
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/fixture/YamlRuleConfigurationSwapperFixture.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/fixture/YamlRuleConfigurationSwapperFixture.java
index 42bd3a256aa..f65ee3f8227 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/fixture/YamlRuleConfigurationSwapperFixture.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/fixture/YamlRuleConfigurationSwapperFixture.java
@@ -18,8 +18,9 @@
package org.apache.shardingsphere.mode.manager.cluster.fixture;
import org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapper;
+import org.apache.shardingsphere.test.fixture.infra.yaml.MockedYamlRuleConfiguration;
-public final class YamlRuleConfigurationSwapperFixture implements YamlRuleConfigurationSwapper<YamlRuleConfigurationFixture, RuleConfigurationFixture> {
+public final class YamlRuleConfigurationSwapperFixture implements YamlRuleConfigurationSwapper<MockedYamlRuleConfiguration, RuleConfigurationFixture> {
@Override
public Class<RuleConfigurationFixture> getTypeClass() {
@@ -27,15 +28,15 @@ public final class YamlRuleConfigurationSwapperFixture implements YamlRuleConfig
}
@Override
- public YamlRuleConfigurationFixture swapToYamlConfiguration(final RuleConfigurationFixture data) {
- YamlRuleConfigurationFixture result = new YamlRuleConfigurationFixture();
+ public MockedYamlRuleConfiguration swapToYamlConfiguration(final RuleConfigurationFixture data) {
+ MockedYamlRuleConfiguration result = new MockedYamlRuleConfiguration();
result.setUnique(data.getUnique());
result.setNamed(data.getNamed());
return result;
}
@Override
- public RuleConfigurationFixture swapToObject(final YamlRuleConfigurationFixture yamlConfig) {
+ public RuleConfigurationFixture swapToObject(final MockedYamlRuleConfiguration yamlConfig) {
RuleConfigurationFixture result = new RuleConfigurationFixture();
result.setUnique(yamlConfig.getUnique());
result.setNamed(yamlConfig.getNamed());
diff --git a/test/fixture/infra/pom.xml b/test/fixture/infra/pom.xml
index afc8cecb3a4..113e8fe8f64 100644
--- a/test/fixture/infra/pom.xml
+++ b/test/fixture/infra/pom.xml
@@ -36,6 +36,11 @@
<artifactId>shardingsphere-infra-common</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-mode-node</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.mockito</groupId>
diff --git a/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/rule/MockedRule.java b/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/rule/MockedRule.java
index a8c80a39ffc..95b24b06a60 100644
--- a/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/rule/MockedRule.java
+++ b/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/rule/MockedRule.java
@@ -34,6 +34,6 @@ public final class MockedRule implements ShardingSphereRule {
@Override
public int getOrder() {
- return 0;
+ return -10000;
}
}
diff --git a/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/rule/MockedRuleConfiguration.java b/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/rule/MockedRuleConfiguration.java
index d662318c528..36d6cbb25dd 100644
--- a/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/rule/MockedRuleConfiguration.java
+++ b/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/rule/MockedRuleConfiguration.java
@@ -21,6 +21,9 @@ import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
+import java.util.Collections;
+import java.util.Map;
+
/**
* Mocked rule configuration.
*/
@@ -28,5 +31,11 @@ import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
@Getter
public final class MockedRuleConfiguration implements RuleConfiguration {
- private final String name;
+ private final String unique;
+
+ private final Map<String, String> named;
+
+ public MockedRuleConfiguration(final String unique) {
+ this(unique, Collections.emptyMap());
+ }
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/database/fixture/DatabaseRuleConfigurationFixture.java b/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/rule/global/MockedGlobalRule.java
similarity index 65%
rename from mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/database/fixture/DatabaseRuleConfigurationFixture.java
rename to test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/rule/global/MockedGlobalRule.java
index 53cd7326e0e..7319afe8b36 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/database/fixture/DatabaseRuleConfigurationFixture.java
+++ b/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/rule/global/MockedGlobalRule.java
@@ -15,20 +15,23 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.metadata.persist.config.database.fixture;
+package org.apache.shardingsphere.test.fixture.infra.rule.global;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
-import org.apache.shardingsphere.infra.config.rule.function.EnhancedRuleConfiguration;
+import org.apache.shardingsphere.infra.rule.scope.GlobalRule;
-import java.util.Map;
-
-@RequiredArgsConstructor
-@Getter
-public final class DatabaseRuleConfigurationFixture implements RuleConfiguration, EnhancedRuleConfiguration {
+/**
+ * Mocked global rule.
+ */
+public final class MockedGlobalRule implements GlobalRule {
- private final String unique;
+ @Override
+ public RuleConfiguration getConfiguration() {
+ return new MockedGlobalRuleConfiguration("global");
+ }
- private final Map<String, String> named;
+ @Override
+ public int getOrder() {
+ return -20000;
+ }
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/fixture/MetaDataRuleConfigurationFixture.java b/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/rule/global/MockedGlobalRuleConfiguration.java
similarity index 73%
rename from mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/fixture/MetaDataRuleConfigurationFixture.java
rename to test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/rule/global/MockedGlobalRuleConfiguration.java
index 9b1df53561c..7c3120c6e70 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/fixture/MetaDataRuleConfigurationFixture.java
+++ b/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/rule/global/MockedGlobalRuleConfiguration.java
@@ -15,16 +15,18 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.metadata.persist.fixture;
+package org.apache.shardingsphere.test.fixture.infra.rule.global;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
-import org.apache.shardingsphere.infra.config.rule.function.EnhancedRuleConfiguration;
+import org.apache.shardingsphere.infra.config.rule.scope.GlobalRuleConfiguration;
+/**
+ * Mocked global rule configuration.
+ */
@RequiredArgsConstructor
@Getter
-public final class MetaDataRuleConfigurationFixture implements RuleConfiguration, EnhancedRuleConfiguration {
+public final class MockedGlobalRuleConfiguration implements GlobalRuleConfiguration {
private final String name;
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/database/fixture/DatabaseYamlRuleConfigurationFixture.java b/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/yaml/MockedYamlRuleConfiguration.java
similarity index 74%
rename from mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/database/fixture/DatabaseYamlRuleConfigurationFixture.java
rename to test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/yaml/MockedYamlRuleConfiguration.java
index eb4eb044e31..a282fa1fe65 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/database/fixture/DatabaseYamlRuleConfigurationFixture.java
+++ b/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/yaml/MockedYamlRuleConfiguration.java
@@ -15,21 +15,26 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.metadata.persist.config.database.fixture;
+package org.apache.shardingsphere.test.fixture.infra.yaml;
import lombok.Getter;
import lombok.Setter;
+import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
import org.apache.shardingsphere.mode.node.rule.tuple.annotation.RuleRepositoryTupleEntity;
import org.apache.shardingsphere.mode.node.rule.tuple.annotation.RuleRepositoryTupleField;
import org.apache.shardingsphere.mode.node.rule.tuple.annotation.RuleRepositoryTupleField.Type;
+import org.apache.shardingsphere.test.fixture.infra.rule.MockedRuleConfiguration;
import java.util.Map;
-@RuleRepositoryTupleEntity("database_rule_fixture")
+/**
+ * Mocked YAML rule configuration.
+ */
+@RuleRepositoryTupleEntity("fixture")
@Getter
@Setter
-public final class DatabaseYamlRuleConfigurationFixture implements YamlRuleConfiguration {
+public final class MockedYamlRuleConfiguration implements YamlRuleConfiguration {
@RuleRepositoryTupleField(type = Type.OTHER)
private String unique;
@@ -38,7 +43,7 @@ public final class DatabaseYamlRuleConfigurationFixture implements YamlRuleConfi
private Map<String, String> named;
@Override
- public Class<DatabaseRuleConfigurationFixture> getRuleConfigurationType() {
- return DatabaseRuleConfigurationFixture.class;
+ public Class<? extends RuleConfiguration> getRuleConfigurationType() {
+ return MockedRuleConfiguration.class;
}
}
diff --git a/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/YamlRuleConfigurationSwapperFixture.java b/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/yaml/MockedYamlRuleConfigurationSwapper.java
similarity index 64%
rename from proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/YamlRuleConfigurationSwapperFixture.java
rename to test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/yaml/MockedYamlRuleConfigurationSwapper.java
index 9abd9ef8104..687df369ee6 100644
--- a/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/YamlRuleConfigurationSwapperFixture.java
+++ b/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/yaml/MockedYamlRuleConfigurationSwapper.java
@@ -15,12 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.fixture;
+package org.apache.shardingsphere.test.fixture.infra.yaml;
import org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapper;
import org.apache.shardingsphere.test.fixture.infra.rule.MockedRuleConfiguration;
-public final class YamlRuleConfigurationSwapperFixture implements YamlRuleConfigurationSwapper<YamlRuleConfigurationFixture, MockedRuleConfiguration> {
+/**
+ * Mocked YAML rule configuration swapper.
+ */
+public final class MockedYamlRuleConfigurationSwapper implements YamlRuleConfigurationSwapper<MockedYamlRuleConfiguration, MockedRuleConfiguration> {
@Override
public Class<MockedRuleConfiguration> getTypeClass() {
@@ -28,15 +31,16 @@ public final class YamlRuleConfigurationSwapperFixture implements YamlRuleConfig
}
@Override
- public YamlRuleConfigurationFixture swapToYamlConfiguration(final MockedRuleConfiguration data) {
- YamlRuleConfigurationFixture result = new YamlRuleConfigurationFixture();
- result.setName(data.getName());
+ public MockedYamlRuleConfiguration swapToYamlConfiguration(final MockedRuleConfiguration data) {
+ MockedYamlRuleConfiguration result = new MockedYamlRuleConfiguration();
+ result.setUnique(data.getUnique());
+ result.setNamed(data.getNamed());
return result;
}
@Override
- public MockedRuleConfiguration swapToObject(final YamlRuleConfigurationFixture yamlConfig) {
- return new MockedRuleConfiguration(yamlConfig.getName());
+ public MockedRuleConfiguration swapToObject(final MockedYamlRuleConfiguration yamlConfig) {
+ return new MockedRuleConfiguration(yamlConfig.getUnique(), yamlConfig.getNamed());
}
@Override
@@ -46,6 +50,6 @@ public final class YamlRuleConfigurationSwapperFixture implements YamlRuleConfig
@Override
public int getOrder() {
- return -1;
+ return -10000;
}
}
diff --git a/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/YamlRuleConfigurationFixture.java b/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/yaml/global/MockedYamlGlobalRuleConfiguration.java
similarity index 67%
rename from proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/YamlRuleConfigurationFixture.java
rename to test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/yaml/global/MockedYamlGlobalRuleConfiguration.java
index 2c395be9b45..dc950b1234b 100644
--- a/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/YamlRuleConfigurationFixture.java
+++ b/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/yaml/global/MockedYamlGlobalRuleConfiguration.java
@@ -15,22 +15,27 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.fixture;
+package org.apache.shardingsphere.test.fixture.infra.yaml.global;
import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
-import org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import org.apache.shardingsphere.test.fixture.infra.rule.MockedRuleConfiguration;
+import org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlGlobalRuleConfiguration;
+import org.apache.shardingsphere.mode.node.rule.tuple.annotation.RuleRepositoryTupleEntity;
+import org.apache.shardingsphere.test.fixture.infra.rule.global.MockedGlobalRuleConfiguration;
+/**
+ * Mocked YAML rule configuration.
+ */
+@RuleRepositoryTupleEntity(value = "global_fixture", leaf = true)
@Getter
@Setter
-public final class YamlRuleConfigurationFixture implements YamlRuleConfiguration {
+public final class MockedYamlGlobalRuleConfiguration implements YamlGlobalRuleConfiguration {
private String name;
@Override
public Class<? extends RuleConfiguration> getRuleConfigurationType() {
- return MockedRuleConfiguration.class;
+ return MockedGlobalRuleConfiguration.class;
}
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/fixture/MetaDataYamlRuleConfigurationSwapperFixture.java b/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/yaml/global/MockedYamlGlobalRuleConfigurationSwapper.java
similarity index 55%
rename from mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/fixture/MetaDataYamlRuleConfigurationSwapperFixture.java
rename to test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/yaml/global/MockedYamlGlobalRuleConfigurationSwapper.java
index 34f77499807..837c34717d8 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/fixture/MetaDataYamlRuleConfigurationSwapperFixture.java
+++ b/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/yaml/global/MockedYamlGlobalRuleConfigurationSwapper.java
@@ -15,36 +15,40 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.metadata.persist.fixture;
+package org.apache.shardingsphere.test.fixture.infra.yaml.global;
import org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapper;
+import org.apache.shardingsphere.test.fixture.infra.rule.global.MockedGlobalRuleConfiguration;
-public final class MetaDataYamlRuleConfigurationSwapperFixture implements YamlRuleConfigurationSwapper<MetaDataYamlRuleConfigurationFixture, MetaDataRuleConfigurationFixture> {
+/**
+ * Mocked YAML global rule configuration swapper.
+ */
+public final class MockedYamlGlobalRuleConfigurationSwapper implements YamlRuleConfigurationSwapper<MockedYamlGlobalRuleConfiguration, MockedGlobalRuleConfiguration> {
+
+ @Override
+ public Class<MockedGlobalRuleConfiguration> getTypeClass() {
+ return MockedGlobalRuleConfiguration.class;
+ }
@Override
- public MetaDataYamlRuleConfigurationFixture swapToYamlConfiguration(final MetaDataRuleConfigurationFixture data) {
- MetaDataYamlRuleConfigurationFixture result = new MetaDataYamlRuleConfigurationFixture();
+ public MockedYamlGlobalRuleConfiguration swapToYamlConfiguration(final MockedGlobalRuleConfiguration data) {
+ MockedYamlGlobalRuleConfiguration result = new MockedYamlGlobalRuleConfiguration();
result.setName(data.getName());
return result;
}
@Override
- public MetaDataRuleConfigurationFixture swapToObject(final MetaDataYamlRuleConfigurationFixture yamlConfig) {
- return new MetaDataRuleConfigurationFixture(yamlConfig.getName());
+ public MockedGlobalRuleConfiguration swapToObject(final MockedYamlGlobalRuleConfiguration yamlConfig) {
+ return new MockedGlobalRuleConfiguration(yamlConfig.getName());
}
@Override
public String getRuleTagName() {
- return "METADATA.FIXTURE";
+ return "GLOBAL_FIXTURE";
}
@Override
public int getOrder() {
- return -400;
- }
-
- @Override
- public Class<MetaDataRuleConfigurationFixture> getTypeClass() {
- return MetaDataRuleConfigurationFixture.class;
+ return -20000;
}
}
diff --git a/proxy/bootstrap/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapper b/test/fixture/infra/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapper
similarity index 81%
rename from proxy/bootstrap/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapper
rename to test/fixture/infra/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapper
index 61ab4c8e92d..d8e341805c1 100644
--- a/proxy/bootstrap/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapper
+++ b/test/fixture/infra/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapper
@@ -15,4 +15,5 @@
# limitations under the License.
#
-org.apache.shardingsphere.proxy.fixture.YamlRuleConfigurationSwapperFixture
+org.apache.shardingsphere.test.fixture.infra.yaml.global.MockedYamlGlobalRuleConfigurationSwapper
+org.apache.shardingsphere.test.fixture.infra.yaml.MockedYamlRuleConfigurationSwapper