You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/12/07 07:36:48 UTC
[shardingsphere] branch master updated: Refactor RequiredSPIRegistryTest (#22715)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 58d3fef7b04 Refactor RequiredSPIRegistryTest (#22715)
58d3fef7b04 is described below
commit 58d3fef7b0460aab3c40920e19a1ca6095a811d2
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed Dec 7 15:36:41 2022 +0800
Refactor RequiredSPIRegistryTest (#22715)
* Remove useless SPIPostProcessor logic from RequiredSPIRegistry
* Refactor RequiredSPIRegistryTest
---
.../infra/util/spi/ShardingSphereServiceLoaderTest.java | 9 ++++++---
.../infra/util/spi/type/required/RequiredSPIRegistryTest.java | 8 ++++----
.../MultipleRequiredSPIFixture.java} | 4 ++--
.../impl/DefaultMultipleRequiredSPIFixtureImpl.java} | 6 +++---
.../impl/NotDefaultMultipleRequiredSPIFixtureImpl.java} | 6 +++---
...pi.type.required.fixture.multiple.MultipleRequiredSPIFixture} | 4 ++--
6 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/ShardingSphereServiceLoaderTest.java b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/ShardingSphereServiceLoaderTest.java
index 2f3b9d2d404..311b0f1677e 100644
--- a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/ShardingSphereServiceLoaderTest.java
+++ b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/ShardingSphereServiceLoaderTest.java
@@ -34,6 +34,12 @@ import static org.junit.Assert.assertTrue;
public final class ShardingSphereServiceLoaderTest {
+ static {
+ ShardingSphereServiceLoader.register(EmptySPIFixture.class);
+ ShardingSphereServiceLoader.register(SingletonSPIFixture.class);
+ ShardingSphereServiceLoader.register(MultitonSPIFixture.class);
+ }
+
@Test
public void assertGetServiceInstancesWithUnregisteredSPI() {
assertTrue(ShardingSphereServiceLoader.getServiceInstances(Object.class).isEmpty());
@@ -41,13 +47,11 @@ public final class ShardingSphereServiceLoaderTest {
@Test
public void assertGetServiceInstancesWithEmptyInstances() {
- ShardingSphereServiceLoader.register(EmptySPIFixture.class);
assertTrue(ShardingSphereServiceLoader.getServiceInstances(EmptySPIFixture.class).isEmpty());
}
@Test
public void assertGetServiceInstancesWithSingletonSPI() {
- ShardingSphereServiceLoader.register(SingletonSPIFixture.class);
Collection<SingletonSPIFixture> actual = ShardingSphereServiceLoader.getServiceInstances(SingletonSPIFixture.class);
assertThat(actual.size(), is(1));
SingletonSPIFixture actualInstance = actual.iterator().next();
@@ -57,7 +61,6 @@ public final class ShardingSphereServiceLoaderTest {
@Test
public void assertGetServiceInstancesWithMultitonSPI() {
- ShardingSphereServiceLoader.register(MultitonSPIFixture.class);
Collection<MultitonSPIFixture> actual = ShardingSphereServiceLoader.getServiceInstances(MultitonSPIFixture.class);
assertThat(actual.size(), is(1));
MultitonSPIFixture actualInstance = actual.iterator().next();
diff --git a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/RequiredSPIRegistryTest.java b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/RequiredSPIRegistryTest.java
index faa0ce3c347..df9070e48cc 100644
--- a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/RequiredSPIRegistryTest.java
+++ b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/RequiredSPIRegistryTest.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.infra.util.spi.type.required;
import org.apache.shardingsphere.infra.util.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.infra.util.spi.exception.ServiceProviderNotFoundServerException;
import org.apache.shardingsphere.infra.util.spi.type.required.fixture.empty.EmptyRequiredSPIFixture;
-import org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiton.impl.DefaultMultitonRequiredSPIFixtureImpl;
-import org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiton.MultitonRequiredSPIFixture;
+import org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiple.impl.DefaultMultipleRequiredSPIFixtureImpl;
+import org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiple.MultipleRequiredSPIFixture;
import org.apache.shardingsphere.infra.util.spi.type.required.fixture.single.SingleRequiredSPIFixture;
import org.apache.shardingsphere.infra.util.spi.type.required.fixture.single.impl.SingleRequiredSPIFixtureImpl;
import org.junit.Test;
@@ -34,7 +34,7 @@ public final class RequiredSPIRegistryTest {
static {
ShardingSphereServiceLoader.register(EmptyRequiredSPIFixture.class);
ShardingSphereServiceLoader.register(SingleRequiredSPIFixture.class);
- ShardingSphereServiceLoader.register(MultitonRequiredSPIFixture.class);
+ ShardingSphereServiceLoader.register(MultipleRequiredSPIFixture.class);
}
@Test(expected = ServiceProviderNotFoundServerException.class)
@@ -49,6 +49,6 @@ public final class RequiredSPIRegistryTest {
@Test
public void assertRegisteredServiceWithMoreImplementations() {
- assertThat(RequiredSPIRegistry.getRegisteredService(MultitonRequiredSPIFixture.class), instanceOf(DefaultMultitonRequiredSPIFixtureImpl.class));
+ assertThat(RequiredSPIRegistry.getRegisteredService(MultipleRequiredSPIFixture.class), instanceOf(DefaultMultipleRequiredSPIFixtureImpl.class));
}
}
diff --git a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiton/MultitonRequiredSPIFixture.java b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiple/MultipleRequiredSPIFixture.java
similarity index 92%
rename from infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiton/MultitonRequiredSPIFixture.java
rename to infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiple/MultipleRequiredSPIFixture.java
index 21ef5d1fa3a..13b5ab07da8 100644
--- a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiton/MultitonRequiredSPIFixture.java
+++ b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiple/MultipleRequiredSPIFixture.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiton;
+package org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiple;
import org.apache.shardingsphere.infra.util.spi.type.required.RequiredSPI;
-public interface MultitonRequiredSPIFixture extends RequiredSPI {
+public interface MultipleRequiredSPIFixture extends RequiredSPI {
}
diff --git a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiton/impl/DefaultMultitonRequiredSPIFixtureImpl.java b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiple/impl/DefaultMultipleRequiredSPIFixtureImpl.java
similarity index 86%
rename from infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiton/impl/DefaultMultitonRequiredSPIFixtureImpl.java
rename to infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiple/impl/DefaultMultipleRequiredSPIFixtureImpl.java
index 73249839137..70515891b19 100644
--- a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiton/impl/DefaultMultitonRequiredSPIFixtureImpl.java
+++ b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiple/impl/DefaultMultipleRequiredSPIFixtureImpl.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiton.impl;
+package org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiple.impl;
-import org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiton.MultitonRequiredSPIFixture;
+import org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiple.MultipleRequiredSPIFixture;
-public final class DefaultMultitonRequiredSPIFixtureImpl implements MultitonRequiredSPIFixture {
+public final class DefaultMultipleRequiredSPIFixtureImpl implements MultipleRequiredSPIFixture {
@Override
public boolean isDefault() {
diff --git a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiton/impl/NotDefaultMultitonRequiredSPIFixtureImpl.java b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiple/impl/NotDefaultMultipleRequiredSPIFixtureImpl.java
similarity index 85%
rename from infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiton/impl/NotDefaultMultitonRequiredSPIFixtureImpl.java
rename to infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiple/impl/NotDefaultMultipleRequiredSPIFixtureImpl.java
index 0332ff91122..8c01c18d268 100644
--- a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiton/impl/NotDefaultMultitonRequiredSPIFixtureImpl.java
+++ b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiple/impl/NotDefaultMultipleRequiredSPIFixtureImpl.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiton.impl;
+package org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiple.impl;
-import org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiton.MultitonRequiredSPIFixture;
+import org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiple.MultipleRequiredSPIFixture;
-public final class NotDefaultMultitonRequiredSPIFixtureImpl implements MultitonRequiredSPIFixture {
+public final class NotDefaultMultipleRequiredSPIFixtureImpl implements MultipleRequiredSPIFixture {
}
diff --git a/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiton.MultitonRequiredSPIFixture b/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiple.MultipleRequiredSPIFixture
similarity index 89%
rename from infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiton.MultitonRequiredSPIFixture
rename to infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiple.MultipleRequiredSPIFixture
index d36af6613cf..507e0b8bb9a 100644
--- a/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiton.MultitonRequiredSPIFixture
+++ b/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiple.MultipleRequiredSPIFixture
@@ -15,5 +15,5 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiton.impl.DefaultMultitonRequiredSPIFixtureImpl
-org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiton.impl.NotDefaultMultitonRequiredSPIFixtureImpl
+org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiple.impl.DefaultMultipleRequiredSPIFixtureImpl
+org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiple.impl.NotDefaultMultipleRequiredSPIFixtureImpl