This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 0b57f570def567aa21b5f5b37e000207b5310909 Author: Andrus Adamchik <[email protected]> AuthorDate: Sun May 10 12:16:27 2026 -0400 JUnit 5 migration of "cayenne-di" module --- cayenne-di/pom.xml | 5 -- .../org/apache/cayenne/di/DIBootstrapTest.java | 12 ++-- .../test/java/org/apache/cayenne/di/KeyTest.java | 22 ++++---- .../org/apache/cayenne/di/spi/DIGraphTest.java | 21 +++---- .../cayenne/di/spi/DefaultInjectorBindingTest.java | 14 ++--- .../spi/DefaultInjectorCircularInjectionTest.java | 46 +++++----------- .../di/spi/DefaultInjectorDecorationTest.java | 16 +++--- .../di/spi/DefaultInjectorInjectionTest.java | 64 +++++++++++----------- .../cayenne/di/spi/DefaultInjectorScopeTest.java | 16 +++--- .../apache/cayenne/di/spi/DefaultInjectorTest.java | 12 ++-- .../apache/cayenne/di/spi/ModuleLoaderTest.java | 29 +++++----- 11 files changed, 116 insertions(+), 141 deletions(-) diff --git a/cayenne-di/pom.xml b/cayenne-di/pom.xml index 4f373df69..09c63a483 100644 --- a/cayenne-di/pom.xml +++ b/cayenne-di/pom.xml @@ -26,11 +26,6 @@ <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> <plugins> diff --git a/cayenne-di/src/test/java/org/apache/cayenne/di/DIBootstrapTest.java b/cayenne-di/src/test/java/org/apache/cayenne/di/DIBootstrapTest.java index dd1684e03..04936be78 100644 --- a/cayenne-di/src/test/java/org/apache/cayenne/di/DIBootstrapTest.java +++ b/cayenne-di/src/test/java/org/apache/cayenne/di/DIBootstrapTest.java @@ -18,22 +18,22 @@ ****************************************************************/ package org.apache.cayenne.di; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DIBootstrapTest { @Test - public void testCreateInjector_Empty() { + public void createInjector_Empty() { Injector emptyInjector = DIBootstrap.createInjector(); assertNotNull(emptyInjector); } @Test - public void testCreateInjector_SingleModule() { + public void createInjector_SingleModule() { final boolean[] configureCalled = new boolean[1]; Module module = binder -> configureCalled[0] = true; @@ -45,7 +45,7 @@ public class DIBootstrapTest { } @Test - public void testCreateInjector_MultiModule() { + public void createInjector_MultiModule() { final boolean[] configureCalled = new boolean[2]; diff --git a/cayenne-di/src/test/java/org/apache/cayenne/di/KeyTest.java b/cayenne-di/src/test/java/org/apache/cayenne/di/KeyTest.java index 63bc03f9d..7d89cdb13 100644 --- a/cayenne-di/src/test/java/org/apache/cayenne/di/KeyTest.java +++ b/cayenne-di/src/test/java/org/apache/cayenne/di/KeyTest.java @@ -20,17 +20,17 @@ package org.apache.cayenne.di; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class KeyTest { @Test - public void testEquals() { + public void equals() { Key<String> key1 = Key.get(String.class); Key<String> key2 = Key.get(String.class); Key<Integer> key3 = Key.get(Integer.class); @@ -61,7 +61,7 @@ public class KeyTest { } @Test - public void testListKeysEquals() { + public void listKeysEquals() { Key<List<Integer>> key1 = Key.getListOf(Integer.class); Key<List<String>> key2 = Key.getListOf(String.class); Key<List<Integer>> key3 = Key.getListOf(Integer.class); @@ -90,7 +90,7 @@ public class KeyTest { } @Test - public void testHashCode() { + public void hashCode_test() { Key<String> key1 = Key.get(String.class); Key<String> key2 = Key.get(String.class); Key<Integer> key3 = Key.get(Integer.class); @@ -99,9 +99,7 @@ public class KeyTest { Key<Integer> key6 = Key.get(Integer.class, "b"); Key<String> key7 = Key.get(String.class, "a"); - assertTrue( - "generated different hashcode on second inocation", - key1.hashCode() == key1.hashCode()); + assertTrue(key1.hashCode() == key1.hashCode(), "generated different hashcode on second inocation"); assertTrue(key1.hashCode() == key2.hashCode()); assertTrue(key4.hashCode() == key5.hashCode()); @@ -114,7 +112,7 @@ public class KeyTest { } @Test - public void testToString() { + public void toString_test() { assertEquals("<BindingKey: java.lang.String>", Key.get(String.class).toString()); assertEquals("<BindingKey: java.lang.String, 'xyz'>", diff --git a/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DIGraphTest.java b/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DIGraphTest.java index d2558b698..ff3d6c5d3 100644 --- a/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DIGraphTest.java +++ b/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DIGraphTest.java @@ -19,17 +19,18 @@ package org.apache.cayenne.di.spi; import org.apache.cayenne.di.DIRuntimeException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static java.util.Arrays.asList; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class DIGraphTest { @Test - public void testTopSortNoCycles() { + public void topSortNoCycles() { DIGraph<String> graph = new DIGraph<>(); graph.add("x", "y"); graph.add("x", "z"); @@ -39,16 +40,16 @@ public class DIGraphTest { assertEquals(asList("y", "a", "z", "x"), sorted); } - @Test(expected = DIRuntimeException.class) - public void testTopSortDirectCycle() { + @Test + public void topSortDirectCycle() { DIGraph<String> graph = new DIGraph<>(); graph.add("x", "y"); graph.add("y", "x"); - graph.topSort(); + assertThrows(DIRuntimeException.class, graph::topSort); } @Test - public void testTopSortDirectCycleOverride() { + public void topSortDirectCycleOverride() { DIGraph<String> graph = new DIGraph<>(); graph.addWithOverride("x", "y"); graph.addWithOverride("y", "x"); @@ -56,12 +57,12 @@ public class DIGraphTest { assertEquals(asList("x", "y"), sorted); } - @Test(expected = DIRuntimeException.class) - public void testTopSortInDirectCycle() { + @Test + public void topSortInDirectCycle() { DIGraph<String> graph = new DIGraph<>(); graph.add("x", "y"); graph.add("y", "z"); graph.add("z", "x"); - graph.topSort(); + assertThrows(DIRuntimeException.class, graph::topSort); } } diff --git a/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorBindingTest.java b/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorBindingTest.java index 975edbfb9..8ca0b6ca5 100644 --- a/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorBindingTest.java +++ b/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorBindingTest.java @@ -25,14 +25,14 @@ import org.apache.cayenne.di.mock.MockImplementation1Alt; import org.apache.cayenne.di.mock.MockImplementation1Alt2; import org.apache.cayenne.di.mock.MockInterface1; import org.apache.cayenne.di.mock.MockInterface1Provider; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class DefaultInjectorBindingTest { @Test - public void testClassBinding() { + public void classBinding() { Module module = binder -> binder.bind(MockInterface1.class).to(MockImplementation1.class); @@ -44,7 +44,7 @@ public class DefaultInjectorBindingTest { } @Test - public void testClassNamedBinding() { + public void classNamedBinding() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1.class); @@ -74,7 +74,7 @@ public class DefaultInjectorBindingTest { } @Test - public void testProviderBinding() { + public void providerBinding() { Module module = binder -> binder .bind(MockInterface1.class) .toProvider(MockInterface1Provider.class); @@ -87,7 +87,7 @@ public class DefaultInjectorBindingTest { } @Test - public void testInstanceBinding() { + public void instanceBinding() { final MockImplementation1 instance = new MockImplementation1(); @@ -101,7 +101,7 @@ public class DefaultInjectorBindingTest { } @Test - public void testClassReBinding() { + public void classReBinding() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1.class); diff --git a/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorCircularInjectionTest.java b/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorCircularInjectionTest.java index 7d378be0a..16d23ace3 100644 --- a/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorCircularInjectionTest.java +++ b/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorCircularInjectionTest.java @@ -30,15 +30,15 @@ import org.apache.cayenne.di.mock.MockImplementation3; import org.apache.cayenne.di.mock.MockInterface1; import org.apache.cayenne.di.mock.MockInterface2; import org.apache.cayenne.di.mock.MockInterface3; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class DefaultInjectorCircularInjectionTest { @Test - public void testFieldInjection_CircularDependency() { + public void fieldInjection_CircularDependency() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1_DepOn2.class); @@ -47,20 +47,12 @@ public class DefaultInjectorCircularInjectionTest { DefaultInjector injector = new DefaultInjector(module); - try { - injector.getInstance(MockInterface1.class); - fail("Circular dependency is not detected."); - } - catch (DIRuntimeException e) { - // expected - } - catch (StackOverflowError e) { - fail("Circular dependency is not detected, causing stack overflow"); - } + assertThrows(DIRuntimeException.class, () -> injector.getInstance(MockInterface1.class), + "Circular dependency is not detected."); } @Test - public void testProviderInjection_CircularDependency() { + public void providerInjection_CircularDependency() { Module module = binder -> { binder.bind(MockInterface1.class).to( @@ -75,7 +67,7 @@ public class DefaultInjectorCircularInjectionTest { } @Test - public void testConstructorInjection_CircularDependency() { + public void constructorInjection_CircularDependency() { Module module = binder -> { binder.bind(MockInterface1.class).to( @@ -86,20 +78,12 @@ public class DefaultInjectorCircularInjectionTest { DefaultInjector injector = new DefaultInjector(module); - try { - injector.getInstance(MockInterface1.class); - fail("Circular dependency is not detected."); - } - catch (DIRuntimeException e) { - // expected - } - catch (StackOverflowError e) { - fail("Circular dependency is not detected, causing stack overflow"); - } + assertThrows(DIRuntimeException.class, () -> injector.getInstance(MockInterface1.class), + "Circular dependency is not detected."); } @Test - public void testConstructorInjection_WithFieldInjectionDeps() { + public void constructorInjection_WithFieldInjectionDeps() { Module module = binder -> { binder.bind(MockInterface1.class).to( @@ -111,11 +95,7 @@ public class DefaultInjectorCircularInjectionTest { DefaultInjector injector = new DefaultInjector(module); - try { - injector.getInstance(MockInterface1.class); - } - catch (DIRuntimeException e) { - fail("Circular dependency is detected incorrectly: " + e.getMessage()); - } + // Should not throw - no circular dependency + injector.getInstance(MockInterface1.class); } } diff --git a/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorDecorationTest.java b/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorDecorationTest.java index 668e0e4b2..eca55a7af 100644 --- a/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorDecorationTest.java +++ b/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorDecorationTest.java @@ -26,15 +26,15 @@ import org.apache.cayenne.di.mock.MockInterface1_Decorator2; import org.apache.cayenne.di.mock.MockInterface1_Decorator3; import org.apache.cayenne.di.mock.MockInterface1_Decorator4; import org.apache.cayenne.di.mock.MockInterface1_Decorator5; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class DefaultInjectorDecorationTest { @Test - public void testSingleDecorator_After() { + public void singleDecorator_After() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1.class); @@ -49,7 +49,7 @@ public class DefaultInjectorDecorationTest { } @Test - public void testSingleDecorator_Before() { + public void singleDecorator_Before() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1.class); @@ -64,7 +64,7 @@ public class DefaultInjectorDecorationTest { } @Test - public void testDecoratorChain() { + public void decoratorChain() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1.class); @@ -82,7 +82,7 @@ public class DefaultInjectorDecorationTest { } @Test - public void testSingleDecorator_Provider_ConstructorInjection() { + public void singleDecorator_Provider_ConstructorInjection() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1.class); @@ -97,7 +97,7 @@ public class DefaultInjectorDecorationTest { } @Test - public void testSingleDecorator_Provider_FieldInjection() { + public void singleDecorator_Provider_FieldInjection() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1.class); diff --git a/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorInjectionTest.java b/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorInjectionTest.java index 85ff91512..f9692d72b 100644 --- a/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorInjectionTest.java +++ b/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorInjectionTest.java @@ -21,18 +21,18 @@ package org.apache.cayenne.di.spi; import org.apache.cayenne.di.Key; import org.apache.cayenne.di.Module; import org.apache.cayenne.di.mock.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collection; import java.util.Map; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class DefaultInjectorInjectionTest { @Test - public void testFieldInjection() { + public void fieldInjection() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1.class); @@ -47,7 +47,7 @@ public class DefaultInjectorInjectionTest { } @Test - public void testFieldInjection_Named() { + public void fieldInjection_Named() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1.class); @@ -64,7 +64,7 @@ public class DefaultInjectorInjectionTest { } @Test - public void testFieldInjectionSuperclass() { + public void fieldInjectionSuperclass() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1.class); @@ -80,7 +80,7 @@ public class DefaultInjectorInjectionTest { } @Test - public void testConstructorInjection() { + public void constructorInjection() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1.class); @@ -95,7 +95,7 @@ public class DefaultInjectorInjectionTest { } @Test - public void testConstructorInjection_Named() { + public void constructorInjection_Named() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1.class); @@ -112,7 +112,7 @@ public class DefaultInjectorInjectionTest { } @Test - public void testConstructorInjection_Named_Mixed() { + public void constructorInjection_Named_Mixed() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1.class); @@ -130,7 +130,7 @@ public class DefaultInjectorInjectionTest { } @Test - public void testProviderInjection_Constructor() { + public void providerInjection_Constructor() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1.class); @@ -144,7 +144,7 @@ public class DefaultInjectorInjectionTest { } @Test - public void testMapInjection_Empty() { + public void mapInjection_Empty() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1_MapConfiguration.class); @@ -160,7 +160,7 @@ public class DefaultInjectorInjectionTest { } @Test - public void testMapInjection() { + public void mapInjection() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1_MapConfiguration.class); binder.bindMap(Object.class, "xyz") @@ -199,7 +199,7 @@ public class DefaultInjectorInjectionTest { } @Test - public void testMapInjection_Resumed() { + public void mapInjection_Resumed() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1_MapConfiguration.class); // bind 1 @@ -216,7 +216,7 @@ public class DefaultInjectorInjectionTest { } @Test - public void testMapInjection_OverrideExplicitlyBoundType() { + public void mapInjection_OverrideExplicitlyBoundType() { Module m1 = binder -> { binder.bind(MockInterface5.class).to(MockImplementation5.class); binder.bind(MockInterface1.class).to(MockImplementation1_MapConfiguration.class); @@ -233,11 +233,11 @@ public class DefaultInjectorInjectionTest { }); MockInterface1 service = new DefaultInjector(m1, m2).getInstance(MockInterface1.class); - assertEquals("Map element was not overridden in submodule", ";a=abc", service.getName()); + assertEquals(";a=abc", service.getName(), "Map element was not overridden in submodule"); } @Test - public void testMapInjection_OverrideImplicitlyBoundType() { + public void mapInjection_OverrideImplicitlyBoundType() { Module m1 = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1_MapConfiguration.class); binder.bindMap(Object.class, "xyz").put("a", MockImplementation5.class); @@ -252,11 +252,11 @@ public class DefaultInjectorInjectionTest { }); MockInterface1 service = new DefaultInjector(m1, m2).getInstance(MockInterface1.class); - assertEquals("Map element was not overridden in submodule", ";a=abc", service.getName()); + assertEquals(";a=abc", service.getName(), "Map element was not overridden in submodule"); } @Test - public void testListInjection_addValue() { + public void listInjection_addValue() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1_ListConfiguration.class); binder.bindList(Object.class, "xyz").add("xvalue").add("yvalue"); @@ -270,7 +270,7 @@ public class DefaultInjectorInjectionTest { } @Test - public void testListInjection_addOrderedValues() { + public void listInjection_addOrderedValues() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1_ListConfiguration.class); binder.bind(MockInterface5.class).to(MockImplementation5.class); @@ -291,7 +291,7 @@ public class DefaultInjectorInjectionTest { } @Test - public void testListInjection_Instance_addOverrideValueOrdering() { + public void listInjection_Instance_addOverrideValueOrdering() { Integer i = Integer.valueOf(5); @@ -317,7 +317,7 @@ public class DefaultInjectorInjectionTest { } @Test - public void testListInjection_Type_addOverrideValueOrdering() { + public void listInjection_Type_addOverrideValueOrdering() { Module m1 = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1_ListConfiguration.class); @@ -340,7 +340,7 @@ public class DefaultInjectorInjectionTest { } @Test - public void testListInjection_addAllValues() { + public void listInjection_addAllValues() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1_ListConfiguration.class); @@ -371,7 +371,7 @@ public class DefaultInjectorInjectionTest { } @Test - public void testListInjection_addType() { + public void listInjection_addType() { Module module = binder -> { binder.bind(MockInterface5.class).to(MockImplementation5.class); binder.bind(MockInterface1.class).to(MockImplementation1_ListConfiguration.class); @@ -387,7 +387,7 @@ public class DefaultInjectorInjectionTest { } @Test - public void testListInjection_addOrderedTypes() { + public void listInjection_addOrderedTypes() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1_ListConfiguration.class); binder.bind(MockInterface5.class).to(MockImplementation5.class); @@ -409,7 +409,7 @@ public class DefaultInjectorInjectionTest { } @Test - public void testListInjection_addTypeWithBinding() { + public void listInjection_addTypeWithBinding() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1_ListConfiguration.class); binder.bindList(Object.class, "xyz").add(MockImplementation5.class).add("yvalue"); @@ -423,7 +423,7 @@ public class DefaultInjectorInjectionTest { } @Test - public void testListInjection_empty() { + public void listInjection_empty() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1_ListConfiguration.class); binder.bindList(Object.class, "xyz"); @@ -437,7 +437,7 @@ public class DefaultInjectorInjectionTest { } @Test - public void testListInjection_resumed() { + public void listInjection_resumed() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1_ListConfiguration.class); @@ -453,7 +453,7 @@ public class DefaultInjectorInjectionTest { } @Test - public void testTypedListInjection() { + public void typedListInjection() { Module module = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1_ListConfigurationMock5.class); binder.bind(MockInterface2.class).to(MockImplementation2_ListConfiguration.class); @@ -511,7 +511,7 @@ public class DefaultInjectorInjectionTest { } @Test - public void testListInjection_OverrideExplicitlyBoundType() { + public void listInjection_OverrideExplicitlyBoundType() { Module m1 = binder -> { binder.bind(MockInterface5.class).to(MockImplementation5.class); binder.bind(MockInterface1.class).to(MockImplementation1_ListConfiguration.class); @@ -528,11 +528,11 @@ public class DefaultInjectorInjectionTest { }); MockInterface1 service = new DefaultInjector(m1, m2).getInstance(MockInterface1.class); - assertEquals("List element was not overridden in submodule", ";abc", service.getName()); + assertEquals(";abc", service.getName(), "List element was not overridden in submodule"); } @Test - public void testListInjection_OverrideImplicitlyBoundType() { + public void listInjection_OverrideImplicitlyBoundType() { Module m1 = binder -> { binder.bind(MockInterface1.class).to(MockImplementation1_ListConfiguration.class); binder.bindList(Object.class, "xyz").add(MockImplementation5.class); @@ -547,12 +547,12 @@ public class DefaultInjectorInjectionTest { }); MockInterface1 service = new DefaultInjector(m1, m2).getInstance(MockInterface1.class); - assertEquals("List element was not overridden in submodule", ";abc", service.getName()); + assertEquals(";abc", service.getName(), "List element was not overridden in submodule"); } @Test - public void testInjectorInjection() { + public void injectorInjection() { Module module = binder -> binder.bind(MockInterface1.class).to( MockImplementation1_WithInjector.class); diff --git a/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorScopeTest.java b/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorScopeTest.java index 8a3592c05..35495d313 100644 --- a/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorScopeTest.java +++ b/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorScopeTest.java @@ -24,14 +24,14 @@ import org.apache.cayenne.di.mock.MockImplementation1; import org.apache.cayenne.di.mock.MockImplementation1_EventAnnotations; import org.apache.cayenne.di.mock.MockImplementation1_Provider; import org.apache.cayenne.di.mock.MockInterface1; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class DefaultInjectorScopeTest { @Test - public void testDefaultScope_IsSingleton() { + public void defaultScope_IsSingleton() { Module module = binder -> binder.bind(MockInterface1.class).to(MockImplementation1.class); @@ -50,7 +50,7 @@ public class DefaultInjectorScopeTest { } @Test - public void testNoScope() { + public void noScope() { Module module = binder -> binder .bind(MockInterface1.class) @@ -73,7 +73,7 @@ public class DefaultInjectorScopeTest { } @Test - public void testSingletonScope() { + public void singletonScope() { Module module = binder -> binder .bind(MockInterface1.class) @@ -95,7 +95,7 @@ public class DefaultInjectorScopeTest { } @Test - public void testSingletonScope_AnnotatedEvents() { + public void singletonScope_AnnotatedEvents() { MockImplementation1_EventAnnotations.reset(); @@ -119,7 +119,7 @@ public class DefaultInjectorScopeTest { } @Test - public void testSingletonScope_WithProvider() { + public void singletonScope_WithProvider() { Module module = binder -> binder .bind(MockInterface1.class) @@ -141,7 +141,7 @@ public class DefaultInjectorScopeTest { } @Test - public void testNoScope_WithProvider() { + public void noScope_WithProvider() { Module module = binder -> binder .bind(MockInterface1.class) diff --git a/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorTest.java b/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorTest.java index b628c61af..3a59ee1cf 100644 --- a/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorTest.java +++ b/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorTest.java @@ -21,20 +21,20 @@ package org.apache.cayenne.di.spi; import org.apache.cayenne.di.Module; import org.apache.cayenne.di.mock.MockImplementation1_EventAnnotations; import org.apache.cayenne.di.mock.MockInterface1; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class DefaultInjectorTest { @Test - public void testConstructor_Empty() { + public void constructor_Empty() { new DefaultInjector(); // no exceptions... } @Test - public void testConstructor_SingleModule() { + public void constructor_SingleModule() { final boolean[] configureCalled = new boolean[1]; Module module = binder -> configureCalled[0] = true; @@ -44,7 +44,7 @@ public class DefaultInjectorTest { } @Test - public void testConstructor_MultiModule() { + public void constructor_MultiModule() { final boolean[] configureCalled = new boolean[2]; @@ -58,7 +58,7 @@ public class DefaultInjectorTest { } @Test - public void testShutdown() { + public void shutdown() { MockImplementation1_EventAnnotations.reset(); diff --git a/cayenne-di/src/test/java/org/apache/cayenne/di/spi/ModuleLoaderTest.java b/cayenne-di/src/test/java/org/apache/cayenne/di/spi/ModuleLoaderTest.java index 91a554727..08e6bc0e0 100644 --- a/cayenne-di/src/test/java/org/apache/cayenne/di/spi/ModuleLoaderTest.java +++ b/cayenne-di/src/test/java/org/apache/cayenne/di/spi/ModuleLoaderTest.java @@ -23,26 +23,27 @@ import org.apache.cayenne.di.DIBootstrap; import org.apache.cayenne.di.DIRuntimeException; import org.apache.cayenne.di.Injector; import org.apache.cayenne.di.Module; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collection; import java.util.Collections; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ModuleLoaderTest { @Test - public void testLoad() { + public void load() { List<Module> modules = new ModuleLoader().load(ModuleProvider.class); assertEquals(4, modules.size()); - assertTrue(String.valueOf(modules.get(0)), modules.get(0) instanceof Module3); - assertTrue(String.valueOf(modules.get(1)), modules.get(1) instanceof Module4); - assertTrue(String.valueOf(modules.get(2)), modules.get(2) instanceof Module2); - assertTrue(String.valueOf(modules.get(3)), modules.get(3) instanceof Module1); + assertTrue(modules.get(0) instanceof Module3, String.valueOf(modules.get(0))); + assertTrue(modules.get(1) instanceof Module4, String.valueOf(modules.get(1))); + assertTrue(modules.get(2) instanceof Module2, String.valueOf(modules.get(2))); + assertTrue(modules.get(3) instanceof Module1, String.valueOf(modules.get(3))); Injector i = DIBootstrap.createInjector(modules); assertEquals("a", i.getInstance(String.class)); @@ -50,19 +51,19 @@ public class ModuleLoaderTest { } @Test - public void testLoadCustom() { + public void loadCustom() { List<Module> modules = new ModuleLoader().load(CustomModuleProvider.class); assertEquals(2, modules.size()); - assertTrue(String.valueOf(modules.get(0)), modules.get(0) instanceof Module5); - assertTrue(String.valueOf(modules.get(1)), modules.get(1) instanceof Module6); + assertTrue(modules.get(0) instanceof Module5, String.valueOf(modules.get(0))); + assertTrue(modules.get(1) instanceof Module6, String.valueOf(modules.get(1))); Injector i = DIBootstrap.createInjector(modules); assertEquals(Integer.valueOf(66), i.getInstance(Integer.class)); } - @Test(expected = DIRuntimeException.class) - public void testLoadCircularModules() { - new ModuleLoader().load(CircularModuleProvider.class); + @Test + public void loadCircularModules() { + assertThrows(DIRuntimeException.class, () -> new ModuleLoader().load(CircularModuleProvider.class)); } public static class Module1 implements Module {
