diff options
Diffstat (limited to 'utils-test/src/test')
9 files changed, 276 insertions, 86 deletions
diff --git a/utils-test/src/test/java/org/onap/policy/common/utils/gson/GsonTestUtilsTest.java b/utils-test/src/test/java/org/onap/policy/common/utils/gson/GsonTestUtilsTest.java index 35fea577..51522ec0 100644 --- a/utils-test/src/test/java/org/onap/policy/common/utils/gson/GsonTestUtilsTest.java +++ b/utils-test/src/test/java/org/onap/policy/common/utils/gson/GsonTestUtilsTest.java @@ -2,7 +2,8 @@ * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2024 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,7 +35,9 @@ import com.google.gson.JsonParseException; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; -import javax.script.ScriptException; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; import org.junit.Before; import org.junit.Test; @@ -76,10 +79,11 @@ public class GsonTestUtilsTest { utils.compareGson(data, GsonTestUtilsTest.class); // file not found - assertThatThrownBy(() -> utils.compareGson(data, - new File(GsonTestUtilsTest.class.getSimpleName() + "-NotFound.json"))) - .isInstanceOf(JsonParseException.class) - .hasCauseInstanceOf(FileNotFoundException.class); + File file = new File(GsonTestUtilsTest.class.getSimpleName() + "-NotFound.json"); + + assertThatThrownBy(() -> utils.compareGson(data, file)) + .isInstanceOf(JsonParseException.class) + .hasCauseInstanceOf(FileNotFoundException.class); // force I/O error while reading file GsonTestUtils utils2 = new GsonTestUtils() { @@ -136,11 +140,7 @@ public class GsonTestUtilsTest { data.setText(null); result = utils.applyScripts("use ${obj.text} this", data); assertEquals("use null this", result); - - assertThatThrownBy(() -> utils.applyScripts("use ${obj.text} this", null)) - .isInstanceOf(JsonParseException.class) - .hasCauseInstanceOf(ScriptException.class) - .hasMessage("cannot expand element: ${obj.text}"); + assertEquals("use null this", utils.applyScripts("use ${obj.text} this", null)); } @Test @@ -224,29 +224,12 @@ public class GsonTestUtilsTest { assertEquals("[300,{'objE':true,'objEStr':'obj-e-string'},false]".replace('\'', '"'), jsonEl.toString()); } + @Setter + @Getter + @ToString public static class Data { private int id; private String text; - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public String getText() { - return text; - } - - public void setText(String text) { - this.text = text; - } - - @Override - public String toString() { - return "Data [id=" + id + ", text=" + text + "]"; - } } } 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 95abd4db..203c78ec 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,8 @@ * ============LICENSE_START======================================================= * ONAP Policy Engine - Common Modules * ================================================================================ - * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved. + * Modificaitons Copyright (C) 2023 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,7 +42,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.onap.policy.common.utils.io.Serializer.Factory; -import org.powermock.reflect.Whitebox; +import org.springframework.test.util.ReflectionTestUtils; public class SerializerTest { private static final String FACTORY = "factory"; @@ -53,12 +54,12 @@ public class SerializerTest { @BeforeClass public static void setUpBeforeClass() { - saveFactory = Whitebox.getInternalState(Serializer.class, FACTORY); + saveFactory = (Factory) ReflectionTestUtils.getField(Serializer.class, FACTORY); } @AfterClass public static void tearDownAfterClass() { - Whitebox.setInternalState(Serializer.class, FACTORY, saveFactory); + ReflectionTestUtils.setField(Serializer.class, FACTORY, saveFactory); } @Before @@ -80,7 +81,7 @@ public class SerializerTest { byte[] data2 = Serializer.serialize(obj1); assertEquals(Arrays.toString(data), Arrays.toString(data2)); - MyObject obj2 = Serializer.deserialize(MyObject.class, data); + MyObject obj2 = Serializer.roundTrip(obj1); assertEquals(obj1.value, obj2.value); } @@ -210,16 +211,14 @@ public class SerializerTest { } }); - assertThatThrownBy(() -> Serializer.serialize(new MyObject(130))).isEqualTo(ex2); + assertThatThrownBy(() -> Serializer.roundTrip(new MyObject(130))).isEqualTo(ex2); } @Test public void testDeserialize() throws Exception { MyObject obj1 = new MyObject(3); - byte[] data = Serializer.serialize(obj1); - - MyObject obj2 = Serializer.deserialize(MyObject.class, data); + MyObject obj2 = Serializer.roundTrip(obj1); assertEquals(obj1.value, obj2.value); } @@ -249,8 +248,7 @@ public class SerializerTest { } }); - byte[] data = Serializer.serialize(new MyObject(300)); - assertThatThrownBy(() -> Serializer.deserialize(MyObject.class, data)).isEqualTo(ex); + assertThatThrownBy(() -> Serializer.roundTrip(new MyObject(300))).isEqualTo(ex); } @Test @@ -267,8 +265,7 @@ public class SerializerTest { } }); - byte[] data = Serializer.serialize(new MyObject(310)); - assertThatThrownBy(() -> Serializer.deserialize(MyObject.class, data)).isEqualTo(ex); + assertThatThrownBy(() -> Serializer.roundTrip(new MyObject(310))).isEqualTo(ex); } @Test @@ -287,9 +284,20 @@ public class SerializerTest { */ text = text.replace("MyObject", "AnObject"); - byte[] data = text.getBytes(binary); + byte[] data2 = text.getBytes(binary); + + /* + * Use a factory that returns a byte array for "data2" instead of the real "data". + */ + setFactory(new Factory() { + @Override + public ByteArrayInputStream makeByteArrayInputStream(byte[] data) { + // read from "data2" instead of "data" + return super.makeByteArrayInputStream(data2); + } + }); - assertThatThrownBy(() -> Serializer.deserialize(MyObject.class, data)).isInstanceOf(IOException.class) + assertThatThrownBy(() -> Serializer.roundTrip(obj1)).isInstanceOf(IOException.class) .hasCauseInstanceOf(ClassNotFoundException.class); } @@ -313,8 +321,7 @@ public class SerializerTest { } }); - byte[] data = Serializer.serialize(new MyObject(320)); - assertThatThrownBy(() -> Serializer.deserialize(MyObject.class, data)).isEqualTo(ex); + assertThatThrownBy(() -> Serializer.roundTrip(new MyObject(320))).isEqualTo(ex); } @Test @@ -348,8 +355,7 @@ public class SerializerTest { } }); - byte[] data = Serializer.serialize(new MyObject(330)); - assertThatThrownBy(() -> Serializer.deserialize(MyObject.class, data)).isEqualTo(ex2); + assertThatThrownBy(() -> Serializer.roundTrip(new MyObject(330))).isEqualTo(ex2); } @Test @@ -371,7 +377,7 @@ public class SerializerTest { * @param factory new factory to be set */ private void setFactory(Factory factory) { - Whitebox.setInternalState(Serializer.class, FACTORY, factory); + ReflectionTestUtils.setField(Serializer.class, FACTORY, factory); } /** diff --git a/utils-test/src/test/java/org/onap/policy/common/utils/security/SelfSignedKeyStoreTest.java b/utils-test/src/test/java/org/onap/policy/common/utils/security/SelfSignedKeyStoreTest.java new file mode 100644 index 00000000..27bceacf --- /dev/null +++ b/utils-test/src/test/java/org/onap/policy/common/utils/security/SelfSignedKeyStoreTest.java @@ -0,0 +1,151 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP + * ================================================================================ + * Copyright (C) 2021 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.common.utils.security; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.concurrent.TimeUnit; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +public class SelfSignedKeyStoreTest { + private static final String USER_DIR_PROP = "user.dir"; + + private static String saveUserDir; + private static String defaultName; + private static File defaultKeystore; + + + /** + * Saves the user.dir property and initializes static fields. + */ + @BeforeClass + public static void setUpBeforeClass() { + saveUserDir = System.getProperty(USER_DIR_PROP); + defaultName = saveUserDir + "/" + SelfSignedKeyStore.RELATIVE_PATH; + defaultKeystore = new File(defaultName); + } + + @Before + public void setUp() { + System.setProperty(USER_DIR_PROP, saveUserDir); + delete(defaultKeystore); + } + + @Test + public void testSelfSignedKeyStore() throws Exception { + SelfSignedKeyStore ks = new SelfSignedKeyStore(); + + assertThat(ks.getKeystoreName()).isEqualTo(defaultName); + assertThat(defaultKeystore).exists(); + } + + @Test + public void testSelfSignedKeyStoreString() throws IOException, InterruptedException { + String relName = "target/my-keystore"; + String altName = saveUserDir + "/" + relName; + File altFile = new File(altName); + + delete(altFile); + + SelfSignedKeyStore ks = new SelfSignedKeyStore(relName); + + assertThat(ks.getKeystoreName()).isEqualTo(altName); + assertThat(altFile).exists(); + } + + /** + * Tests the constructor, when the keystore already exists. + */ + @Test + public void testSelfSignedKeyStoreStringExists() throws Exception { + new SelfSignedKeyStore(); + assertThat(defaultKeystore).exists(); + + // change the timestamp on the keystore so it's a little old, but not too old + defaultKeystore.setLastModified( + System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(10, TimeUnit.MINUTES)); + long tcurrent = defaultKeystore.lastModified(); + + // this should not recreate the keystore, thus the timestamp should be unchanged + new SelfSignedKeyStore(); + assertThat(defaultKeystore.lastModified()).isEqualTo(tcurrent); + + // change the timestamp on the keystore so it's too old + defaultKeystore.setLastModified( + System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(1000, TimeUnit.HOURS)); + tcurrent = defaultKeystore.lastModified(); + + // this should recreate the keystore + new SelfSignedKeyStore(); + assertThat(defaultKeystore.lastModified()).isGreaterThan(tcurrent); + } + + /** + * Tests the constructor, when the SAN file is not found. + */ + @Test + public void testSelfSignedKeyStoreStringNoSanFile() throws Exception { + assertThatThrownBy(() -> new SelfSignedKeyStore() { + @Override + protected String getKeystoreSanName() { + return "unknown/san/file.txt"; + } + }).isInstanceOf(FileNotFoundException.class).hasMessageContaining("file.txt"); + } + + /** + * Tests the constructor, when write fails. + */ + @Test + public void testSelfSignedKeyStoreStringWriteFailure() throws Exception { + assertThatThrownBy(() -> new SelfSignedKeyStore("target/unknown/path/to/keystore")) + .isInstanceOf(IOException.class); + } + + @Test + public void testGetKeystoreName() throws Exception { + String relpath = SelfSignedKeyStore.RELATIVE_PATH; + + // append the first part of the relative path to user.dir + System.setProperty(USER_DIR_PROP, saveUserDir + "/" + relpath.substring(0, relpath.indexOf('/'))); + + // create a keystore using the remaining components of the relative path + SelfSignedKeyStore ks = new SelfSignedKeyStore(relpath.substring(relpath.indexOf('/') + 1)); + + assertThat(ks.getKeystoreName()).isEqualTo(defaultName); + assertThat(defaultKeystore).exists(); + + // try again using the original relative path - should fail, as it's now deeper + assertThatThrownBy(() -> new SelfSignedKeyStore(relpath)).isInstanceOf(IOException.class); + } + + private static void delete(File file) { + if (file.exists()) { + assertThat(file.delete()).isTrue(); + } + } +} diff --git a/utils-test/src/test/java/org/onap/policy/common/utils/test/log/logback/ExtractAppenderTest.java b/utils-test/src/test/java/org/onap/policy/common/utils/test/log/logback/ExtractAppenderTest.java index cd6edf76..4c2237fc 100644 --- a/utils-test/src/test/java/org/onap/policy/common/utils/test/log/logback/ExtractAppenderTest.java +++ b/utils-test/src/test/java/org/onap/policy/common/utils/test/log/logback/ExtractAppenderTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * Common Utils-Test * ================================================================================ - * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2018-2020 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. @@ -26,13 +26,11 @@ import static org.junit.Assert.assertFalse; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.spi.ILoggingEvent; - import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; - import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -376,21 +374,6 @@ public class ExtractAppenderTest { // create some threads to get extractions addThread(tend, err, xtxt -> app.getExtracted()); - // create some threads to clear extractions - addThread(tend, err, xtxt -> { - app.clearExtractions(); - - // don't want to clear the list too frequently - // so sleep a bit in between - try { - Thread.sleep(10L + Integer.valueOf(xtxt)); - - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - throw e; - } - }); - /* * Finally ready to start. */ diff --git a/utils-test/src/test/java/org/onap/policy/common/utils/time/PseudoExecutorTest.java b/utils-test/src/test/java/org/onap/policy/common/utils/time/PseudoExecutorTest.java new file mode 100644 index 00000000..0046f791 --- /dev/null +++ b/utils-test/src/test/java/org/onap/policy/common/utils/time/PseudoExecutorTest.java @@ -0,0 +1,60 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP + * ================================================================================ + * Copyright (C) 2020 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.common.utils.time; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Before; +import org.junit.Test; + +public class PseudoExecutorTest { + private int invoked; + private PseudoExecutor executor; + + @Before + public void setUp() { + invoked = 0; + executor = new PseudoExecutor(); + } + + @Test + public void test() { + assertEquals(0, executor.getQueueLength()); + assertEquals(0, executor.getTasks().size()); + assertTrue(executor.runAll(0)); + + executor.execute(() -> invoked++); + executor.execute(() -> invoked++); + executor.execute(() -> invoked++); + assertEquals(3, executor.getTasks().size()); + assertEquals(3, executor.getQueueLength()); + + assertFalse(executor.runAll(2)); + assertEquals(2, invoked); + assertEquals(1, executor.getQueueLength()); + + assertTrue(executor.runAll(2)); + assertEquals(3, invoked); + assertEquals(0, executor.getQueueLength()); + } +} diff --git a/utils-test/src/test/java/org/onap/policy/common/utils/time/PseudoScheduledExecutorServiceTest.java b/utils-test/src/test/java/org/onap/policy/common/utils/time/PseudoScheduledExecutorServiceTest.java index 70820c44..745e989f 100644 --- a/utils-test/src/test/java/org/onap/policy/common/utils/time/PseudoScheduledExecutorServiceTest.java +++ b/utils-test/src/test/java/org/onap/policy/common/utils/time/PseudoScheduledExecutorServiceTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2019-2020 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. @@ -27,6 +27,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.util.Collections; +import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.Future; import java.util.concurrent.ScheduledFuture; @@ -37,6 +38,7 @@ import org.junit.Test; public class PseudoScheduledExecutorServiceTest { private static final long DELAY_MS = 100L; private static final long PERIOD_MS = 200L; + private static final List<Callable<Object>> EMPTY_CALLABLES = Collections.emptyList(); private int ran; private int called; @@ -135,25 +137,25 @@ public class PseudoScheduledExecutorServiceTest { @Test public void testInvokeAllCollectionOfQextendsCallableOfT() { - assertThatThrownBy(() -> svc.invokeAll(Collections.emptyList())) + assertThatThrownBy(() -> svc.invokeAll(EMPTY_CALLABLES)) .isInstanceOf(UnsupportedOperationException.class); } @Test public void testInvokeAllCollectionOfQextendsCallableOfTLongTimeUnit() { - assertThatThrownBy(() -> svc.invokeAll(Collections.emptyList(), 1, TimeUnit.MILLISECONDS)) + assertThatThrownBy(() -> svc.invokeAll(EMPTY_CALLABLES, 1, TimeUnit.MILLISECONDS)) .isInstanceOf(UnsupportedOperationException.class); } @Test public void testInvokeAnyCollectionOfQextendsCallableOfT() { - assertThatThrownBy(() -> svc.invokeAny(Collections.emptyList())) + assertThatThrownBy(() -> svc.invokeAny(EMPTY_CALLABLES)) .isInstanceOf(UnsupportedOperationException.class); } @Test public void testInvokeAnyCollectionOfQextendsCallableOfTLongTimeUnit() { - assertThatThrownBy(() -> svc.invokeAny(Collections.emptyList(), 1, TimeUnit.MILLISECONDS)) + assertThatThrownBy(() -> svc.invokeAny(EMPTY_CALLABLES, 1, TimeUnit.MILLISECONDS)) .isInstanceOf(UnsupportedOperationException.class); } diff --git a/utils-test/src/test/java/org/onap/policy/common/utils/time/PseudoScheduledFutureTest.java b/utils-test/src/test/java/org/onap/policy/common/utils/time/PseudoScheduledFutureTest.java index e23bbd29..248edf61 100644 --- a/utils-test/src/test/java/org/onap/policy/common/utils/time/PseudoScheduledFutureTest.java +++ b/utils-test/src/test/java/org/onap/policy/common/utils/time/PseudoScheduledFutureTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2019, 2021 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. @@ -31,9 +31,11 @@ import java.util.concurrent.Delayed; import java.util.concurrent.TimeUnit; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; +import org.mockito.junit.MockitoJUnitRunner; +@RunWith(MockitoJUnitRunner.class) public class PseudoScheduledFutureTest { private static final long DELAY_MS = 1000L; @@ -49,8 +51,6 @@ public class PseudoScheduledFutureTest { */ @Before public void setUp() { - MockitoAnnotations.initMocks(this); - when(work.getDelay()).thenReturn(DELAY_MS); count = 0; diff --git a/utils-test/src/test/java/org/onap/policy/common/utils/time/PseudoTimerTest.java b/utils-test/src/test/java/org/onap/policy/common/utils/time/PseudoTimerTest.java index 49710538..d7316c1f 100644 --- a/utils-test/src/test/java/org/onap/policy/common/utils/time/PseudoTimerTest.java +++ b/utils-test/src/test/java/org/onap/policy/common/utils/time/PseudoTimerTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2019-2020 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. @@ -83,8 +83,9 @@ public class PseudoTimerTest { @Test public void testScheduleTimerTaskDate() { - assertThatThrownBy(() -> timer.schedule(new MyTask(), new Date())) - .isInstanceOf(UnsupportedOperationException.class); + MyTask task = new MyTask(); + Date curdate = new Date(); + assertThatThrownBy(() -> timer.schedule(task, curdate)).isInstanceOf(UnsupportedOperationException.class); } @Test @@ -105,8 +106,9 @@ public class PseudoTimerTest { @Test public void testScheduleTimerTaskDateLong() { - assertThatThrownBy(() -> timer.schedule(new MyTask(), new Date(), 1L)) - .isInstanceOf(UnsupportedOperationException.class); + MyTask task = new MyTask(); + Date curdate = new Date(); + assertThatThrownBy(() -> timer.schedule(task, curdate, 1L)).isInstanceOf(UnsupportedOperationException.class); } @Test @@ -127,7 +129,9 @@ public class PseudoTimerTest { @Test public void testScheduleAtFixedRateTimerTaskDateLong() { - assertThatThrownBy(() -> timer.scheduleAtFixedRate(new MyTask(), new Date(), 1L)) + MyTask task = new MyTask(); + Date curdate = new Date(); + assertThatThrownBy(() -> timer.scheduleAtFixedRate(task, curdate, 1L)) .isInstanceOf(UnsupportedOperationException.class); } diff --git a/utils-test/src/test/java/org/onap/policy/common/utils/time/WorkItemTest.java b/utils-test/src/test/java/org/onap/policy/common/utils/time/WorkItemTest.java index 4e6f92b5..d2fc8d58 100644 --- a/utils-test/src/test/java/org/onap/policy/common/utils/time/WorkItemTest.java +++ b/utils-test/src/test/java/org/onap/policy/common/utils/time/WorkItemTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2019-2020 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.time; +import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -88,7 +89,7 @@ public class WorkItemTest { @Test public void testFire() { // ensure no exception is thrown - item.fire(); + assertThatCode(() -> item.fire()).doesNotThrowAnyException(); } @Test |