This is an automated email from the ASF dual-hosted git repository. amichai pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit d922bb38034d2fc9f8073a66f2aa362b90943f6f Author: Amichai Rothman <[email protected]> AuthorDate: Mon Jun 3 07:43:15 2024 +0300 Fix JUnit assertThat deprecation warnings --- .../apache/aries/rsa/discovery/config/PropertyValidatorTest.java | 2 +- .../aries/rsa/discovery/zookeeper/ZookeeperDiscoveryTest.java | 2 +- .../org/apache/aries/rsa/provider/tcp/TcpProviderIntentTest.java | 8 ++++---- .../apache/aries/rsa/provider/tcp/TcpProviderPrimitiveTest.java | 4 ++-- .../java/org/apache/aries/rsa/provider/tcp/TcpProviderTest.java | 4 ++-- .../org/apache/aries/rsa/core/RemoteServiceAdminCoreTest.java | 2 +- .../topologymanager/exporter/EndpointListenerNotifierTest.java | 4 ++-- .../topologymanager/exporter/RecordingEndpointEventListener.java | 2 +- .../rsa/topologymanager/importer/local/FilterHelperTest.java | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/discovery/config/src/test/java/org/apache/aries/rsa/discovery/config/PropertyValidatorTest.java b/discovery/config/src/test/java/org/apache/aries/rsa/discovery/config/PropertyValidatorTest.java index 414090f4..590f8e06 100644 --- a/discovery/config/src/test/java/org/apache/aries/rsa/discovery/config/PropertyValidatorTest.java +++ b/discovery/config/src/test/java/org/apache/aries/rsa/discovery/config/PropertyValidatorTest.java @@ -31,9 +31,9 @@ import java.util.Vector; import static java.util.Collections.singletonList; import static org.apache.aries.rsa.discovery.config.PropertyValidator.*; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; /** * @author dpishchukhin diff --git a/discovery/zookeeper/src/test/java/org/apache/aries/rsa/discovery/zookeeper/ZookeeperDiscoveryTest.java b/discovery/zookeeper/src/test/java/org/apache/aries/rsa/discovery/zookeeper/ZookeeperDiscoveryTest.java index 1bd0050d..ddac35a3 100644 --- a/discovery/zookeeper/src/test/java/org/apache/aries/rsa/discovery/zookeeper/ZookeeperDiscoveryTest.java +++ b/discovery/zookeeper/src/test/java/org/apache/aries/rsa/discovery/zookeeper/ZookeeperDiscoveryTest.java @@ -19,9 +19,9 @@ package org.apache.aries.rsa.discovery.zookeeper; import static java.util.concurrent.TimeUnit.SECONDS; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderIntentTest.java b/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderIntentTest.java index 672b77a9..0b9565db 100644 --- a/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderIntentTest.java +++ b/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderIntentTest.java @@ -18,6 +18,7 @@ */ package org.apache.aries.rsa.provider.tcp; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; @@ -30,7 +31,6 @@ import org.apache.aries.rsa.provider.tcp.myservice.MyServiceImpl; import org.apache.aries.rsa.spi.Endpoint; import org.apache.aries.rsa.util.EndpointHelper; import org.easymock.EasyMock; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.osgi.framework.BundleContext; @@ -57,7 +57,7 @@ public class TcpProviderIntentTest { String[] standardIntents = {"osgi.basic", "osgi.async"}; props.put(RemoteConstants.SERVICE_EXPORTED_INTENTS, standardIntents); Endpoint ep = provider.exportService(myService, bc, props, exportedInterfaces); - Assert.assertThat("Service should be exported as the intents: " + Arrays.toString(standardIntents) + " must be supported", ep, notNullValue()); + assertThat("Service should be exported as the intents: " + Arrays.toString(standardIntents) + " must be supported", ep, notNullValue()); } @Test @@ -66,7 +66,7 @@ public class TcpProviderIntentTest { EndpointHelper.addObjectClass(props, exportedInterfaces); props.put(RemoteConstants.SERVICE_EXPORTED_INTENTS, "unknown"); Endpoint ep = provider.exportService(myService, bc, props, exportedInterfaces); - Assert.assertThat("Service should not be exported as intent is not supported", ep, nullValue()); + assertThat("Service should not be exported as intent is not supported", ep, nullValue()); } @Test @@ -75,7 +75,7 @@ public class TcpProviderIntentTest { EndpointHelper.addObjectClass(props, exportedInterfaces); props.put(RemoteConstants.SERVICE_EXPORTED_INTENTS_EXTRA, "unknown"); Endpoint ep = provider.exportService(myService, bc, props, exportedInterfaces); - Assert.assertThat("Service should not be exported as intent is not supported", ep, nullValue()); + assertThat("Service should not be exported as intent is not supported", ep, nullValue()); } } diff --git a/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderPrimitiveTest.java b/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderPrimitiveTest.java index b1442c5e..6528e8b9 100644 --- a/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderPrimitiveTest.java +++ b/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderPrimitiveTest.java @@ -19,12 +19,12 @@ package org.apache.aries.rsa.provider.tcp; import static java.util.Arrays.asList; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.everyItem; import static org.hamcrest.Matchers.isIn; import static org.hamcrest.Matchers.samePropertyValuesAs; import static org.hamcrest.core.StringStartsWith.startsWith; -import static org.junit.Assert.assertThat; import static org.osgi.framework.Version.parseVersion; import java.io.IOException; @@ -64,7 +64,7 @@ public class TcpProviderPrimitiveTest { PrimitiveServiceImpl myService = new PrimitiveServiceImpl(); BundleContext bc = EasyMock.mock(BundleContext.class); ep = provider.exportService(myService, bc, props, exportedInterfaces); - Assert.assertThat(ep.description().getId(), startsWith("tcp://localhost:")); + assertThat(ep.description().getId(), startsWith("tcp://localhost:")); System.out.println(ep.description()); myServiceProxy = (PrimitiveService)provider.importEndpoint(PrimitiveService.class.getClassLoader(), bc, diff --git a/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderTest.java b/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderTest.java index 2fe59eae..7a920fd5 100644 --- a/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderTest.java +++ b/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderTest.java @@ -18,11 +18,11 @@ */ package org.apache.aries.rsa.provider.tcp; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.StringStartsWith.startsWith; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import java.io.IOException; @@ -92,7 +92,7 @@ public class TcpProviderTest { ep = provider.exportService(new MyServiceImpl("service1"), bc, props, exportedInterfaces); props.put("aries.rsa.id", "service2"); ep2 = provider.exportService(new MyServiceImpl("service2"), bc, props, exportedInterfaces); - Assert.assertThat(ep.description().getId(), startsWith("tcp://localhost:")); + assertThat(ep.description().getId(), startsWith("tcp://localhost:")); myServiceProxy = (MyService)provider.importEndpoint( MyService.class.getClassLoader(), bc, diff --git a/rsa/src/test/java/org/apache/aries/rsa/core/RemoteServiceAdminCoreTest.java b/rsa/src/test/java/org/apache/aries/rsa/core/RemoteServiceAdminCoreTest.java index 039e48d0..45fe9a0b 100644 --- a/rsa/src/test/java/org/apache/aries/rsa/core/RemoteServiceAdminCoreTest.java +++ b/rsa/src/test/java/org/apache/aries/rsa/core/RemoteServiceAdminCoreTest.java @@ -21,6 +21,7 @@ package org.apache.aries.rsa.core; import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expectLastCall; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.array; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.equalTo; @@ -28,7 +29,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import java.io.IOException; diff --git a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/exporter/EndpointListenerNotifierTest.java b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/exporter/EndpointListenerNotifierTest.java index 2ca301a8..54feb5ac 100644 --- a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/exporter/EndpointListenerNotifierTest.java +++ b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/exporter/EndpointListenerNotifierTest.java @@ -23,8 +23,8 @@ import static org.easymock.EasyMock.capture; import static org.easymock.EasyMock.expectLastCall; import static org.easymock.EasyMock.newCapture; import static org.hamcrest.core.Is.is; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; import java.util.Arrays; import java.util.Collection; @@ -136,7 +136,7 @@ public class EndpointListenerNotifierTest { Filter filter2 = it.next(); Dictionary<String, String> props = new Hashtable(); props.put("myProp", "A"); - Assert.assertThat(filter1.match(props) || filter2.match(props), is(true)); + assertThat(filter1.match(props) || filter2.match(props), is(true)); } private void filterMatches(Filter filter) { diff --git a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/exporter/RecordingEndpointEventListener.java b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/exporter/RecordingEndpointEventListener.java index c26ff099..5190b5a8 100644 --- a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/exporter/RecordingEndpointEventListener.java +++ b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/exporter/RecordingEndpointEventListener.java @@ -18,9 +18,9 @@ */ package org.apache.aries.rsa.topologymanager.exporter; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.samePropertyValuesAs; -import static org.junit.Assert.assertThat; import java.util.ArrayList; import java.util.Iterator; diff --git a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/local/FilterHelperTest.java b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/local/FilterHelperTest.java index ba0aa288..a6b2d890 100644 --- a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/local/FilterHelperTest.java +++ b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/local/FilterHelperTest.java @@ -19,8 +19,8 @@ package org.apache.aries.rsa.topologymanager.importer.local; import static org.apache.aries.rsa.topologymanager.importer.local.FilterHelper.isClassExcluded; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertThat; import org.junit.Assert; import org.junit.Test;
