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 14852c8b4081639a9d949da3a0bc62c1ab990e62 Author: Dominik Przybysz <[email protected]> AuthorDate: Fri May 9 14:11:03 2025 +0200 [MAINTENANCE] Remove usage of deprecated junit.framework.Assert --- .../org/apache/aries/blueprint/WiringTest.java | 3 +- .../aries/blueprint/container/BPQuiesceTest.java | 2 +- .../blueprint/itests/QuiesceBlueprintTest.java | 34 +++++++++++----------- .../aries/blueprint/itests/TestReferences.java | 4 +-- .../aries/jmx/framework/ServiceStateMBeanTest.java | 4 +-- .../AbstractListenerComponentValidator.java | 2 +- .../blueprint/framework/MapEntryValidator.java | 2 +- .../test/blueprint/framework/ServiceValidator.java | 2 +- .../org/apache/aries/jndi/InitialContextTest.java | 3 +- .../org/apache/aries/unittest/mocks/Skeleton.java | 4 +-- .../aries/transaction/itests/NotSupportedTest.java | 2 +- .../aries/transaction/itests/RequiresNewTest.java | 2 +- .../aries/transaction/itests/RollbackOnTest.java | 2 +- 13 files changed, 31 insertions(+), 35 deletions(-) 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 7bca2c647..e0aad28c4 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 @@ -33,7 +33,7 @@ import java.util.Properties; import java.util.Set; import java.util.TimeZone; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.aries.blueprint.CallbackTracker.Callback; import org.apache.aries.blueprint.container.BlueprintRepository; @@ -43,7 +43,6 @@ import org.apache.aries.blueprint.di.ExecutionContext; import org.apache.aries.blueprint.di.MapRecipe; import org.apache.aries.blueprint.di.Recipe; import org.apache.aries.blueprint.di.Repository; -import org.apache.aries.blueprint.intercept.BeanA; import org.apache.aries.blueprint.intercept.BeanB; import org.apache.aries.blueprint.intercept.TheInterceptor; import org.apache.aries.blueprint.parser.ComponentDefinitionRegistryImpl; diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/BPQuiesceTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/BPQuiesceTest.java index 63e3dd9d0..2c6e2e1ac 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/BPQuiesceTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/BPQuiesceTest.java @@ -18,7 +18,7 @@ */ package org.apache.aries.blueprint.container; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.concurrent.Semaphore; diff --git a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java index a8629abda..b2507431d 100644 --- a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java +++ b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java @@ -24,7 +24,7 @@ import java.util.Collections; import java.util.List; import java.util.Arrays; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.aries.blueprint.testquiescebundle.TestBean; import org.apache.aries.quiesce.manager.QuiesceCallback; @@ -152,14 +152,14 @@ private QuiesceParticipant getParticipant(String bundleName) throws InvalidSynta System.out.println("Called Quiesce"); Thread.sleep(1000); - - Assert.assertTrue("Quiesce callback should not have occurred yet; calls should be 0, but it is "+callback.getCalls(), callback.getCalls()==0); + + Assert.assertEquals("Quiesce callback should not have occurred yet; calls should be 0, but it is " + callback.getCalls(), 0, callback.getCalls()); t.join(); System.out.println("After join"); - - Assert.assertTrue("Quiesce callback should have occurred once; calls should be 1, but it is "+callback.getCalls(), callback.getCalls()==1); + + Assert.assertEquals("Quiesce callback should have occurred once; calls should be 1, but it is " + callback.getCalls(), 1, callback.getCalls()); } else @@ -211,9 +211,9 @@ private QuiesceParticipant getParticipant(String bundleName) throws InvalidSynta System.out.println("Called Quiesce"); Thread.sleep(200); - - Assert.assertTrue("Quiesce callback B should have occurred; calls should be 1, but it is "+callbackB.getCalls(), callbackB.getCalls()==1); - Assert.assertTrue("Quiesce callback A should not have occurred yet; calls should be 0, but it is "+callbackA.getCalls(), callbackA.getCalls()==0); + + Assert.assertEquals("Quiesce callback B should have occurred; calls should be 1, but it is " + callbackB.getCalls(), 1, callbackB.getCalls()); + Assert.assertEquals("Quiesce callback A should not have occurred yet; calls should be 0, but it is " + callbackA.getCalls(), 0, callbackA.getCalls()); bundleb.stop(); @@ -223,9 +223,9 @@ private QuiesceParticipant getParticipant(String bundleName) throws InvalidSynta Thread.sleep(1000); System.out.println("After second sleep"); - - Assert.assertTrue("Quiesce callback A should have occurred once; calls should be 1, but it is "+callbackA.getCalls(), callbackA.getCalls()==1); - Assert.assertTrue("Quiesce callback B should have occurred once; calls should be 1, but it is "+callbackB.getCalls(), callbackB.getCalls()==1); + + Assert.assertEquals("Quiesce callback A should have occurred once; calls should be 1, but it is " + callbackA.getCalls(), 1, callbackA.getCalls()); + Assert.assertEquals("Quiesce callback B should have occurred once; calls should be 1, but it is " + callbackB.getCalls(), 1, callbackB.getCalls()); }else{ throw new Exception("No Quiesce Participant found for the blueprint service"); @@ -276,14 +276,14 @@ private QuiesceParticipant getParticipant(String bundleName) throws InvalidSynta System.out.println("Called Quiesce"); Thread.sleep(500); - - Assert.assertTrue("Quiesce callback should have occurred once for bundle a but not for bundle q; calls should be 1, but it is "+callback.getCalls(), callback.getCalls()==1); + + Assert.assertEquals("Quiesce callback should have occurred once for bundle a but not for bundle q; calls should be 1, but it is " + callback.getCalls(), 1, callback.getCalls()); Thread.sleep(1500); System.out.println("After second sleep"); - - Assert.assertTrue("Quiesce callback should have occurred twice, once for bundle a and q respectively; calls should be 2, but it is "+callback.getCalls(), callback.getCalls()==2); + + Assert.assertEquals("Quiesce callback should have occurred twice, once for bundle a and q respectively; calls should be 2, but it is " + callback.getCalls(), 2, callback.getCalls()); }else{ throw new Exception("No Quiesce Participant found for the blueprint service"); @@ -331,8 +331,8 @@ private QuiesceParticipant getParticipant(String bundleName) throws InvalidSynta t2.start(); Thread.sleep(5000); - - Assert.assertTrue("Quiesce callback should have occurred once; calls should be 1, but it is "+callback.getCalls(), callback.getCalls()==1); + + Assert.assertEquals("Quiesce callback should have occurred once; calls should be 1, but it is " + callback.getCalls(), 1, callback.getCalls()); }else{ diff --git a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java index 74014d0a5..edabbd39b 100644 --- a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java +++ b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java @@ -29,8 +29,6 @@ import java.util.Hashtable; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import junit.framework.Assert; - import org.apache.aries.blueprint.sample.BindingListener; import org.apache.aries.blueprint.sample.DefaultRunnable; import org.apache.aries.blueprint.sample.DestroyTest; @@ -171,7 +169,7 @@ public class TestReferences extends AbstractBlueprintIntegrationTest { assertEquals("The default runnable was called when a service was bound", 1, defaultRunnable.getCount()); - Assert.assertTrue("Service should have been called", called.get()); + assertTrue("Service should have been called", called.get()); reg.unregister(); waitForAsynchronousHandling(); diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java index e165c582a..1c4731706 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java @@ -40,12 +40,12 @@ import javax.management.ObjectName; import javax.management.openmbean.CompositeData; import javax.management.openmbean.TabularData; -import junit.framework.Assert; import org.apache.aries.jmx.AbstractIntegrationTest; import org.apache.aries.jmx.codec.PropertyData; import org.apache.aries.jmx.test.bundlea.api.InterfaceA; import org.apache.aries.jmx.test.bundleb.api.InterfaceB; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.ops4j.pax.exam.Configuration; @@ -197,7 +197,7 @@ public class ServiceStateMBeanTest extends AbstractIntegrationTest { } private void assertBundleStarted(Bundle bundle) { - Assert.assertEquals("Bundle " + bundle.getSymbolicName() + " should be started but is in state " + bundle.getState(), + assertEquals("Bundle " + bundle.getSymbolicName() + " should be started but is in state " + bundle.getState(), Bundle.ACTIVE, bundle.getState()); } diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractListenerComponentValidator.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractListenerComponentValidator.java index 02b81b1a5..735fb5379 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractListenerComponentValidator.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractListenerComponentValidator.java @@ -18,7 +18,7 @@ */ package org.apache.aries.jmx.test.blueprint.framework; -import static junit.framework.Assert.assertNotNull; +import static org.junit.Assert.assertNotNull; import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeType; diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/MapEntryValidator.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/MapEntryValidator.java index 10e1c647f..53c4ce6a0 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/MapEntryValidator.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/MapEntryValidator.java @@ -19,7 +19,7 @@ package org.apache.aries.jmx.test.blueprint.framework; import javax.management.openmbean.CompositeData; -import static junit.framework.Assert.*; +import static org.junit.Assert.*; import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean; diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ServiceValidator.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ServiceValidator.java index 1aa5e6d3a..a8d4b2805 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ServiceValidator.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ServiceValidator.java @@ -18,7 +18,7 @@ */ package org.apache.aries.jmx.test.blueprint.framework; -import static junit.framework.Assert.assertNotNull; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; import java.util.ArrayList; diff --git a/jndi/jndi-core/src/test/java/org/apache/aries/jndi/InitialContextTest.java b/jndi/jndi-core/src/test/java/org/apache/aries/jndi/InitialContextTest.java index 9d2e55c6c..a11179a22 100644 --- a/jndi/jndi-core/src/test/java/org/apache/aries/jndi/InitialContextTest.java +++ b/jndi/jndi-core/src/test/java/org/apache/aries/jndi/InitialContextTest.java @@ -18,7 +18,6 @@ */ package org.apache.aries.jndi; -import junit.framework.Assert; import org.apache.aries.jndi.startup.Activator; import org.apache.aries.mocks.BundleContextMock; import org.apache.aries.unittest.mocks.MethodCall; @@ -195,7 +194,7 @@ public class InitialContextTest { try { ic.lookup("test:something"); - Assert.fail("Expected NamingException"); + fail("Expected NamingException"); } catch (NamingException ne) { assertNotNull(ne.getCause()); assertEquals("doh", ne.getCause().getMessage()); diff --git a/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/Skeleton.java b/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/Skeleton.java index 02d7bbcd4..cad5b72b9 100644 --- a/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/Skeleton.java +++ b/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/Skeleton.java @@ -33,7 +33,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.AssertionFailedError; import org.apache.aries.unittest.mocks.annotations.InjectSkeleton; @@ -987,7 +987,7 @@ public final class Skeleton implements InvocationHandler */ public void assertNotCalled(MethodCall call) { - Assert.assertFalse( "The method call " + + Assert.assertFalse( "The method call " + call + " occurred in the skeleton " + this.toString(), checkCall(call)); diff --git a/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/NotSupportedTest.java b/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/NotSupportedTest.java index 3919f939e..07a062f01 100644 --- a/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/NotSupportedTest.java +++ b/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/NotSupportedTest.java @@ -15,7 +15,7 @@ */ package org.apache.aries.transaction.itests; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import java.sql.SQLException; diff --git a/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/RequiresNewTest.java b/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/RequiresNewTest.java index e4722f58c..7fc7385fc 100644 --- a/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/RequiresNewTest.java +++ b/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/RequiresNewTest.java @@ -15,7 +15,7 @@ */ package org.apache.aries.transaction.itests; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import java.sql.SQLException; diff --git a/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/RollbackOnTest.java b/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/RollbackOnTest.java index 25212d796..acf3ae663 100644 --- a/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/RollbackOnTest.java +++ b/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/RollbackOnTest.java @@ -29,7 +29,7 @@ import javax.inject.Inject; import javax.transaction.Status; import java.sql.SQLException; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; public class RollbackOnTest extends AbstractIntegrationTest {
