This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch remove-usage-of-deprecated-junit-3-api in repository https://gitbox.apache.org/repos/asf/aries.git
commit bd3e080043200caf00e03ec0ae8a0e17967191aa Author: Dominik Przybysz <[email protected]> AuthorDate: Fri May 9 15:03:02 2025 +0200 [MAINTENANCE] Remove junit 3 TestCase usage --- .../aries/blueprint/AbstractBlueprintTest.java | 4 +- .../apache/aries/blueprint/BeanLoadingTest.java | 6 + .../apache/aries/blueprint/ExtPlaceholderTest.java | 4 + .../aries/blueprint/NonStandardSettersTest.java | 3 + .../org/apache/aries/blueprint/NullProxyTest.java | 6 + .../org/apache/aries/blueprint/ParserTest.java | 14 +- .../org/apache/aries/blueprint/ReferencesTest.java | 18 +-- .../org/apache/aries/blueprint/WiringTest.java | 146 ++++++++++----------- .../container/AggregateConverterTest.java | 59 +++++---- .../aries/blueprint/container/GenericTypeTest.java | 14 +- .../blueprint/utils/DynamicCollectionTest.java | 18 ++- .../aries/blueprint/utils/HeaderParserTest.java | 17 ++- .../whiteboard/integration/MBeanServerTest.java | 6 +- .../jmx/whiteboard/integration/MBeanTest.java | 10 +- .../integration/helper/IntegrationTestBase.java | 15 +-- .../org/apache/aries/spifly/HeaderParserTest.java | 12 +- 16 files changed, 204 insertions(+), 148 deletions(-) diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/AbstractBlueprintTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/AbstractBlueprintTest.java index 4f2d4eaf5..b48040a9e 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/AbstractBlueprintTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/AbstractBlueprintTest.java @@ -26,15 +26,13 @@ import java.util.Set; import javax.xml.validation.Schema; -import junit.framework.TestCase; - import org.apache.aries.blueprint.ext.impl.ExtNamespaceHandler; import org.apache.aries.blueprint.parser.ComponentDefinitionRegistryImpl; import org.apache.aries.blueprint.parser.Parser; import org.apache.aries.blueprint.parser.NamespaceHandlerSet; import org.xml.sax.SAXException; -public abstract class AbstractBlueprintTest extends TestCase { +public abstract class AbstractBlueprintTest { protected ComponentDefinitionRegistryImpl parse(String name) throws Exception { NamespaceHandlerSet handlers = new NamespaceHandlerSet() { diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/BeanLoadingTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/BeanLoadingTest.java index be7ea62c6..5cbd2be6d 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/BeanLoadingTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/BeanLoadingTest.java @@ -21,9 +21,14 @@ package org.apache.aries.blueprint; import org.apache.aries.blueprint.di.Repository; import org.apache.aries.blueprint.parser.ComponentDefinitionRegistryImpl; import org.apache.aries.blueprint.pojos.SimpleBean; +import org.junit.Test; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; public class BeanLoadingTest extends AbstractBlueprintTest { + @Test public void testLoadSimpleBean() throws Exception { ComponentDefinitionRegistryImpl registry = parse("/test-bean-classes.xml"); Repository repository = new TestBlueprintContainer(registry) @@ -34,6 +39,7 @@ public class BeanLoadingTest extends AbstractBlueprintTest { assertTrue(obj instanceof SimpleBean); } + @Test public void testLoadSimpleBeanNested() throws Exception { ComponentDefinitionRegistryImpl registry = parse("/test-bean-classes.xml"); Repository repository = new TestBlueprintContainer(registry) diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ExtPlaceholderTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ExtPlaceholderTest.java index 2330aa346..5ee5be437 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ExtPlaceholderTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ExtPlaceholderTest.java @@ -24,6 +24,10 @@ import org.apache.aries.blueprint.parser.ComponentDefinitionRegistryImpl; import org.apache.aries.blueprint.pojos.BeanD; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class ExtPlaceholderTest extends AbstractBlueprintTest { @Test diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/NonStandardSettersTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/NonStandardSettersTest.java index 9a52cb0b5..731736661 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/NonStandardSettersTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/NonStandardSettersTest.java @@ -23,6 +23,9 @@ import org.apache.aries.blueprint.parser.ComponentDefinitionRegistryImpl; import org.apache.aries.blueprint.pojos.NonStandardSetter; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class NonStandardSettersTest extends AbstractBlueprintTest { @Test diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/NullProxyTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/NullProxyTest.java index 4a7020ee7..0902d70f1 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/NullProxyTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/NullProxyTest.java @@ -25,9 +25,15 @@ import org.apache.aries.blueprint.pojos.PojoC; import org.apache.aries.blueprint.pojos.Service; import org.apache.aries.proxy.ProxyManager; import org.apache.aries.proxy.impl.JdkProxyManager; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; public class NullProxyTest extends AbstractBlueprintTest { + @Test public void testNullProxy() throws Exception { ComponentDefinitionRegistryImpl registry = parse("/test-null-proxy.xml"); ProxyManager proxyManager = new JdkProxyManager(); diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ParserTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ParserTest.java index 37adaa10e..8bf27e822 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ParserTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ParserTest.java @@ -29,6 +29,7 @@ import java.io.IOException; import javax.xml.validation.Schema; +import org.junit.Test; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -46,17 +47,24 @@ import org.osgi.service.blueprint.reflect.RefMetadata; import org.osgi.service.blueprint.reflect.ValueMetadata; import org.xml.sax.SAXException; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + /** * TODO: constructor injection * TODO: Dependency#setMethod */ public class ParserTest extends AbstractBlueprintTest { + @Test public void test() { Integer[] oo = new Integer[1]; Object[] ii = oo; } + @Test public void testParseComponent() throws Exception { ComponentDefinitionRegistry registry = parse("/test-simple-component.xml"); assertNotNull(registry); @@ -147,11 +155,12 @@ public class ParserTest extends AbstractBlueprintTest { assertEquals(0, param.getIndex()); } + @Test public void testParse() throws Exception { parse("/test.xml"); } - + @Test public void testCustomNodes() throws Exception { ComponentDefinitionRegistry registry = parse("/test-custom-nodes.xml", new TestNamespaceHandlerSet()); @@ -182,7 +191,8 @@ public class ParserTest extends AbstractBlueprintTest { BeanMetadata comp3 = (BeanMetadata) metadata; assertEquals("org.apache.aries.Cache", comp3.getClassName()); } - + + @Test public void testScopes() throws Exception { ComponentDefinitionRegistry registry = parse("/test-scopes.xml", new TestNamespaceHandlerSet()); diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ReferencesTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ReferencesTest.java index 2347262da..77183b1e8 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ReferencesTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ReferencesTest.java @@ -28,13 +28,16 @@ import org.apache.aries.proxy.InvocationListener; import org.apache.aries.proxy.ProxyManager; import org.apache.aries.proxy.UnableToProxyException; import org.apache.aries.proxy.impl.AbstractProxyManager; +import org.junit.Assert; +import org.junit.Test; import org.osgi.framework.Bundle; import org.osgi.service.blueprint.container.ComponentDefinitionException; -public class ReferencesTest extends AbstractBlueprintTest { - +import static org.junit.Assert.assertThrows; +public class ReferencesTest extends AbstractBlueprintTest { + @Test public void testWiring() throws Exception { ComponentDefinitionRegistryImpl registry = parse("/test-references.xml"); ProxyManager proxyManager = new AbstractProxyManager() { @@ -57,17 +60,10 @@ public class ReferencesTest extends AbstractBlueprintTest { repository.create("refItf"); - try { - repository.create("refClsErr"); - fail("Should have failed"); - } catch (ComponentDefinitionException e) { - - } + assertThrows(ComponentDefinitionException.class, + () -> repository.create("refClsErr")); repository.create("refClsOk"); } - - static class ProxyGenerationException extends RuntimeException { - } } diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/WiringTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/WiringTest.java index 5d3629ac4..225e7bd04 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/WiringTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/WiringTest.java @@ -47,13 +47,23 @@ import org.apache.aries.blueprint.intercept.TheInterceptor; import org.apache.aries.blueprint.parser.ComponentDefinitionRegistryImpl; import org.apache.aries.blueprint.pojos.*; import org.apache.aries.blueprint.proxy.ProxyUtils; +import org.junit.Test; import org.osgi.framework.ServiceRegistration; import org.osgi.service.blueprint.container.ComponentDefinitionException; import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; public class WiringTest extends AbstractBlueprintTest { + @Test public void testWiring() throws Exception { ComponentDefinitionRegistryImpl registry = parse("/test-wiring.xml"); Repository repository = new TestBlueprintContainer(registry).getRepository(); @@ -63,7 +73,7 @@ public class WiringTest extends AbstractBlueprintTest { assertTrue(obj1 instanceof PojoA); PojoA pojoa = (PojoA) obj1; // test singleton scope - assertTrue(obj1 == repository.create("pojoA")); + assertSame(obj1, repository.create("pojoA")); Object obj2 = repository.create("pojoB"); assertNotNull(obj2); @@ -123,7 +133,7 @@ public class WiringTest extends AbstractBlueprintTest { assertEquals(new Integer(200), pojoa.getNumberArray()[3]); // test init-method - assertEquals(true, pojob.getInitCalled()); + assertTrue(pojob.getInitCalled()); // test service Object obj3 = repository.create("service1"); @@ -144,15 +154,16 @@ public class WiringTest extends AbstractBlueprintTest { // tests 'prototype' scope Object obj4 = repository.create("pojoC"); assertNotNull(obj4); - - assertTrue(obj4 != repository.create("pojoC")); + + assertNotSame(obj4, repository.create("pojoC")); repository.destroy(); // test destroy-method - assertEquals(true, pojob.getDestroyCalled()); + assertTrue(pojob.getDestroyCalled()); } - + + @Test public void testSetterDisambiguation() throws Exception { ComponentDefinitionRegistryImpl registry = parse("/test-wiring.xml"); Repository repository = new TestBlueprintContainer(registry).getRepository(); @@ -165,7 +176,8 @@ public class WiringTest extends AbstractBlueprintTest { } - + + @Test public void testFieldInjection() throws Exception { ComponentDefinitionRegistryImpl registry = parse("/test-wiring.xml"); Repository repository = new TestBlueprintContainer(registry).getRepository(); @@ -183,18 +195,15 @@ public class WiringTest extends AbstractBlueprintTest { assertEquals("aName", bean.getBeanName()); // fail if field-injection is not specified - try { - repository.create("FIFailureTestBean"); - fail("Expected exception"); - } catch (ComponentDefinitionException cde) {} - + assertThrows(ComponentDefinitionException.class, + ()-> repository.create("FIFailureTestBean")); + // fail if field-injection is false - try { - repository.create("FIFailureTest2Bean"); - fail("Expected exception"); - } catch (ComponentDefinitionException cde) {} + assertThrows(ComponentDefinitionException.class, + ()-> repository.create("FIFailureTest2Bean")); } - + + @Test public void testCompoundProperties() throws Exception { ComponentDefinitionRegistryImpl registry = parse("/test-wiring.xml"); Repository repository = new TestBlueprintContainer(registry).getRepository(); @@ -214,18 +223,16 @@ public class WiringTest extends AbstractBlueprintTest { assertEquals("pojoA", bean.getName()); } + @Test public void testIdRefs() throws Exception { ComponentDefinitionRegistryImpl registry = parse("/test-bad-id-ref.xml"); - try { - new TestBlueprintContainer(registry).getRepository(); - fail("Did not throw exception"); - } catch (RuntimeException e) { - // we expect exception + assertThrows(RuntimeException.class, + ()-> new TestBlueprintContainer(registry).getRepository()); // TODO: check error string? - } } - + + @Test public void testDependencies() throws Exception { CallbackTracker.clear(); @@ -256,7 +263,8 @@ public class WiringTest extends AbstractBlueprintTest { assertEquals(Callback.DESTROY, callback.getType()); assertEquals(obj, callback.getObject()); } - + + @Test public void testConstructor() throws Exception { ComponentDefinitionRegistryImpl registry = parse("/test-constructor.xml"); Repository repository = new TestBlueprintContainer(registry).getRepository(); @@ -302,15 +310,11 @@ public class WiringTest extends AbstractBlueprintTest { testMultiple(obj10, null, 1234, null); Object obj11 = repository.create("multipleFactory2"); - testMultiple(obj11, "helloCreate-boolean", -1, null); - - try { - repository.create("multipleFactoryNull"); - fail("Did not throw exception"); - } catch (RuntimeException e) { - // we expect exception + testMultiple(obj11, "helloCreate-boolean", -1, null); + + assertThrows(RuntimeException.class, + ()-> repository.create("multipleFactoryNull")); // TODO: check the exception string? - } Object obj12 = repository.create("multipleFactoryTypedNull"); testMultiple(obj12, "hello-boolean", -1, null); @@ -354,7 +358,7 @@ public class WiringTest extends AbstractBlueprintTest { BeanF obj15 = (BeanF) repository.create("booleanWrapped"); assertNotNull(obj15.getWrapped()); - assertEquals(false, (boolean) obj15.getWrapped()); + assertFalse(obj15.getWrapped()); assertNull(obj15.getPrim()); // TODO: check the below tests when the incoherence between TCK / spec is solved @@ -392,12 +396,14 @@ public class WiringTest extends AbstractBlueprintTest { assertEquals(map, ((Multiple)obj).getProperties()); } + @Test public void testGenerics2() throws Exception { ComponentDefinitionRegistryImpl registry = parse("/test-generics.xml"); Repository repository = new TestBlueprintContainer(registry).getRepository(); repository.create("gen2"); } + @Test public void testGenerics() throws Exception { ComponentDefinitionRegistryImpl registry = parse("/test-generics.xml"); Repository repository = new TestBlueprintContainer(registry).getRepository(); @@ -455,64 +461,65 @@ public class WiringTest extends AbstractBlueprintTest { assertEquals("stringToo", ((Primavera) obj).prop); } + @Test public void testMixedGenericsTracker() throws Exception { ComponentDefinitionRegistryImpl registry = parse("/test-generics-mix.xml"); Repository repository = new TestBlueprintContainer(registry).getRepository(); repository.create("tracker"); } + @Test public void testMixedGenericsTypedTracker() throws Exception { ComponentDefinitionRegistryImpl registry = parse("/test-generics-mix.xml"); Repository repository = new TestBlueprintContainer(registry).getRepository(); - try { - repository.create("typedTracker"); - fail("Should have thrown an exception"); - } catch (ComponentDefinitionException e) { - // expected - } + assertThrows(ComponentDefinitionException.class, + ()-> repository.create("typedTracker")); } + @Test public void testMixedGenericsTypedTrackerRaw() throws Exception { ComponentDefinitionRegistryImpl registry = parse("/test-generics-mix.xml"); Repository repository = new TestBlueprintContainer(registry).getRepository(); repository.create("typedTrackerRaw"); } + @Test public void testMixedGenericsTypedClassTracker() throws Exception { ComponentDefinitionRegistryImpl registry = parse("/test-generics-mix.xml"); Repository repository = new TestBlueprintContainer(registry).getRepository(); - try { - repository.create("typedClassTracker"); - fail("Should have thrown an exception"); - } catch (ComponentDefinitionException e) { - // expected - } + assertThrows(ComponentDefinitionException.class, + ()-> repository.create("typedClassTracker")); } + @Test public void testMixedGenericsTypedClassTrackerRaw() throws Exception { ComponentDefinitionRegistryImpl registry = parse("/test-generics-mix.xml"); Repository repository = new TestBlueprintContainer(registry).getRepository(); repository.create("typedClassTrackerRaw"); } + @Test public void testMixedGenericsTypedGeneric() throws Exception { ComponentDefinitionRegistryImpl registry = parse("/test-generics-mix.xml"); Repository repository = new TestBlueprintContainer(registry).getRepository(); repository.create("typedGenericTracker"); } + @Test public void testMixedGenericsTypedGenericClass() throws Exception { ComponentDefinitionRegistryImpl registry = parse("/test-generics-mix.xml"); Repository repository = new TestBlueprintContainer(registry).getRepository(); repository.create("typedClassGenericTracker"); } + @Test public void testThreadPoolCreation() throws Exception { ComponentDefinitionRegistryImpl registry = parse("/test-threadpool.xml"); Repository repository = new TestBlueprintContainer(registry).getRepository(); repository.create("executorService"); } + @Test public void testCachePojo() throws Exception { ComponentDefinitionRegistryImpl registry = parse("/test-cache.xml"); Repository repository = new TestBlueprintContainer(registry).getRepository(); @@ -520,6 +527,7 @@ public class WiringTest extends AbstractBlueprintTest { repository.create("queueCountCache"); } + @Test public void testVarArgPojo() throws Exception { ComponentDefinitionRegistryImpl registry = parse("/test-vararg.xml"); Repository repository = new TestBlueprintContainer(registry).getRepository(); @@ -527,6 +535,7 @@ public class WiringTest extends AbstractBlueprintTest { assertArrayEquals(new String[] { "-web" }, va.args); } + @Test public void testCircular() throws Exception { BlueprintRepository repository = createBlueprintContainer().getRepository(); @@ -544,39 +553,26 @@ public class WiringTest extends AbstractBlueprintTest { assertEquals(obj2, ((PojoListener) obj3).getService() ); } - + + @Test public void testCircularPrototype() throws Exception { BlueprintRepository repository = createBlueprintContainer().getRepository(); - - try { - repository.create("circularPrototypeDriver"); - fail("Did not throw exception"); - } catch (CircularDependencyException e) { - // that's what we expect - } - try { - repository.create("circularPrototype"); - fail("Did not throw exception"); - } catch (CircularDependencyException e) { - // that's what we expect - } + assertThrows(CircularDependencyException.class, + ()-> repository.create("circularPrototypeDriver")); + + assertThrows(CircularDependencyException.class, + ()-> repository.create("circularPrototype")); } - + + @Test public void testRecursive() throws Exception { BlueprintRepository repository = createBlueprintContainer().getRepository(); - - try { - repository.create("recursiveConstructor"); - fail("Did not throw exception"); - } catch (ComponentDefinitionException e) { - if (e.getCause() instanceof CircularDependencyException) { - // that's what we expect - } else { - fail("Did not throw expected exception"); - throw e; - } - } + + ComponentDefinitionException e = assertThrows(ComponentDefinitionException.class, + () -> repository.create("recursiveConstructor")); + + assertTrue(e.getCause() instanceof CircularDependencyException); PojoRecursive pojo; @@ -586,7 +582,8 @@ public class WiringTest extends AbstractBlueprintTest { pojo = (PojoRecursive) repository.create("recursiveInitMethod"); assertNotNull(pojo); } - + + @Test public void testCircularBreaking() throws Exception { BlueprintRepository repository; @@ -600,6 +597,7 @@ public class WiringTest extends AbstractBlueprintTest { assertNotNull(repository.create("c3")); } + @Test public void testInterceptors() throws Exception { ComponentDefinitionRegistryImpl registry = parse("/test-interceptors.xml"); Repository repository = new TestBlueprintContainer(registry).getRepository(); diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/AggregateConverterTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/AggregateConverterTest.java index 8f277b6dc..9a144edb3 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/AggregateConverterTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/AggregateConverterTest.java @@ -32,28 +32,41 @@ import java.util.List; import java.util.Locale; import java.util.Properties; -import junit.framework.TestCase; import org.apache.aries.blueprint.TestBlueprintContainer; import org.apache.aries.blueprint.pojos.PojoGenerics2.MyClass; import org.apache.aries.blueprint.pojos.PojoGenerics2.MyObject; import org.apache.aries.blueprint.pojos.PojoGenerics2.Tata; import org.apache.aries.blueprint.pojos.PojoGenerics2.Toto; +import org.junit.Before; +import org.junit.Test; import org.osgi.service.blueprint.container.ReifiedType; import org.osgi.service.blueprint.container.Converter; -public class AggregateConverterTest extends TestCase { +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; + +public class AggregateConverterTest { private AggregateConverter service; - protected void setUp() throws Exception { + @Before + public void setUp() throws Exception { service = new AggregateConverter(new TestBlueprintContainer(null)); } + @Test public void testConvertNumbers() throws Exception { assertEquals(1, service.convert(1.46f, int.class)); assertEquals(1.0d, service.convert(1, double.class)); } + @Test public void testConvertSimpleTypes() throws Exception { assertEquals(123, service.convert("123", int.class)); assertEquals(123, service.convert("123", Integer.class)); @@ -67,6 +80,7 @@ public class AggregateConverterTest extends TestCase { assertEquals(1.5, service.convert("1.5", Double.class)); } + @Test public void testConvertCharacter() throws Exception { assertEquals('c', service.convert("c", char.class)); assertEquals('c', service.convert("c", Character.class)); @@ -74,6 +88,7 @@ public class AggregateConverterTest extends TestCase { assertEquals('\u00F6', service.convert("\\u00F6", Character.class)); } + @Test public void testConvertBoolean() throws Exception { assertEquals(Boolean.TRUE, service.convert("true", Boolean.class)); assertEquals(Boolean.TRUE, service.convert("yes", Boolean.class)); @@ -106,12 +121,14 @@ public class AggregateConverterTest extends TestCase { assertEquals(Boolean.TRUE, service.convert(true, Boolean.class)); } + @Test public void testConvertOther() throws Exception { assertEquals(URI.create("urn:test"), service.convert("urn:test", URI.class)); assertEquals(new URL("file:/test"), service.convert("file:/test", URL.class)); assertEquals(new BigInteger("12345"), service.convert("12345", BigInteger.class)); } + @Test public void testConvertProperties() throws Exception { Properties props = new Properties(); props.setProperty("key", "value"); @@ -122,6 +139,7 @@ public class AggregateConverterTest extends TestCase { assertEquals("value", props.getProperty("key")); } + @Test public void testConvertLocale() throws Exception { Object result; result = service.convert("en", Locale.class); @@ -144,7 +162,8 @@ public class AggregateConverterTest extends TestCase { assertTrue(result instanceof Locale); assertEquals(new Locale("de", "", "POSIX"), result); } - + + @Test public void testConvertClass() throws Exception { assertEquals(this, service.convert(this, AggregateConverterTest.class)); assertEquals(AggregateConverterTest.class, service.convert(this.getClass().getName(), Class.class)); @@ -153,6 +172,7 @@ public class AggregateConverterTest extends TestCase { assertTrue(AggregateConverter.isAssignable(RegionIterable.class, new GenericType(Class.class, new GenericType(RegionIterable.class)))); } + @Test public void testConvertArray() throws Exception { Object obj = service.convert(Arrays.asList(Arrays.asList(1, 2), Arrays.asList(3, 4)), GenericType.parse("java.util.List<java.lang.Integer>[]", getClass().getClassLoader())); @@ -172,7 +192,8 @@ public class AggregateConverterTest extends TestCase { assertEquals(4, ((List) o[1]).get(1)); //assertEquals((Object) new int[] { 1, 2 }, (Object) service.convert(Arrays.asList(1, 2), int[].class)); } - + + @Test public void testCustom() throws Exception { AggregateConverter s = new AggregateConverter(new TestBlueprintContainer(null)); s.registerConverter(new RegionConverter()); @@ -200,6 +221,7 @@ public class AggregateConverterTest extends TestCase { assertNull(result); } + @Test public void testGenericWilcard() throws Exception { Constructor cns = MyClass.class.getConstructor(MyObject.class); assertTrue(AggregateConverter.isAssignable(new Toto(), new GenericType(cns.getGenericParameterTypes()[0]))); @@ -208,43 +230,34 @@ public class AggregateConverterTest extends TestCase { assertTrue(AggregateConverter.isAssignable(new Toto(), new GenericType(cns.getGenericParameterTypes()[0]))); } + @Test public void testGenericAssignable() throws Exception { AggregateConverter s = new AggregateConverter(new TestBlueprintContainer(null)); assertNotNull(s.convert(new RegionIterable(), new GenericType(Iterable.class, new GenericType(Region.class)))); - try { - s.convert(new ArrayList<Region>(), new GenericType(Iterable.class, new GenericType(Region.class))); - fail("Conversion should have thrown an exception"); - } catch (Exception e) { - // Ignore - } + assertThrows(Exception.class, () -> + s.convert(new ArrayList<Region>(), new GenericType(Iterable.class, new GenericType(Region.class)))); assertTrue(Iterable.class.isAssignableFrom(RegionIterable.class)); // note that method signature is fromType, toType - reverse than above assertTrue("Type should be assignable.", AggregateConverter.isTypeAssignable(new GenericType(RegionIterable.class), new GenericType(Iterable.class))); } + @Test public void testGenericCollection() throws Exception { AggregateConverter s = new AggregateConverter(new TestBlueprintContainer(null)); - try { - s.convert(new ArrayList(), new GenericType(Iterable.class, new GenericType(Region.class))); - fail("Conversion should have thrown an exception"); - } catch (Exception e) { - // Ignore - } + assertThrows(Exception.class, + () -> s.convert(new ArrayList<Region>(), new GenericType(Iterable.class, new GenericType(Region.class)))); - try { - s.convert(Arrays.asList(0l), new GenericType(Iterable.class, new GenericType(Region.class))); - fail("Conversion should have thrown an exception"); - } catch (Exception e) { - // Ignore - } + assertThrows(Exception.class, + () -> s.convert(Arrays.asList(0l), new GenericType(Iterable.class, new GenericType(Region.class)))); assertNotNull(s.convert(Arrays.asList(new EuRegion() {}), new GenericType(List.class, new GenericType(Region.class)))); } + @Test public void testConvertCompatibleCollections() throws Exception { Object org = Arrays.asList(Arrays.asList(1, 2), Arrays.asList(3, 4)); Object obj = service.convert(org, diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/GenericTypeTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/GenericTypeTest.java index ceb547882..26074197d 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/GenericTypeTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/GenericTypeTest.java @@ -18,21 +18,25 @@ */ package org.apache.aries.blueprint.container; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.net.URI; -import junit.framework.TestCase; +import org.junit.Test; -public class GenericTypeTest extends TestCase { +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +public class GenericTypeTest { private GenericType parse(String expression) throws Exception { GenericType type = GenericType.parse(expression, getClass().getClassLoader()); assertEquals(expression, type.toString()); return type; } - + + @Test public void testArrays() { assertTrue(AggregateConverter.isAssignable(new Object[0], new GenericType(Object[].class))); assertFalse(AggregateConverter.isAssignable(new Object[0], new GenericType(String[].class))); @@ -41,6 +45,7 @@ public class GenericTypeTest extends TestCase { assertTrue(AggregateConverter.isAssignable(new String[0], new GenericType(Object[].class))); } + @Test public void testParseTypes() throws Exception { GenericType type = parse("java.util.List<java.lang.String[]>"); @@ -69,6 +74,7 @@ public class GenericTypeTest extends TestCase { assertEquals(Number.class, type.getActualTypeArgument(0).getRawClass()); } + @Test public void testBasic() throws Exception { GenericType type = new GenericType(int[].class); assertEquals("int[]", type.toString()); diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/DynamicCollectionTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/DynamicCollectionTest.java index b955744ef..a2218d726 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/DynamicCollectionTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/DynamicCollectionTest.java @@ -20,9 +20,14 @@ package org.apache.aries.blueprint.utils; import java.util.Iterator; -import junit.framework.TestCase; +import org.junit.Before; +import org.junit.Test; -public class DynamicCollectionTest extends TestCase { +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +public class DynamicCollectionTest { protected static final Object O0 = new Object(); protected static final Object O1 = new Object(); @@ -31,10 +36,12 @@ public class DynamicCollectionTest extends TestCase { protected DynamicCollection<Object> collection; - protected void setUp() { + @Before + public void setUp() { collection = new DynamicCollection<Object>(); } + @Test public void testAddRemove() throws Exception { assertEquals(0, collection.size()); assertTrue(collection.isEmpty()); @@ -54,6 +61,7 @@ public class DynamicCollectionTest extends TestCase { assertEquals(0, collection.size()); } + @Test public void testSimpleIterator() throws Exception { collection.add(O0); @@ -63,6 +71,7 @@ public class DynamicCollectionTest extends TestCase { assertFalse(iterator.hasNext()); } + @Test public void testAddWhileIterating() throws Exception { Iterator iterator = collection.iterator(); assertFalse(iterator.hasNext()); @@ -73,6 +82,7 @@ public class DynamicCollectionTest extends TestCase { assertFalse(iterator.hasNext()); } + @Test public void testRemoveElementWhileIterating() throws Exception { collection.add(O0); collection.add(O1); @@ -86,6 +96,7 @@ public class DynamicCollectionTest extends TestCase { assertFalse(iterator.hasNext()); } + @Test public void testRemoveElementAfterWhileIterating() throws Exception { collection.add(O0); collection.add(O1); @@ -97,6 +108,7 @@ public class DynamicCollectionTest extends TestCase { assertFalse(iterator.hasNext()); } + @Test public void testRemoveElementBeforeWhileIterating() throws Exception { collection.add(O0); collection.add(O1); diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/HeaderParserTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/HeaderParserTest.java index 20d19d058..d5dd02c40 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/HeaderParserTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/HeaderParserTest.java @@ -20,12 +20,15 @@ package org.apache.aries.blueprint.utils; import java.util.List; -import junit.framework.TestCase; import org.apache.aries.blueprint.utils.HeaderParser.PathElement; +import org.junit.Test; -public class HeaderParserTest extends TestCase { +import static org.junit.Assert.assertEquals; - public void testSimple() throws Exception { +public class HeaderParserTest { + + @Test + public void testSimple() { List<PathElement> paths = HeaderParser.parseHeader("/foo.xml, /foo/bar.xml"); assertEquals(2, paths.size()); assertEquals("/foo.xml", paths.get(0).getName()); @@ -35,8 +38,9 @@ public class HeaderParserTest extends TestCase { assertEquals(0, paths.get(1).getAttributes().size()); assertEquals(0, paths.get(1).getDirectives().size()); } - - public void testComplex() throws Exception { + + @Test + public void testComplex() { List<PathElement> paths = HeaderParser.parseHeader("OSGI-INF/blueprint/comp1_named.xml;ignored-directive:=true,OSGI-INF/blueprint/comp2_named.xml;some-other-attribute=1"); assertEquals(2, paths.size()); assertEquals("OSGI-INF/blueprint/comp1_named.xml", paths.get(0).getName()); @@ -49,7 +53,8 @@ public class HeaderParserTest extends TestCase { assertEquals(0, paths.get(1).getDirectives().size()); } - public void testPaths() throws Exception { + @Test + public void testPaths() { List<PathElement> paths = HeaderParser.parseHeader("OSGI-INF/blueprint/comp1_named.xml;ignored-directive:=true,OSGI-INF/blueprint/comp2_named.xml;foo.xml;a=b;1:=2;c:=d;4=5"); assertEquals(3, paths.size()); assertEquals("OSGI-INF/blueprint/comp1_named.xml", paths.get(0).getName()); diff --git a/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanServerTest.java b/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanServerTest.java index 774b1e7d6..ccdd17fe6 100644 --- a/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanServerTest.java +++ b/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanServerTest.java @@ -21,8 +21,6 @@ package org.apache.aries.jmx.whiteboard.integration; import javax.management.MBeanServer; import javax.management.ObjectName; -import junit.framework.TestCase; - import org.apache.aries.jmx.whiteboard.integration.helper.IntegrationTestBase; import org.apache.aries.jmx.whiteboard.integration.helper.TestClass; import org.apache.aries.jmx.whiteboard.integration.helper.TestClassMBean; @@ -33,6 +31,8 @@ import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; import org.osgi.framework.ServiceRegistration; +import static org.junit.Assert.assertEquals; + /** * The <code>MBeanTest</code> tests MBean registration with MBean Servers */ @@ -65,7 +65,7 @@ public class MBeanServerTest extends IntegrationTestBase { assertRegistered(server, objectName); // expect MBean to return expected value - TestCase.assertEquals(instanceName, + assertEquals(instanceName, server.getAttribute(objectName, "InstanceName")); // unregister MBean server, expect MBean to be unregistered diff --git a/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanTest.java b/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanTest.java index 1e80e4b8b..b6b9ca799 100644 --- a/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanTest.java +++ b/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanTest.java @@ -22,8 +22,6 @@ import javax.management.DynamicMBean; import javax.management.MBeanServer; import javax.management.ObjectName; -import junit.framework.TestCase; - import org.apache.aries.jmx.whiteboard.integration.helper.IntegrationTestBase; import org.apache.aries.jmx.whiteboard.integration.helper.TestClass; import org.apache.aries.jmx.whiteboard.integration.helper.TestClassMBean; @@ -36,6 +34,8 @@ import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; import org.osgi.framework.ServiceRegistration; +import static org.junit.Assert.assertEquals; + /** * The <code>MBeanTest</code> tests MBean registration with MBean Servers */ @@ -61,7 +61,7 @@ public class MBeanTest extends IntegrationTestBase { assertRegistered(server, objectName); // expect MBean to return expected value - TestCase.assertEquals(instanceName, + assertEquals(instanceName, server.getAttribute(objectName, "InstanceName")); // unregister MBean, expect to not be registered any more @@ -87,7 +87,7 @@ public class MBeanTest extends IntegrationTestBase { assertRegistered(server, objectName); // expect MBean to return expected value - TestCase.assertEquals(instanceName, + assertEquals(instanceName, server.getAttribute(objectName, "InstanceName")); // unregister MBean, expect to not be registered any more @@ -114,7 +114,7 @@ public class MBeanTest extends IntegrationTestBase { assertRegistered(server, objectName); // expect MBean to return expected value - TestCase.assertEquals(instanceName, + assertEquals(instanceName, server.getAttribute(objectName, "InstanceName")); // unregister MBean, expect to not be registered any more diff --git a/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java b/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java index 1b2862c27..7d182c748 100644 --- a/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java +++ b/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java @@ -18,8 +18,10 @@ */ package org.apache.aries.jmx.whiteboard.integration.helper; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; import static org.ops4j.pax.exam.CoreOptions.*; -import static org.ops4j.pax.exam.OptionUtils.combine; import java.io.File; import java.util.Dictionary; @@ -32,12 +34,9 @@ import javax.management.MBeanServerFactory; import javax.management.ObjectInstance; import javax.management.ObjectName; -import junit.framework.TestCase; - import org.junit.After; import org.junit.Before; import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.CoreOptions; import org.ops4j.pax.exam.Option; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; @@ -149,10 +148,10 @@ public class IntegrationTestBase { final ObjectName objectName) { try { ObjectInstance instance = server.getObjectInstance(objectName); - TestCase.assertNotNull(instance); - TestCase.assertEquals(objectName, instance.getObjectName()); + assertNotNull(instance); + assertEquals(objectName, instance.getObjectName()); } catch (InstanceNotFoundException nfe) { - TestCase.fail("Expected instance of " + objectName + fail("Expected instance of " + objectName + " registered with MBeanServer"); } } @@ -161,7 +160,7 @@ public class IntegrationTestBase { final ObjectName objectName) { try { server.getObjectInstance(objectName); - TestCase.fail("Unexpected instance of " + objectName + fail("Unexpected instance of " + objectName + " registered with MBeanServer"); } catch (InstanceNotFoundException nfe) { // expected, ignore diff --git a/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/HeaderParserTest.java b/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/HeaderParserTest.java index 92b1f535b..66b014ebe 100644 --- a/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/HeaderParserTest.java +++ b/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/HeaderParserTest.java @@ -20,11 +20,11 @@ package org.apache.aries.spifly; import java.util.List; -import junit.framework.TestCase; - import org.junit.Test; -public class HeaderParserTest extends TestCase { +import static org.junit.Assert.assertEquals; + +public class HeaderParserTest { @Test public void testMethodWithMultipleParameters() { @@ -36,9 +36,9 @@ public class HeaderParserTest extends TestCase { List<HeaderParser.PathElement> pathElements = HeaderParser.parseHeader(header); assertEquals(3, pathElements.size()); - assertEquals(pathElements.get(0).getName(), "javax.ws.rs.client.FactoryFinder#find(java.lang.String,java.lang.String)"); - assertEquals(pathElements.get(1).getName(), "javax.ws.rs.ext.FactoryFinder#find(java.lang.String,java.lang.String)"); - assertEquals(pathElements.get(2).getName(), "javax.ws.rs.other.FactoryFinder#find(java.lang.String,java.lang.String)"); + assertEquals("javax.ws.rs.client.FactoryFinder#find(java.lang.String,java.lang.String)", pathElements.get(0).getName()); + assertEquals("javax.ws.rs.ext.FactoryFinder#find(java.lang.String,java.lang.String)", pathElements.get(1).getName()); + assertEquals("javax.ws.rs.other.FactoryFinder#find(java.lang.String,java.lang.String)", pathElements.get(2).getName()); } } \ No newline at end of file
