Remove usage of deprecated methods in JUnit 4.13

eclipse-leshan · Feb 11, 2020 · 634060f · 634060f
1 parent a201a0e
commit 634060f
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 19 deletions.
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/attributes/AttributeSetTest.java b/leshan-core/src/test/java/org/eclipse/leshan/core/attributes/AttributeSetTest.java
@@ -21,15 +21,10 @@
 import java.util.Collection;
 import java.util.Map;
 
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 public class AttributeSetTest {
 
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
-
     @Test
     public void should_provide_query_params() {
         AttributeSet sut = new AttributeSet(new Attribute(Attribute.OBJECT_VERSION, "1.1"),
@@ -89,9 +84,8 @@ public void should_to_string() {
         assertEquals("ver=1.1&pmin=5&pmax=60", sut.toString());
     }
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void should_throw_on_duplicates() {
-        exception.expect(IllegalArgumentException.class);
         new AttributeSet(new Attribute(Attribute.OBJECT_VERSION, "1.1"), new Attribute(Attribute.MINIMUM_PERIOD, 5L),
                 new Attribute(Attribute.MINIMUM_PERIOD, 60L));
     }
@@ -105,22 +99,20 @@ public void should_validate_assignation() {
         sut.validate(AssignationLevel.RESOURCE);
     }
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void should_throw_on_invalid_assignation_level() {
         AttributeSet sut = new AttributeSet(new Attribute(Attribute.OBJECT_VERSION, "1.1"),
                 new Attribute(Attribute.MINIMUM_PERIOD, 5L), new Attribute(Attribute.MAXIMUM_PERIOD, 60L));
 
-        exception.expect(IllegalArgumentException.class);
         // OBJECT_VERSION cannot be assigned on resource level
         sut.validate(AssignationLevel.RESOURCE);
     }
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void should_throw_on_invalid_pmin_pmax() {
         AttributeSet sut = new AttributeSet(new Attribute(Attribute.MINIMUM_PERIOD, 50L),
                 new Attribute(Attribute.MAXIMUM_PERIOD, 49L));
 
-        exception.expect(IllegalArgumentException.class);
         // pmin cannot be greater then pmax
         sut.validate(AssignationLevel.RESOURCE);
     }

diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/attributes/AttributeTest.java b/leshan-core/src/test/java/org/eclipse/leshan/core/attributes/AttributeTest.java
@@ -2,15 +2,10 @@
 
 import static org.junit.Assert.*;
 
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 public class AttributeTest {
 
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
-
     @Test
     public void should_pick_correct_model() {
         Attribute verAttribute = new Attribute(Attribute.OBJECT_VERSION, "1.0");
@@ -20,10 +15,8 @@ public void should_pick_correct_model() {
         assertFalse(verAttribute.isWritable());
     }
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void should_throw_on_invalid_value_type() {
-        exception.expect(IllegalArgumentException.class);
-        exception.expectMessage(Attribute.OBJECT_VERSION);
         new Attribute(Attribute.OBJECT_VERSION, 123);
     }
 }
diff --git a/...n-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/BootstrapTest.java b/...n-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/BootstrapTest.java
@@ -17,6 +17,7 @@
 
 import static org.eclipse.leshan.integration.tests.SecureIntegrationTestHelper.*;
 import static org.hamcrest.CoreMatchers.hasItems;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.*;
 
 import org.eclipse.leshan.LwM2mId;

diff --git a/leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/CreateTest.java b/leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/CreateTest.java
@@ -20,6 +20,7 @@
 
 import static org.eclipse.leshan.core.request.ContentFormat.*;
 import static org.eclipse.leshan.integration.tests.IntegrationTestHelper.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.junit.Assert.*;

diff --git a/leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/DeleteTest.java b/leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/DeleteTest.java
@@ -19,6 +19,7 @@
 
 package org.eclipse.leshan.integration.tests;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.junit.Assert.*;

diff --git a/...an-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/DiscoverTest.java b/...an-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/DiscoverTest.java
@@ -17,6 +17,7 @@
 package org.eclipse.leshan.integration.tests;
 
 import static org.eclipse.leshan.ResponseCode.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.junit.Assert.*;

diff --git a/leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/ExecuteTest.java b/leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/ExecuteTest.java
@@ -19,6 +19,7 @@
 
 package org.eclipse.leshan.integration.tests;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.junit.Assert.*;

diff --git a/leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/ObserveTest.java b/leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/ObserveTest.java
@@ -19,6 +19,7 @@
 
 package org.eclipse.leshan.integration.tests;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.junit.Assert.*;

diff --git a/leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/ReadTest.java b/leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/ReadTest.java
@@ -20,6 +20,7 @@
 
 import static org.eclipse.leshan.ResponseCode.*;
 import static org.eclipse.leshan.integration.tests.IntegrationTestHelper.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.junit.Assert.*;

diff --git a/...ntegration-tests/src/test/java/org/eclipse/leshan/integration/tests/RegistrationTest.java b/...ntegration-tests/src/test/java/org/eclipse/leshan/integration/tests/RegistrationTest.java
@@ -18,6 +18,7 @@
 package org.eclipse.leshan.integration.tests;
 
 import static org.eclipse.leshan.integration.tests.IntegrationTestHelper.LIFETIME;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.junit.Assert.*;

diff --git a/leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/WriteTest.java b/leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/WriteTest.java
@@ -19,6 +19,7 @@
 package org.eclipse.leshan.integration.tests;
 
 import static org.eclipse.leshan.integration.tests.IntegrationTestHelper.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.junit.Assert.*;