summaryrefslogtreecommitdiffstats
path: root/utils-test
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2019-01-08 17:15:07 -0500
committerJim Hahn <jrh3@att.com>2019-01-08 17:16:01 -0500
commita392ecb9bd7deca0791f4c16f5fee11ba53dc4e3 (patch)
tree48c849ada86552e21ccb6d1153f232d24a1e1bae /utils-test
parent7b150f6820d61b8c65b6ddd5f4952ad3d4d17c6c (diff)
Replace expectException with AssertJ
Change-Id: I73c186f181960ac7ac8cd985e55db1831963910f Issue-ID: POLICY-1392 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'utils-test')
-rw-r--r--utils-test/pom.xml8
-rw-r--r--utils-test/src/test/java/org/onap/policy/common/utils/io/SerializerTest.java41
2 files changed, 17 insertions, 32 deletions
diff --git a/utils-test/pom.xml b/utils-test/pom.xml
index cf5da469..bf36472b 100644
--- a/utils-test/pom.xml
+++ b/utils-test/pom.xml
@@ -2,7 +2,7 @@
============LICENSE_START=======================================================
ONAP Policy Engine - Common Modules
================================================================================
- Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -42,6 +42,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>3.11.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
diff --git a/utils-test/src/test/java/org/onap/policy/common/utils/io/SerializerTest.java b/utils-test/src/test/java/org/onap/policy/common/utils/io/SerializerTest.java
index 613897d9..36812b3b 100644
--- a/utils-test/src/test/java/org/onap/policy/common/utils/io/SerializerTest.java
+++ b/utils-test/src/test/java/org/onap/policy/common/utils/io/SerializerTest.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP Policy Engine - Common Modules
* ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
package org.onap.policy.common.utils.io;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -116,7 +117,7 @@ public class SerializerTest {
}
});
- assertEquals(ex, expectException(() -> Serializer.serialize(new MyObject(100))));
+ assertThatThrownBy(() -> Serializer.serialize(new MyObject(100))).isEqualTo(ex);
}
@Test
@@ -133,7 +134,7 @@ public class SerializerTest {
}
});
- assertEquals(ex, expectException(() -> Serializer.serialize(new MyObject(110))));
+ assertThatThrownBy(() -> Serializer.serialize(new MyObject(110))).isEqualTo(ex);
}
@Test
@@ -159,7 +160,7 @@ public class SerializerTest {
}
});
- assertEquals(ex, expectException(() -> Serializer.serialize(new MyObject(120))));
+ assertThatThrownBy(() -> Serializer.serialize(new MyObject(120))).isEqualTo(ex);
}
@Test
@@ -206,7 +207,7 @@ public class SerializerTest {
}
});
- assertEquals(ex2, expectException(() -> Serializer.serialize(new MyObject(130))));
+ assertThatThrownBy(() -> Serializer.serialize(new MyObject(130))).isEqualTo(ex2);
}
@@ -246,7 +247,7 @@ public class SerializerTest {
});
byte[] data = Serializer.serialize(new MyObject(300));
- assertEquals(ex, expectException(() -> Serializer.deserialize(MyObject.class, data)));
+ assertThatThrownBy(() -> Serializer.deserialize(MyObject.class, data)).isEqualTo(ex);
}
@Test
@@ -264,7 +265,7 @@ public class SerializerTest {
});
byte[] data = Serializer.serialize(new MyObject(310));
- assertEquals(ex, expectException(() -> Serializer.deserialize(MyObject.class, data)));
+ assertThatThrownBy(() -> Serializer.deserialize(MyObject.class, data)).isEqualTo(ex);
}
@Test
@@ -288,7 +289,7 @@ public class SerializerTest {
});
byte[] data = Serializer.serialize(new MyObject(320));
- assertEquals(ex, expectException(() -> Serializer.deserialize(MyObject.class, data)));
+ assertThatThrownBy(() -> Serializer.deserialize(MyObject.class, data)).isEqualTo(ex);
}
@Test
@@ -323,7 +324,7 @@ public class SerializerTest {
});
byte[] data = Serializer.serialize(new MyObject(330));
- assertEquals(ex2, expectException(() -> Serializer.deserialize(MyObject.class, data)));
+ assertThatThrownBy(() -> Serializer.deserialize(MyObject.class, data)).isEqualTo(ex2);
}
@Test
@@ -349,28 +350,6 @@ public class SerializerTest {
}
/**
- * Applies a function, which is expected to throw an exception.
- *
- * @param func the function to apply
- * @return the exception thrown by the function, or {@code null} if it did not throw
- * an exception
- */
- private Exception expectException(RunnerWithEx func) {
- try {
- func.apply();
- return null;
-
- } catch (Exception ex) {
- return ex;
- }
- }
-
- @FunctionalInterface
- private static interface RunnerWithEx {
- public void apply() throws Exception;
- }
-
- /**
* Simple, serializable object.
*/
public static class MyObject implements Serializable {