</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2021, 2023 Nordix Foundation.
+ * Copyright (C) 2021-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.
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class TestCommandLineArguments {
+class TestCommandLineArguments {
private static final String FAKE_HELP_CLASS = "org.onap.policy.HelpClass";
private static final String FAKE_COMPONENT = "fake policy cpm";
private static final String TEST_CONFIG_FILE = "cmdFiles/configuration.json";
CommandLineArgumentsHandler testCmd = new CommandLineArgumentsHandler(FAKE_HELP_CLASS, FAKE_COMPONENT);
@Test
- public void testVersion() throws CommandLineException {
+ void testVersion() throws CommandLineException {
String[] version = {"-v"};
assertThat(testCmd.parse(version)).startsWith("ONAP Version test.");
}
@Test
- public void testHelp() throws CommandLineException {
+ void testHelp() throws CommandLineException {
String[] help = {"-h"};
assertThat(testCmd.parse(help)).startsWith("usage: org.onap.policy.HelpClass [options...]");
}
@Test
- public void testParse() throws CommandLineException {
+ void testParse() throws CommandLineException {
String[] args = {"-c", TEST_CONFIG_FILE};
testCmd.parse(args);
}
@Test
- public void testParse_ShouldThrowExceptionWithInvalidArguments() {
+ void testParse_ShouldThrowExceptionWithInvalidArguments() {
String[] invalidArgs = {"-a"};
assertThatThrownBy(() -> testCmd.parse(invalidArgs)).hasMessage(ERR_MSG_INVALID_ARGS)
.hasRootCauseMessage("Unrecognized option: -a");
}
@Test
- public void testParse_ShouldThrowExceptionWithExtraArguments() {
+ void testParse_ShouldThrowExceptionWithExtraArguments() {
String[] remainingArgs = {"-c", TEST_CONFIG_FILE, "extraArgs"};
String expectedErrorMsg =
"too many command line arguments specified: [-c, cmdFiles/configuration.json, extraArgs]";
}
@Test
- public void testParse_ShouldThrowExceptionWhenFileNameNull() {
+ void testParse_ShouldThrowExceptionWhenFileNameNull() {
String[] nullArgs = {"-c", null};
assertThatThrownBy(() -> testCmd.parse(nullArgs)).hasMessage(ERR_MSG_INVALID_ARGS);
}
@Test
- public void testValidate() throws CommandLineException {
+ void testValidate() throws CommandLineException {
String[] validConfigArgs = {"-c", TEST_CONFIG_FILE};
testCmd.parse(validConfigArgs);
assertThatCode(() -> testCmd.validate()).doesNotThrowAnyException();
}
@Test
- public void testValidate_ShouldThrowExceptionWhenConfigFileNotPresent() throws CommandLineException {
+ void testValidate_ShouldThrowExceptionWhenConfigFileNotPresent() throws CommandLineException {
String[] versionArgs = {"-v"};
testCmd.parse(versionArgs);
assertValidate(versionArgs, ERR_MSG_POLICY_CONFIG_FILE);
}
@Test
- public void testValidate_ShouldThrowExceptionWhenFileNameEmpty() {
+ void testValidate_ShouldThrowExceptionWhenFileNameEmpty() {
String[] argsOnlyKeyNoValue = {"-c", ""};
assertValidate(argsOnlyKeyNoValue, ERR_MSG_POLICY_CONFIG_FILE);
assertFalse(testCmd.checkSetConfigurationFilePath());
}
@Test
- public void testValidate_ShouldThrowExceptionWhenFileNameEmptySpace() {
+ void testValidate_ShouldThrowExceptionWhenFileNameEmptySpace() {
String[] argsOnlyKeyNoValue = {"-c", " "};
assertValidate(argsOnlyKeyNoValue, ERR_MSG_POLICY_CONFIG_FILE);
assertFalse(testCmd.checkSetConfigurationFilePath());
}
@Test
- public void testValidate_ShouldThrowExceptionWhenFileNameDoesNotExist() {
+ void testValidate_ShouldThrowExceptionWhenFileNameDoesNotExist() {
String[] fileNameNotExistentArgs = {"-c", "someFileName.json"};
assertValidate(fileNameNotExistentArgs,
"fake policy cpm configuration file \"someFileName.json\" does not exist");
}
@Test
- public void testValidate_ShouldThrowExceptionWhenFileNameIsNotFile() {
+ void testValidate_ShouldThrowExceptionWhenFileNameIsNotFile() {
String[] folderAsFileNameArgs = {"-c", "src/test/resources"};
assertValidate(folderAsFileNameArgs,
"fake policy cpm configuration file \"src/test/resources\" is not a normal file");
}
@Test
- public void testAddExtraOptions() throws CommandLineException {
+ void testAddExtraOptions() throws CommandLineException {
Option extra = Option.builder("p").longOpt("property-file")
.desc("the full path to the topic property file to use, the property file contains the "
+ FAKE_COMPONENT + " properties")
}
@Test
- public void testNewOptions() throws CommandLineException {
+ void testNewOptions() throws CommandLineException {
Options newOptions = new Options();
newOptions.addOption(
Option.builder("a").longOpt("fake-option").desc("the fake property to check command line parse")
assertTrue(testCmdExtraOpt.getCommandLine().hasOption("a"));
- // should raise exception as -c is not present on options;
+ // should raise exception as -c is not present on options
// default options should've been replaced by constructor parameter.
String[] argsError = {"-c", "aaaa.json"};
assertThatThrownBy(() -> testCmdExtraOpt.parse(argsError)).hasMessage(ERR_MSG_INVALID_ARGS)
* ONAP
* ================================================================================
* Copyright (C) 2019 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.
package org.onap.policy.common.utils.coder;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class CoderExceptionTest {
+class CoderExceptionTest {
private static final String STRING_VALUE = "My String";
private static final Throwable CAUSE = new Throwable();
private CoderException exc;
@Test
- public void testCoderException() {
+ void testCoderException() {
exc = new CoderException();
- assertEquals(null, exc.getMessage());
+ assertNull(exc.getMessage());
assertSame(null, exc.getCause());
assertNotNull(exc.toString());
}
@Test
- public void testCoderExceptionString() {
+ void testCoderExceptionString() {
exc = new CoderException(STRING_VALUE);
assertEquals(STRING_VALUE, exc.getMessage());
}
@Test
- public void testCoderExceptionThrowable() {
+ void testCoderExceptionThrowable() {
exc = new CoderException(CAUSE);
assertEquals(CAUSE.toString(), exc.getMessage());
}
@Test
- public void testCoderExceptionStringThrowable() {
+ void testCoderExceptionStringThrowable() {
exc = new CoderException(STRING_VALUE, CAUSE);
assertEquals(STRING_VALUE, exc.getMessage());
* ONAP
* ================================================================================
* Copyright (C) 2020 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.
package org.onap.policy.common.utils.coder;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.File;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class CoderTest {
+class CoderTest {
private static final Long LONG = 10L;
private static final Integer INTEGER = 10;
private static final String INT_TEXT = INTEGER.toString();
private MyCoder coder;
- @Before
- public void setUp() {
+ @BeforeEach
+ void setUp() {
coder = new MyCoder();
}
@Test
- public void testConvert() throws CoderException {
+ void testConvert() throws CoderException {
assertNull(coder.convert(null, String.class));
// same class of object
* ONAP
* ================================================================================
* Copyright (C) 2019-2020 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.
package org.onap.policy.common.utils.coder;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import com.google.gson.annotations.SerializedName;
import java.io.Reader;
import java.io.StringReader;
import java.util.List;
import lombok.Getter;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class PropertyCoderTest {
+class PropertyCoderTest {
private PropertyCoder propertyCoder = null;
private static final String AES_ENCRYPTION_KEY = "aes_encryption_key";
*
* @throws Exception if an error occurs
*/
- @Before
+ @BeforeEach
public void setUp() throws Exception {
propertyCoder = new PropertyCoder();
}
@Test
- public void testPropertyCoder() {
+ void testPropertyCoder() {
MyClass data = propertyCoder.decode(json, AES_ENCRYPTION_KEY, MyClass.class);
assertEquals("alpha", data.getPdpRestPass());
assertEquals("hello", data.servers.get(0).pass);
}
@Test
- public void testPropertyCoderReader() {
+ void testPropertyCoderReader() {
Reader reader = new StringReader(json);
MyClass data = propertyCoder.decode(reader, AES_ENCRYPTION_KEY, MyClass.class);
assertEquals("alpha", data.getPdpRestPass());
* ONAP PAP
* ================================================================================
* Copyright (C) 2019-2020 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.
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import com.google.gson.JsonElement;
import java.io.StringReader;
import java.util.LinkedHashMap;
import java.util.Map;
import lombok.ToString;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class StandardCoderInstantAsMillisTest {
+class StandardCoderInstantAsMillisTest {
private static final long INSTANT_MILLIS = 1583249713500L;
private static final String INSTANT_TEXT = String.valueOf(INSTANT_MILLIS);
private StandardCoder coder;
- @Before
+ @BeforeEach
public void setUp() {
coder = new StandardCoderInstantAsMillis();
}
@Test
- public void testConvert() throws CoderException {
+ void testConvert() throws CoderException {
MyObject obj = makeObject();
@SuppressWarnings("unchecked")
}
@Test
- public void testEncodeDecode() throws CoderException {
+ void testEncodeDecode() throws CoderException {
MyObject obj = makeObject();
assertThat(coder.encode(obj, false)).contains(INSTANT_TEXT);
assertThat(coder.encode(obj, true)).contains(INSTANT_TEXT);
}
@Test
- public void testJson() {
+ void testJson() {
MyObject obj = makeObject();
assertThat(coder.toPrettyJson(obj)).contains(INSTANT_TEXT);
}
@Test
- public void testToJsonTree_testFromJsonJsonElementClassT() throws Exception {
+ void testToJsonTree_testFromJsonJsonElementClassT() throws Exception {
MyMap map = new MyMap();
map.props = new LinkedHashMap<>();
map.props.put("jel keyA", "jel valueA");
}
@Test
- public void testConvertFromDouble() throws Exception {
+ void testConvertFromDouble() throws Exception {
String text = "[listA, {keyA=100}, 200]";
assertEquals(text, coder.decode(text, Object.class).toString());
}
@Test
- public void testToStandard() throws Exception {
+ void testToStandard() throws Exception {
MyObject obj = makeObject();
StandardCoderObject sco = coder.toStandard(obj);
assertNotNull(sco.getData());
}
@Test
- public void testFromStandard() throws Exception {
+ void testFromStandard() throws Exception {
MyObject obj = new MyObject();
obj.abc = "pdq";
StandardCoderObject sco = coder.toStandard(obj);
* ONAP
* ================================================================================
* Copyright (C) 2019-2020 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.
package org.onap.policy.common.utils.coder;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class StandardCoderObjectTest {
+class StandardCoderObjectTest {
private static final Gson gson = new Gson();
private static final String PROP1 = "abc";
*
* @throws Exception if an error occurs
*/
- @Before
+ @BeforeEach
public void setUp() throws Exception {
sco = new StandardCoderObject(gson.fromJson(JSON, JsonElement.class));
}
@Test
- public void testStandardCoderObject() {
+ void testStandardCoderObject() {
assertNull(new StandardCoderObject().getData());
}
@Test
- public void testStandardCoderObjectJsonElement() {
+ void testStandardCoderObjectJsonElement() {
assertNotNull(sco.getData());
assertEquals(JSON, gson.toJson(sco.getData()));
}
@Test
- public void testGetString() throws Exception {
+ void testGetString() throws Exception {
// one field
assertEquals(VAL1, sco.getString(PROP1));
}
@Test
- public void testGetFieldFromObject() {
+ void testGetFieldFromObject() {
// not an object
assertNull(sco.getFieldFromObject(fromJson("[]"), PROP1));
}
@Test
- public void testGetItemFromArray() {
+ void testGetItemFromArray() {
// not an array
assertNull(sco.getItemFromArray(fromJson("{}"), 0));
* ONAP PAP
* ================================================================================
* 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.
package org.onap.policy.common.utils.coder;
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.assertNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import java.util.Map;
import java.util.TreeMap;
import lombok.ToString;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class StandardCoderTest {
+class StandardCoderTest {
private static final String EXPECTED_EXCEPTION = "expected exception";
private static final JsonParseException jpe = new JsonParseException(EXPECTED_EXCEPTION);
private StandardCoder coder;
- @Before
+ @BeforeEach
public void setUp() {
coder = new StandardCoder();
}
@Test
- public void testConvert() throws CoderException {
+ void testConvert() throws CoderException {
// null source
assertNull(coder.convert(null, StandardCoderObject.class));
}
@Test
- public void testEncodeObject() throws Exception {
+ void testEncodeObject() throws Exception {
List<Integer> arr = Arrays.asList(1100, 1110);
assertEquals("[1100,1110]", coder.encode(arr));
}
@Test
- public void testEncodeObjectBoolean() throws Exception {
+ void testEncodeObjectBoolean() throws Exception {
final List<Integer> arr = Arrays.asList(1100, 1110);
/*
}
@Test
- public void testEncodeWriterObject() throws Exception {
+ void testEncodeWriterObject() throws Exception {
List<Integer> arr = Arrays.asList(1200, 1210);
StringWriter wtr = new StringWriter();
coder.encode(wtr, arr);
}
@Test
- public void testEncodeOutputStreamObject() throws Exception {
+ void testEncodeOutputStreamObject() throws Exception {
List<Integer> arr = Arrays.asList(1300, 1310);
ByteArrayOutputStream stream = new ByteArrayOutputStream();
coder.encode(stream, arr);
}
@Test
- public void testEncodeFileObject() throws Exception {
+ void testEncodeFileObject() throws Exception {
File file = new File(getClass().getResource(StandardCoder.class.getSimpleName() + ".json").getFile() + "X");
file.deleteOnExit();
List<Integer> arr = Arrays.asList(1400, 1410);
}
@Test
- public void testDecodeStringClass() throws Exception {
+ void testDecodeStringClass() throws Exception {
String text = "[2200,2210]";
assertEquals(text, coder.decode(text, JsonElement.class).toString());
}
@Test
- public void testDecodeReaderClass() throws Exception {
+ void testDecodeReaderClass() throws Exception {
String text = "[2300,2310]";
assertEquals(text, coder.decode(new StringReader(text), JsonElement.class).toString());
}
@Test
- public void testDecodeInputStreamClass() throws Exception {
+ void testDecodeInputStreamClass() throws Exception {
String text = "[2400,2410]";
assertEquals(text,
coder.decode(new ByteArrayInputStream(text.getBytes(StandardCharsets.UTF_8)), JsonElement.class)
}
@Test
- public void testDecodeFileClass() throws Exception {
+ void testDecodeFileClass() throws Exception {
File file = new File(getClass().getResource(StandardCoder.class.getSimpleName() + ".json").getFile());
String text = new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8);
assertEquals(text, coder.decode(file, JsonElement.class).toString());
}
@Test
- public void testToJsonTree_testFromJsonJsonElementClassT() throws Exception {
+ void testToJsonTree_testFromJsonJsonElementClassT() throws Exception {
MyMap map = new MyMap();
map.props = new LinkedHashMap<>();
map.props.put("jel keyA", "jel valueA");
}
@Test
- public void testConvertFromDouble() throws Exception {
+ void testConvertFromDouble() throws Exception {
String text = "[listA, {keyA=100}, 200]";
assertEquals(text, coder.decode(text, Object.class).toString());
}
@Test
- public void testToStandard() throws Exception {
+ void testToStandard() throws Exception {
MyObject obj = new MyObject();
obj.abc = "xyz";
StandardCoderObject sco = coder.toStandard(obj);
}
@Test
- public void testFromStandard() throws Exception {
+ void testFromStandard() throws Exception {
MyObject obj = new MyObject();
obj.abc = "pdq";
StandardCoderObject sco = coder.toStandard(obj);
}
@Test
- public void testStandardTypeAdapter() throws Exception {
+ void testStandardTypeAdapter() throws Exception {
String json = "{'abc':'def'}".replace('\'', '"');
StandardCoderObject sco = coder.fromJson(json, StandardCoderObject.class);
assertNotNull(sco.getData());
}
@Test
- public void testMapDouble() throws Exception {
+ void testMapDouble() throws Exception {
MyMap map = new MyMap();
map.props = new HashMap<>();
map.props.put("plainString", "def");
}
@Test
- public void testListDouble() throws Exception {
+ void testListDouble() throws Exception {
@SuppressWarnings("unchecked")
List<Object> list = coder.decode("[10, 20.1, 30]", LinkedList.class);
assertEquals("[10, 20.1, 30]", list.toString());
/*
* ============LICENSE_START=======================================================
* Copyright (C) 2020 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.
package org.onap.policy.common.utils.coder;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import com.worldturner.medeia.api.ValidationFailedException;
import java.io.IOException;
import java.util.List;
import lombok.Data;
import lombok.NoArgsConstructor;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class StandardValCoderTest {
+class StandardValCoderTest {
private String jsonSchema;
private String validJson;
private String missingReqJson;
public List<ValInner> aaCollection;
}
- @Before
+ @BeforeEach
public void testSetUp() throws Exception {
jsonSchema = getJson("src/test/resources/org/onap/policy/common/utils/coder/test.schema.json");
validJson = getJson("src/test/resources/org/onap/policy/common/utils/coder/valid.json");
}
@Test
- public void testDecode() throws CoderException {
+ void testDecode() throws CoderException {
StandardValCoder valCoder = new StandardValCoder(jsonSchema, "test-schema");
ValOuter valOuter = valCoder.decode(validJson, ValOuter.class);
}
@Test
- public void testEncode() throws CoderException {
+ void testEncode() throws CoderException {
StandardValCoder valCoder = new StandardValCoder(jsonSchema, "test-schema");
ValOuter valOuter = valCoder.decode(validJson, ValOuter.class);
}
@Test
- public void testPretty() throws CoderException {
+ void testPretty() throws CoderException {
StandardValCoder valCoder = new StandardValCoder(jsonSchema, "test-schema");
ValOuter valOuter = valCoder.decode(validJson, ValOuter.class);
}
@Test
- public void testConformance() {
+ void testConformance() {
StandardValCoder valCoder = new StandardValCoder(jsonSchema, "test-schema");
assertTrue(valCoder.isConformant(validJson));
assertFalse(valCoder.isConformant(missingReqJson));
* ONAP
* ================================================================================
* Copyright (C) 2019-2020 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.
package org.onap.policy.common.utils.coder;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import java.io.StringWriter;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.utils.coder.YamlJsonTranslatorTest.Container;
-public class StandardYamlCoderTest {
+class StandardYamlCoderTest {
private static final File YAML_FILE =
new File("src/test/resources/org/onap/policy/common/utils/coder/YamlJsonTranslator.yaml");
private StandardYamlCoder coder;
private Container cont;
- @Before
+ @BeforeEach
public void setUp() throws CoderException {
coder = new StandardYamlCoder();
cont = coder.decode(YAML_FILE, Container.class);
}
@Test
- public void testToPrettyJson() throws CoderException {
+ void testToPrettyJson() throws CoderException {
String expected = coder.encode(cont);
assertEquals(expected, coder.encode(cont, false));
}
@Test
- public void testToJsonObject() throws CoderException {
+ void testToJsonObject() throws CoderException {
String yaml = coder.encode(cont);
Container cont2 = coder.decode(yaml, Container.class);
}
@Test
- public void testToJsonWriterObject() throws CoderException {
+ void testToJsonWriterObject() throws CoderException {
StringWriter wtr = new StringWriter();
coder.encode(wtr, cont);
String yaml = wtr.toString();
}
@Test
- public void testFromJsonStringClassOfT() throws Exception {
+ void testFromJsonStringClassOfT() throws Exception {
String yaml = new String(Files.readAllBytes(YAML_FILE.toPath()), StandardCharsets.UTF_8);
Container cont2 = coder.decode(yaml, Container.class);
assertEquals(cont, cont2);
}
@Test
- public void testFromJsonReaderClassOfT() {
+ void testFromJsonReaderClassOfT() {
YamlJsonTranslatorTest.verify(cont);
}
@Test
- public void testFromJsonDoubleToInteger() throws Exception {
+ void testFromJsonDoubleToInteger() throws Exception {
Object value = coder.decode("20", Object.class);
assertEquals(Integer.valueOf(20), value);
}
@Test
- public void testStandardTypeAdapter() throws Exception {
+ void testStandardTypeAdapter() throws Exception {
String yaml = "abc: def\n";
StandardCoderObject sco = coder.fromJson(yaml, StandardCoderObject.class);
assertNotNull(sco.getData());
* ONAP
* ================================================================================
* Copyright (C) 2019 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.
package org.onap.policy.common.utils.coder;
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.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.FileReader;
import java.util.List;
import java.util.Map;
import lombok.EqualsAndHashCode;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.yaml.snakeyaml.error.YAMLException;
-public class YamlJsonTranslatorTest {
+class YamlJsonTranslatorTest {
private static final File YAML_FILE =
new File("src/test/resources/org/onap/policy/common/utils/coder/YamlJsonTranslator.yaml");
*
* @throws IOException if an error occurs
*/
- @Before
+ @BeforeEach
public void setUp() throws IOException {
translator = new YamlJsonTranslator();
}
@Test
- public void testToYamlObject() {
+ void testToYamlObject() {
String yaml = translator.toYaml(cont);
Container cont2 = translator.fromYaml(yaml, Container.class);
}
@Test
- public void testToYamlWriterObject() throws IOException {
+ void testToYamlWriterObject() throws IOException {
IOException ex = new IOException("expected exception");
// writer that throws an exception when the write() method is invoked
}
@Test
- public void testFromYamlStringClassOfT() throws IOException {
+ void testFromYamlStringClassOfT() throws IOException {
String yaml = new String(Files.readAllBytes(YAML_FILE.toPath()), StandardCharsets.UTF_8);
Container cont2 = translator.fromYaml(yaml, Container.class);
assertEquals(cont, cont2);
}
@Test
- public void testFromYamlReaderClassOfT() {
+ void testFromYamlReaderClassOfT() {
verify(cont);
}
* Common Utils
* ================================================================================
* Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2023 Nordix Foundation.
+ * Modifications Copyright (C) 2023-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.
package org.onap.policy.common.utils.jpa;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import jakarta.persistence.EntityManager;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class EntityMgrCloserTest {
+class EntityMgrCloserTest {
private EntityManager mgr;
- @Before
+ @BeforeEach
public void setUp() {
mgr = mock(EntityManager.class);
}
* Verifies that the constructor does not do anything extra before being closed.
*/
@Test
- public void testEntityMgrCloser() {
+ void testEntityMgrCloser() {
EntityMgrCloser entityMgrCloser = new EntityMgrCloser(mgr);
assertEquals(mgr, entityMgrCloser.getManager());
}
@Test
- public void testGetManager() {
+ void testGetManager() {
try (EntityMgrCloser c = new EntityMgrCloser(mgr)) {
assertEquals(mgr, c.getManager());
}
* Verifies that the manager gets closed when close() is invoked.
*/
@Test
- public void testClose() {
+ void testClose() {
EntityMgrCloser entityMgrCloser = new EntityMgrCloser(mgr);
entityMgrCloser.close();
* Ensures that the manager gets closed when "try" block exits normally.
*/
@Test
- public void testClose_TryWithoutExcept() {
+ void testClose_TryWithoutExcept() {
try (EntityMgrCloser entityMgrCloser = new EntityMgrCloser(mgr)) {
// No need to do anything in the try block
}
* Ensures that the manager gets closed when "try" block throws an exception.
*/
@Test
- public void testClose_TryWithExcept() {
+ void testClose_TryWithExcept() {
try {
try (EntityMgrCloser c = new EntityMgrCloser(mgr)) {
throw new Exception("expected exception");
* Common Utils
* ================================================================================
* Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2023 Nordix Foundation.
+ * Modifications Copyright (C) 2023-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.
package org.onap.policy.common.utils.jpa;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import jakarta.persistence.EntityManagerFactory;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class EntityMgrFactoryCloserTest {
+class EntityMgrFactoryCloserTest {
private EntityManagerFactory factory;
- @Before
+ @BeforeEach
public void setUp() {
factory = mock(EntityManagerFactory.class);
}
* Verifies that the constructor does not do anything extra before being closed.
*/
@Test
- public void testEntityMgrFactoryCloser() {
+ void testEntityMgrFactoryCloser() {
EntityMgrFactoryCloser entityMgrFactoryCloser = new EntityMgrFactoryCloser(factory);
assertEquals(factory, entityMgrFactoryCloser.getFactory());
}
@Test
- public void testgetFactory() {
+ void testGetFactory() {
try (EntityMgrFactoryCloser c = new EntityMgrFactoryCloser(factory)) {
assertEquals(factory, c.getFactory());
}
* Verifies that the manager gets closed when close() is invoked.
*/
@Test
- public void testClose() {
+ void testClose() {
EntityMgrFactoryCloser entityMgrFactoryCloser = new EntityMgrFactoryCloser(factory);
entityMgrFactoryCloser.close();
* Ensures that the manager gets closed when "try" block exits normally.
*/
@Test
- public void testClose_TryWithoutExcept() {
+ void testClose_TryWithoutExcept() {
try (EntityMgrFactoryCloser entityMgrFactoryCloser = new EntityMgrFactoryCloser(factory)) {
// No need to do anything in the try block
}
* Ensures that the manager gets closed when "try" block throws an exception.
*/
@Test
- public void testClose_TryWithExcept() {
+ void testClose_TryWithExcept() {
try {
try (EntityMgrFactoryCloser c = new EntityMgrFactoryCloser(factory)) {
throw new Exception("expected exception");
* Common Utils
* ================================================================================
* Copyright (C) 2018-2021 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2023 Nordix Foundation.
+ * Modifications Copyright (C) 2023-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.
package org.onap.policy.common.utils.jpa;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
import jakarta.persistence.EntityTransaction;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class EntityTransCloserTest {
+class EntityTransCloserTest {
private EntityTransaction trans;
/**
* Set up EntityTransaction mock.
*/
- @Before
+ @BeforeEach
public void setUp() {
trans = mock(EntityTransaction.class);
* being closed.
*/
@Test
- public void testEntityTransCloser() {
+ void testEntityTransCloser() {
EntityTransCloser entityTransCloser = new EntityTransCloser(trans);
assertEquals(trans, entityTransCloser.getTransaction());
}
@Test
- public void testGetTransation() {
+ void testGetTransaction() {
try (EntityTransCloser t = new EntityTransCloser(trans)) {
assertEquals(trans, t.getTransaction());
}
* is active.
*/
@Test
- public void testClose_Active() {
+ void testClose_Active() {
EntityTransCloser entityTransCloser = new EntityTransCloser(trans);
when(trans.isActive()).thenReturn(true);
* when and no transaction is active.
*/
@Test
- public void testClose_Inactive() {
+ void testClose_Inactive() {
EntityTransCloser entityTransCloser = new EntityTransCloser(trans);
when(trans.isActive()).thenReturn(false);
* normally and a transaction is active.
*/
@Test
- public void testClose_TryWithoutExcept_Active() {
+ void testClose_TryWithoutExcept_Active() {
when(trans.isActive()).thenReturn(true);
try (EntityTransCloser entityTransCloser = new EntityTransCloser(trans)) {
* "try" block exits normally and no transaction is active.
*/
@Test
- public void testClose_TryWithoutExcept_Inactive() {
+ void testClose_TryWithoutExcept_Inactive() {
when(trans.isActive()).thenReturn(false);
try (EntityTransCloser entityTransCloser = new EntityTransCloser(trans)) {
* an exception and a transaction is active.
*/
@Test
- public void testClose_TryWithExcept_Active() {
+ void testClose_TryWithExcept_Active() {
when(trans.isActive()).thenReturn(true);
try {
* "try" block throws an exception and no transaction is active.
*/
@Test
- public void testClose_TryWithExcept_Inactive() {
+ void testClose_TryWithExcept_Inactive() {
when(trans.isActive()).thenReturn(false);
try {
* Verifies that commit() only commits, and that the subsequent close() does not re-commit.
*/
@Test
- public void testCommit() {
+ void testCommit() {
EntityTransCloser entityTransCloser = new EntityTransCloser(trans);
entityTransCloser.commit();
// closed, but not re-committed
entityTransCloser.close();
- verify(trans, times(1)).commit();
+ verify(trans).commit();
}
/**
* back.
*/
@Test
- public void testRollback() {
+ void testRollback() {
EntityTransCloser entityTransCloser = new EntityTransCloser(trans);
entityTransCloser.rollback();
* ONAP Policy
* ================================================================================
* Copyright (C) 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.
package org.onap.policy.common.utils.logging;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@RunWith(MockitoJUnitRunner.class)
-public class LoggerUtilsTest {
+@ExtendWith(MockitoExtension.class)
+class LoggerUtilsTest {
protected static final Logger logger = LoggerFactory.getLogger(LoggerUtilsTest.class);
@Test
- public void testMarker() {
+ void testMarker() {
assertTrue(logger.isInfoEnabled());
logger.info("line 1");
logger.info(LoggerUtils.METRIC_LOG_MARKER, "line 1 Metric");
* policy-utils
* ================================================================================
* Copyright (C) 2018-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.
package org.onap.policy.common.utils.network;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.Socket;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class NetworkUtilTest {
+class NetworkUtilTest {
protected static Logger logger = LoggerFactory.getLogger(NetworkUtilTest.class);
private static final String LOCALHOST = "localhost";
@Test
- public void test() throws InterruptedException, IOException {
+ void test() throws InterruptedException, IOException {
assertNotNull(NetworkUtil.IPV4_WILDCARD_ADDRESS);
assertFalse(NetworkUtil.isTcpPortOpen(LOCALHOST, NetworkUtil.allocPort(), 1, 5));
assertNotNull(NetworkUtil.getHostname());
}
@Test
- public void testAlwaysTrustManager() throws Exception {
+ void testAlwaysTrustManager() throws Exception {
TrustManager[] mgrarr = NetworkUtil.getAlwaysTrustingManager();
assertEquals(1, mgrarr.length);
- assertTrue(mgrarr[0] instanceof X509TrustManager);
+ assertInstanceOf(X509TrustManager.class, mgrarr[0]);
X509TrustManager mgr = (X509TrustManager) mgrarr[0];
assertNotNull(mgr.getAcceptedIssuers());
}
@Test
- public void testAllocPort_testAllocPortString__testAllocPortInetSocketAddress() throws Exception {
+ void testAllocPort_testAllocPortString__testAllocPortInetSocketAddress() throws Exception {
// allocate wild-card port
int wildCardPort = NetworkUtil.allocPort();
assertNotEquals(0, wildCardPort);
}
@Test
- public void testGenUniqueName() {
+ void testGenUniqueName() {
String name = NetworkUtil.genUniqueName(LOCALHOST);
assertThat(name).isNotBlank().isNotEqualTo(LOCALHOST);
@Override
public void run() {
- try (Socket server = socket.accept()) {
+ try (Socket server = socket.accept()) { //NOSONAR
// do nothing
} catch (IOException e) {
* ONAP - Common Modules
* ================================================================================
* Copyright (C) 2019-2020 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.
package org.onap.policy.common.utils.properties;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Properties;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.utils.properties.exception.PropertyAccessException;
import org.onap.policy.common.utils.properties.exception.PropertyException;
import org.onap.policy.common.utils.properties.exception.PropertyInvalidException;
/**
* Test class for PropertyConfiguration.
*/
-public class BeanConfiguratorTest {
+class BeanConfiguratorTest {
private static final String EXPECTED_EXCEPTION = "expected exception";
private static final String FALSE_STRING = "false";
private static final String A_VALUE = "a.value";
private BeanConfigurator beancfg;
- @Before
+ @BeforeEach
public void setUp() {
props = new Properties();
beancfg = new BeanConfigurator();
}
@Test
- public void testConfigureFromProperties() throws PropertyException {
+ void testConfigureFromProperties() throws PropertyException {
testStringValueNoDefault();
}
}
@Test
- public void testSetAllFields() throws Exception {
+ void testSetAllFields() throws Exception {
/*
* Implements an extra interface, just to see that it doesn't cause issues.
}
@Test
- public void testSetAllFields_NoProperties() throws Exception {
+ void testSetAllFields_NoProperties() throws Exception {
class Config {
}
@Test
- public void testSetValueObjectFieldProperties_FieldSet() throws PropertyException {
+ void testSetValueObjectFieldProperties_FieldSet() throws PropertyException {
testStringValueNoDefault();
}
@Test
- public void testSetValueObjectFieldProperties_NoAnnotation() throws PropertyException {
+ void testSetValueObjectFieldProperties_NoAnnotation() throws PropertyException {
class Config {
private String value;
assertNull(cfg.value);
}
- @Test(expected = PropertyAccessException.class)
- public void testSetValueObjectFieldProperties_WrongFieldType() throws PropertyException {
+ @Test
+ void testSetValueObjectFieldProperties_WrongFieldType() {
class Config {
// Cannot set a property into an "Exception" field
}
props.setProperty(THE_VALUE, STRING_VALUE);
- beancfg.configureFromProperties(new Config(), props);
+ assertThrows(PropertyAccessException.class, () -> beancfg.configureFromProperties(
+ new Config(), props));
}
- @Test(expected = PropertyAccessException.class)
- public void testGetSetter_NoSetter() throws PropertyException {
+ @Test
+ void testGetSetter_NoSetter() {
class Config {
@Property(name = THE_VALUE)
}
props.setProperty(THE_VALUE, STRING_VALUE);
- beancfg.configureFromProperties(new Config(), props);
+ assertThrows(PropertyAccessException.class, () -> beancfg.configureFromProperties(
+ new Config(), props));
}
- @Test(expected = PropertyMissingException.class)
- public void testSetValueObjectMethodFieldPropertiesProperty_NoProperty_NoDefault() throws PropertyException {
- beancfg.configureFromProperties(new PlainStringConfig(), props);
+ @Test
+ void testSetValueObjectMethodFieldPropertiesProperty_NoProperty_NoDefault() {
+ assertThrows(PropertyMissingException.class, () -> beancfg.configureFromProperties(
+ new PlainStringConfig(), props));
+
}
- @Test(expected = PropertyInvalidException.class)
- public void testSetValueObjectMethodFieldPropertiesProperty_IllegalArgEx() throws PropertyException {
+ @Test
+ void testSetValueObjectMethodFieldPropertiesProperty_IllegalArgEx() {
props.setProperty(THE_VALUE, STRING_VALUE);
beancfg = new BeanConfigurator() {
}
};
- beancfg.configureFromProperties(new PlainStringConfig(), props);
+ assertThrows(PropertyInvalidException.class, () -> beancfg.configureFromProperties(
+ new PlainStringConfig(), props));
}
- @Test(expected = PropertyAccessException.class)
- public void testSetValueObjectMethodFieldPropertiesProperty_MethodEx() throws PropertyException {
+ @Test
+ void testSetValueObjectMethodFieldPropertiesProperty_MethodEx() {
class Config extends PlainStringConfig {
@Override
}
props.setProperty(THE_VALUE, STRING_VALUE);
- beancfg.configureFromProperties(new Config(), props);
+ assertThrows(PropertyAccessException.class, () -> beancfg.configureFromProperties(
+ new Config(), props));
}
@Test
- public void testGetValue() throws PropertyException {
+ void testGetValue() throws PropertyException {
// this class contains all of the supported field types
class Config {
assertEquals(10001, cfg.primLongValue);
}
- @Test(expected = PropertyAccessException.class)
- public void testGetValue_UnsupportedType() throws PropertyException {
+ @Test
+ void testGetValue_UnsupportedType() {
class Config {
// Cannot set a property into an "Exception" field
}
props.setProperty(THE_VALUE, STRING_VALUE);
- beancfg.configureFromProperties(new Config(), props);
+ assertThrows(PropertyAccessException.class, () -> beancfg.configureFromProperties(
+ new Config(), props));
+
}
@Test
- public void testCheckModifiable_OtherModifiers() throws PropertyException {
- // this class contains all of the supported field types
+ void testCheckModifiable_OtherModifiers() throws PropertyException {
+ // this class contains all the supported field types
class Config {
@Property(name = "public")
assertEquals("a protected string", cfg.protectedString);
}
- @Test(expected = PropertyAccessException.class)
- public void testCheckModifiable_Static() throws PropertyException {
+ @Test
+ void testCheckModifiable_Static() {
props.setProperty(THE_VALUE, STRING_VALUE);
- beancfg.configureFromProperties(new StaticPropConfig(), props);
+ assertThrows(PropertyAccessException.class, () -> beancfg.configureFromProperties(
+ new StaticPropConfig(), props));
+
}
- @Test(expected = PropertyAccessException.class)
- public void testCheckModifiable_Final() throws PropertyException {
+ @Test
+ void testCheckModifiable_Final() {
class Config {
// Cannot set a property into an "final" field
}
props.setProperty(THE_VALUE, STRING_VALUE);
- beancfg.configureFromProperties(new Config(), props);
+ assertThrows(PropertyAccessException.class, () -> beancfg.configureFromProperties(
+ new Config(), props));
+
}
- @Test(expected = PropertyAccessException.class)
- public void testCheckMethod_Static() throws PropertyException {
+ @Test
+ void testCheckMethod_Static() {
props.setProperty(THE_VALUE, STRING_VALUE);
- beancfg.configureFromProperties(new StaticMethodConfig(), props);
+ assertThrows(PropertyAccessException.class, () -> beancfg.configureFromProperties(
+ new StaticMethodConfig(), props));
+
}
@Test
- public void testGetStringValue() throws PropertyException {
+ void testGetStringValue() throws PropertyException {
testStringValueNoDefault();
}
@Test
- public void testGetBooleanValue_NoDefault() throws PropertyException {
+ void testGetBooleanValue_NoDefault() throws PropertyException {
props.setProperty(THE_VALUE, "true");
PlainBooleanConfig cfg = new PlainBooleanConfig();
beancfg.configureFromProperties(cfg, props);
assertEquals(true, cfg.value);
}
- @Test(expected = PropertyInvalidException.class)
- public void testGetBooleanValue_InvalidDefault() throws PropertyException {
+ @Test
+ void testGetBooleanValue_InvalidDefault() {
class Config {
@Property(name = THE_VALUE, defaultValue = INVALID_VALUE)
}
props.setProperty(THE_VALUE, "true");
- beancfg.configureFromProperties(new Config(), props);
+ assertThrows(PropertyInvalidException.class, () -> beancfg.configureFromProperties(
+ new Config(), props));
}
@Test
- public void testGetBooleanValue_ValidDefault_True() throws PropertyException {
+ void testGetBooleanValue_ValidDefault_True() throws PropertyException {
class Config {
@Property(name = THE_VALUE, defaultValue = "true")
}
@Test
- public void testGetBooleanValue_ValidDefault_False() throws PropertyException {
+ void testGetBooleanValue_ValidDefault_False() throws PropertyException {
class Config {
@Property(name = THE_VALUE, defaultValue = FALSE_STRING)
}
@Test
- public void testGetIntegerValue_NoDefault() throws PropertyException {
+ void testGetIntegerValue_NoDefault() throws PropertyException {
class Config {
@Property(name = THE_VALUE)
assertEquals(200, cfg.value.intValue());
}
- @Test(expected = PropertyInvalidException.class)
- public void testGetIntegerValue_InvalidDefault() throws PropertyException {
+ @Test
+ void testGetIntegerValue_InvalidDefault() {
class Config {
@Property(name = THE_VALUE, defaultValue = INVALID_VALUE)
}
props.setProperty(THE_VALUE, NUMBER_STRING);
- beancfg.configureFromProperties(new Config(), props);
+ assertThrows(PropertyInvalidException.class, () -> beancfg.configureFromProperties(
+ new Config(), props));
+
}
@Test
- public void testGetIntegerValue_ValidDefault() throws PropertyException {
+ void testGetIntegerValue_ValidDefault() throws PropertyException {
class Config {
@Property(name = THE_VALUE, defaultValue = "201")
}
@Test
- public void testGetLongValue_NoDefault() throws PropertyException {
+ void testGetLongValue_NoDefault() throws PropertyException {
class Config {
@Property(name = THE_VALUE)
assertEquals(20000L, cfg.value.longValue());
}
- @Test(expected = PropertyInvalidException.class)
- public void testGetLongValue_InvalidDefault() throws PropertyException {
+ @Test
+ void testGetLongValue_InvalidDefault() {
class Config {
@Property(name = THE_VALUE, defaultValue = INVALID_VALUE)
}
props.setProperty(THE_VALUE, NUMBER_STRING_LONG);
- beancfg.configureFromProperties(new Config(), props);
+ assertThrows(PropertyInvalidException.class, () -> beancfg.configureFromProperties(
+ new Config(), props));
+
}
@Test
- public void testGetLongValue_ValidDefault() throws PropertyException {
+ void testGetLongValue_ValidDefault() throws PropertyException {
class Config {
@Property(name = THE_VALUE, defaultValue = "20001")
}
@Test
- public void testGetPropValue_Prop_NoDefault() throws PropertyException {
+ void testGetPropValue_Prop_NoDefault() throws PropertyException {
testStringValueNoDefault();
}
@Test
- public void testGetPropValue_Prop_Default() throws PropertyException {
+ void testGetPropValue_Prop_Default() throws PropertyException {
class Config {
@Property(name = THE_VALUE, defaultValue = STRING_VALUE_DEFAULT)
}
@Test
- public void testGetPropValue_EmptyProp_EmptyOk() throws PropertyException {
+ void testGetPropValue_EmptyProp_EmptyOk() throws PropertyException {
class Config {
@Property(name = THE_VALUE, accept = "empty")
}
@Test
- public void testGetPropValue_NullProp_EmptyOk() throws PropertyException {
+ void testGetPropValue_NullProp_EmptyOk() throws PropertyException {
class Config {
@Property(name = THE_VALUE, accept = "empty")
}
@Test
- public void testGetPropValue_EmptyDefault_EmptyOk() throws PropertyException {
+ void testGetPropValue_EmptyDefault_EmptyOk() throws PropertyException {
class Config {
@Property(name = THE_VALUE, defaultValue = "", accept = "empty")
}
@Test
- public void testGetPropValue_Default_EmptyOk() throws PropertyException {
+ void testGetPropValue_Default_EmptyOk() throws PropertyException {
class Config {
@Property(name = THE_VALUE, defaultValue = STRING_VALUE, accept = "empty")
assertEquals(STRING_VALUE, cfg.value);
}
- @Test(expected = PropertyMissingException.class)
- public void testGetPropValue_EmptyDefault_EmptyNotOk() throws PropertyException {
+ @Test
+ void testGetPropValue_EmptyDefault_EmptyNotOk() {
class Config {
@Property(name = THE_VALUE, defaultValue = "")
}
}
- beancfg.configureFromProperties(new Config(), props);
+ assertThrows(PropertyMissingException.class, () -> beancfg.configureFromProperties(
+ new Config(), props));
}
@Test
- public void testGetPropValue_Default_EmptyNotOk() throws PropertyException {
+ void testGetPropValue_Default_EmptyNotOk() throws PropertyException {
class Config {
@Property(name = THE_VALUE, defaultValue = STRING_VALUE, accept = "")
}
@Test
- public void testMakeBoolean_True() throws PropertyException {
- props.setProperty(THE_VALUE, "true");
- PlainBooleanConfig cfg = new PlainBooleanConfig();
- beancfg.configureFromProperties(cfg, props);
-
- assertEquals(true, cfg.value);
- }
-
- @Test
- public void testMakeBoolean_False() throws PropertyException {
+ void testMakeBoolean_False() throws PropertyException {
props.setProperty(THE_VALUE, FALSE_STRING);
PlainBooleanConfig cfg = new PlainBooleanConfig();
beancfg.configureFromProperties(cfg, props);
assertEquals(false, cfg.value);
}
- @Test(expected = PropertyInvalidException.class)
- public void testMakeBoolean_Invalid() throws PropertyException {
+ @Test
+ void testMakeBoolean_Invalid() {
props.setProperty(THE_VALUE, INVALID_VALUE);
- beancfg.configureFromProperties(new PlainBooleanConfig(), props);
+
+ assertThrows(PropertyInvalidException.class, () -> beancfg.configureFromProperties(
+ new PlainBooleanConfig(), props));
}
@Test
- public void testMakeInteger_Valid() throws PropertyException {
+ void testMakeInteger_Valid() throws PropertyException {
props.setProperty(THE_VALUE, "300");
PlainPrimIntConfig cfg = new PlainPrimIntConfig();
beancfg.configureFromProperties(cfg, props);
assertEquals(300, cfg.value);
}
- @Test(expected = PropertyInvalidException.class)
- public void testMakeInteger_Invalid() throws PropertyException {
+ @Test
+ void testMakeInteger_Invalid() {
props.setProperty(THE_VALUE, INVALID_VALUE);
- beancfg.configureFromProperties(new PlainPrimIntConfig(), props);
+ assertThrows(PropertyInvalidException.class, () -> beancfg.configureFromProperties(
+ new PlainPrimIntConfig(), props));
+
}
- @Test(expected = PropertyInvalidException.class)
- public void testMakeInteger_TooBig() throws PropertyException {
+ @Test
+ void testMakeInteger_TooBig() {
props.setProperty(THE_VALUE, String.valueOf(Integer.MAX_VALUE + 10L));
- beancfg.configureFromProperties(new PlainPrimIntConfig(), props);
+ assertThrows(PropertyInvalidException.class, () -> beancfg.configureFromProperties(
+ new PlainPrimIntConfig(), props));
}
@Test
- public void testMakeLong_Valid() throws PropertyException {
+ void testMakeLong_Valid() throws PropertyException {
props.setProperty(THE_VALUE, "30000");
PlainPrimLongConfig cfg = new PlainPrimLongConfig();
beancfg.configureFromProperties(cfg, props);
assertEquals(30000L, cfg.value);
}
- @Test(expected = PropertyInvalidException.class)
- public void testMakeLong_Invalid() throws PropertyException {
+ @Test
+ void testMakeLong_Invalid() {
props.setProperty(THE_VALUE, INVALID_VALUE);
- beancfg.configureFromProperties(new PlainPrimLongConfig(), props);
+ assertThrows(PropertyInvalidException.class, () -> beancfg.configureFromProperties(
+ new PlainPrimLongConfig(), props));
}
@Test
- public void testCheckDefaultValue_NotEmpty_Valid() throws PropertyException {
+ void testCheckDefaultValue_NotEmpty_Valid() throws PropertyException {
class Config {
@Property(name = THE_VALUE, defaultValue = "700")
assertEquals(700L, cfg.value);
}
- @Test(expected = PropertyInvalidException.class)
- public void testCheckDefaultValue_NotEmpty_Invalid() throws PropertyException {
+ @Test
+ void testCheckDefaultValue_NotEmpty_Invalid() {
class Config {
@Property(name = THE_VALUE, defaultValue = INVALID_VALUE)
}
}
- beancfg.configureFromProperties(new Config(), props);
+ assertThrows(PropertyInvalidException.class, () -> beancfg.configureFromProperties(
+ new Config(), props));
}
- @Test(expected = PropertyInvalidException.class)
- public void testCheckDefaultValue_Empty_EmptyOk_Invalid() throws PropertyException {
-
- beancfg.configureFromProperties(new PrimLongDefaultBlankAcceptEmptyConfig(), props);
+ @Test
+ void testCheckDefaultValue_Empty_EmptyOk_Invalid() {
+ assertThrows(PropertyInvalidException.class, () -> beancfg.configureFromProperties(
+ new PrimLongDefaultBlankAcceptEmptyConfig(), props));
}
@Test
- public void testIsEmptyOkPropertyString_True() throws PropertyException {
+ void testIsEmptyOkPropertyString_True() throws PropertyException {
class Config {
@Property(name = THE_VALUE, defaultValue = "", accept = "empty")
assertEquals(STRING_VALUE, cfg.value);
}
- @Test(expected = PropertyMissingException.class)
- public void testIsEmptyOkPropertyString_False() throws PropertyException {
+ @Test
+ void testIsEmptyOkPropertyString_False() {
- beancfg.configureFromProperties(new PrimLongDefaultBlankAcceptBlankConfig(), props);
+ assertThrows(PropertyException.class, () -> beancfg
+ .configureFromProperties(new PrimLongDefaultBlankAcceptBlankConfig(), props));
}
@Test
- public void testIsEmptyOkProperty_True() throws PropertyException {
+ void testIsEmptyOkProperty_True() throws PropertyException {
class Config {
@Property(name = THE_VALUE, defaultValue = "", accept = "empty")
assertEquals("", cfg.value);
}
- @Test(expected = PropertyMissingException.class)
- public void testIsEmptyOkProperty_False() throws PropertyException {
-
- beancfg.configureFromProperties(new PrimLongDefaultBlankAcceptBlankConfig(), props);
+ @Test
+ void testIsEmptyOkProperty_False() {
+ assertThrows(PropertyMissingException.class, () -> beancfg
+ .configureFromProperties(new PrimLongDefaultBlankAcceptBlankConfig(), props));
}
@Test
- public void testPutToProperties() throws Exception {
+ void testPutToProperties() throws Exception {
/*
* Implements the extra interface, too.
}
@Test
- public void testPutProperty() throws Exception {
+ void testPutProperty() throws Exception {
class Config {
// no annotation - should not be copied
}
@Test
- public void testGetGetter() throws Exception {
+ void testGetGetter() throws Exception {
class Config {
// getter method starts with "is" for these
assertEquals(STRING_VALUE, props.getProperty("string"));
}
- @Test(expected = PropertyAccessException.class)
- public void testGetGetter_NoGetter() throws Exception {
+ @Test
+ void testGetGetter_NoGetter() {
class Config {
@Property(name = THE_VALUE)
Config cfg = new Config();
cfg.value = STRING_VALUE;
- beancfg.addToProperties(cfg, props, "", "");
+ assertThrows(PropertyAccessException.class, () -> beancfg
+ .addToProperties(cfg, props, "", ""));
}
- @Test(expected = PropertyAccessException.class)
- public void testGetGetter_NoGetterForBoolean() throws Exception {
+ @Test
+ void testGetGetter_NoGetterForBoolean() {
class Config {
@Property(name = THE_VALUE)
Config cfg = new Config();
cfg.value = true;
- beancfg.addToProperties(cfg, props, "", "");
+ assertThrows(PropertyAccessException.class, () -> beancfg
+ .addToProperties(cfg, props, "", ""));
}
- @Test(expected = PropertyAccessException.class)
- public void testGetGetter_PrivateGetter() throws Exception {
+ @Test
+ void testGetGetter_PrivateGetter() {
class Config {
@Property(name = THE_VALUE)
Config cfg = new Config();
cfg.value = STRING_VALUE;
- beancfg.addToProperties(cfg, props, "", "");
+ assertThrows(PropertyAccessException.class, () -> beancfg
+ .addToProperties(cfg, props, "", ""));
}
- @Test(expected = PropertyAccessException.class)
- public void testGetGetter_SecurityEx() throws Exception {
+ @Test
+ void testGetGetter_SecurityEx() {
class Config {
@Property(name = THE_VALUE)
}
};
- beancfg.addToProperties(cfg, props, "", "");
+ assertThrows(PropertyAccessException.class, () -> beancfg
+ .addToProperties(cfg, props, "", ""));
}
- @Test(expected = PropertyAccessException.class)
- public void testGetBeanValue_Ex() throws Exception {
+ @Test
+ void testGetBeanValue_Ex() {
class Config {
final Config cfg = new Config();
cfg.value = STRING_VALUE;
- beancfg.addToProperties(cfg, props, "the", "a");
-
+ assertThrows(PropertyAccessException.class, () -> beancfg
+ .addToProperties(cfg, props, "the", "a"));
}
/**
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019-2020 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.
package org.onap.policy.common.utils.properties;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import java.util.AbstractSet;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.utils.coder.CoderException;
import org.onap.policy.common.utils.coder.StandardCoder;
-public class PropertyObjectUtilsTest {
+class PropertyObjectUtilsTest {
@Test
- public void testToObject() {
+ void testToObject() {
Map<String, String> map = Map.of("abc", "def", "ghi", "jkl");
Properties props = new Properties();
props.putAll(map);
// with dotted prefix - other items skipped
map = Map.of("pfx.abc", "def", "ghi", "jkl", "pfx.mno", "pqr", "differentpfx.stu", "vwx");
props.clear();
- props.putAll(Map.of("pfx.abc", "def", "ghi", "jkl", "pfx.mno", "pqr", "differentpfx.stu", "vwx"));
+ props.putAll(map);
result = PropertyObjectUtils.toObject(props, "pfx.");
map = Map.of("abc", "def", "mno", "pqr");
assertEquals(map, result);
}
@Test
- public void testSetProperty() {
+ void testSetProperty() {
// one, two, and three components in the name, the last two with subscripts
Map<String, Object> map = Map.of("one", "one.abc", "two.def", "two.ghi", "three.jkl.mno[0]", "three.pqr",
"three.jkl.mno[1]", "three.stu");
}
@Test
- public void testGetNode() {
+ void testGetNode() {
Map<String, Object> map = Map.of("abc[0].def", "node.ghi", "abc[0].jkl", "node.mno", "abc[1].def", "node.pqr");
Properties props = new Properties();
props.putAll(map);
}
@Test
- public void testExpand() {
+ void testExpand() {
// add subscripts out of order
Properties props = makeProperties("abc[2]", "expand.def", "abc[1]", "expand.ghi");
}
@Test
- public void testGetObject() {
+ void testGetObject() {
// first value is primitive, while second is a map
Properties props = makeProperties("object.abc", "object.def", "object.abc.ghi", "object.jkl");
}
@Test
- public void testGetArray() {
+ void testGetArray() {
// first value is primitive, while second is an array
Properties props = makeProperties("array.abc", "array.def", "array.abc[0].ghi", "array.jkl");
@Test
@SuppressWarnings("unchecked")
- public void testCompressLists() throws IOException, CoderException {
+ void testCompressLists() throws IOException, CoderException {
assertEquals("plain-string", PropertyObjectUtils.compressLists("plain-string").toString());
// @formatter:off
* ONAP
* ================================================================================
* Copyright (C) 2018 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.
package org.onap.policy.common.utils.properties;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.util.Properties;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class SpecPropertiesTest {
+class SpecPropertiesTest {
/**
* Property prefix of interest.
/**
* Set up the tests.
*/
- @Before
+ @BeforeEach
public void setUp() {
supportingProps = new Properties();
}
@Test
- public void testSpecPropertiesStringString() {
+ void testSpecPropertiesStringString() {
// no supporting properties
props = new SpecProperties(MY_PREFIX, MY_SPEC);
}
@Test
- public void testSpecPropertiesStringStringProperties() {
+ void testSpecPropertiesStringStringProperties() {
// use supportingProps as default properties
props = new SpecProperties(MY_PREFIX, MY_SPEC, supportingProps);
}
@Test
- public void testSpecPropertiesStringStringProperties_EmptyPrefix() {
+ void testSpecPropertiesStringStringProperties_EmptyPrefix() {
supportingProps = new Properties();
supportingProps.setProperty(PROP_NO_PREFIX, VAL_NO_PREFIX);
}
@Test
- public void testWithTrailingDot() {
+ void testWithTrailingDot() {
// neither has trailing dot
assertEquals(PREFIX_GEN, props.getPrefix());
assertEquals(PREFIX_SPEC, props.getSpecPrefix());
}
@Test
- public void testGetPropertyString() {
+ void testGetPropertyString() {
// the key does contain the prefix
assertEquals(VAL_NO_PREFIX, props.getProperty(gen(PROP_NO_PREFIX)));
assertNull(props.getProperty(gen(PROP_NO_PREFIX + SUFFIX)));
}
@Test
- public void testGetPropertyStringString() {
+ void testGetPropertyStringString() {
// the key does contain the prefix
assertEquals(VAL_NO_PREFIX, props.getProperty(gen(PROP_NO_PREFIX), VAL_DEFAULT));
assertEquals(VAL_DEFAULT, props.getProperty(gen(PROP_NO_PREFIX + SUFFIX), VAL_DEFAULT));
assertNull(props.getProperty(gen(PROP_UNKNOWN), null));
}
- @Test(expected = UnsupportedOperationException.class)
- public void testHashCode() {
- props.hashCode();
+ @Test
+ void testHashCode() {
+ assertThrows(UnsupportedOperationException.class, () -> props.hashCode());
}
- @Test(expected = UnsupportedOperationException.class)
- public void testEquals() {
- props.equals(props);
+ @Test
+ void testEquals() {
+ assertThrows(UnsupportedOperationException.class, () -> props.equals(props));
}
private String gen(String propnm) {
* ONAP Policy Engine - Common Modules
* ================================================================================
* Copyright (C) 2018, 2020 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.
package org.onap.policy.common.utils.properties.exception;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test class for PropertyAccessException.
*/
-public class PropertyAccessExceptionTest extends SupportBasicPropertyExceptionTester {
+class PropertyAccessExceptionTest extends SupportBasicPropertyExceptionTester {
/**
* Test method for
* (java.lang.String, java.lang.String)}.
*/
@Test
- public void testPropertyAccessExceptionStringField() {
+ void testPropertyAccessExceptionStringField() {
verifyPropertyExceptionStringField_AllPopulated(new PropertyAccessException(PROPERTY, FIELD));
verifyPropertyExceptionStringField_NullProperty(new PropertyAccessException(null, FIELD));
verifyPropertyExceptionStringField_NullField(new PropertyAccessException(PROPERTY, null));
* (java.lang.String, java.lang.String, java.lang.String)}.
*/
@Test
- public void testPropertyAccessExceptionStringFieldString() {
+ void testPropertyAccessExceptionStringFieldString() {
verifyPropertyExceptionStringFieldString(new PropertyAccessException(PROPERTY, FIELD, MESSAGE));
}
* (java.lang.String, java.lang.String, java.lang.Throwable)}.
*/
@Test
- public void testPropertyAccessExceptionStringFieldThrowable() {
+ void testPropertyAccessExceptionStringFieldThrowable() {
verifyPropertyExceptionStringFieldThrowable(new PropertyAccessException(PROPERTY, FIELD, THROWABLE));
}
* (java.lang.String, java.lang.String, java.lang.String, java.lang.Throwable)}.
*/
@Test
- public void testPropertyAccessExceptionStringFieldStringThrowable() {
+ void testPropertyAccessExceptionStringFieldStringThrowable() {
verifyPropertyExceptionStringFieldStringThrowable(
new PropertyAccessException(PROPERTY, FIELD, MESSAGE, THROWABLE));
}
* ONAP Policy Engine - Common Modules
* ================================================================================
* Copyright (C) 2018, 2020 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.
package org.onap.policy.common.utils.properties.exception;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test class for PropertyAnnotationException.
*/
-public class PropertyAnnotationExceptionTest extends SupportBasicPropertyExceptionTester {
+class PropertyAnnotationExceptionTest extends SupportBasicPropertyExceptionTester {
/**
* Test method for
* (java.lang.String, java.lang.String)}.
*/
@Test
- public void testPropertyExceptionStringField() {
+ void testPropertyExceptionStringField() {
verifyPropertyExceptionStringField_AllPopulated(new PropertyAnnotationException(PROPERTY, FIELD));
verifyPropertyExceptionStringField_NullProperty(new PropertyAnnotationException(null, FIELD));
verifyPropertyExceptionStringField_NullField(new PropertyAnnotationException(PROPERTY, null));
* (java.lang.String, java.lang.String, java.lang.String)}.
*/
@Test
- public void testPropertyExceptionStringFieldString() {
+ void testPropertyExceptionStringFieldString() {
verifyPropertyExceptionStringFieldString(new PropertyAnnotationException(PROPERTY, FIELD, MESSAGE));
}
* (java.lang.String, java.lang.String, java.lang.Throwable)}.
*/
@Test
- public void testPropertyExceptionStringFieldThrowable() {
+ void testPropertyExceptionStringFieldThrowable() {
verifyPropertyExceptionStringFieldThrowable(new PropertyAnnotationException(PROPERTY, FIELD, THROWABLE));
}
* (java.lang.String, java.lang.String, java.lang.String, java.lang.Throwable)}.
*/
@Test
- public void testPropertyExceptionStringFieldStringThrowable() {
+ void testPropertyExceptionStringFieldStringThrowable() {
verifyPropertyExceptionStringFieldStringThrowable(
new PropertyAnnotationException(PROPERTY, FIELD, MESSAGE, THROWABLE));
}
* ONAP Policy Engine - Common Modules
* ================================================================================
* Copyright (C) 2018, 2020 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.
package org.onap.policy.common.utils.properties.exception;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test class for PropertyException.
*/
-public class PropertyExceptionTest extends SupportBasicPropertyExceptionTester {
+class PropertyExceptionTest extends SupportBasicPropertyExceptionTester {
/**
* Test method for
* (java.lang.String, java.lang.String)}.
*/
@Test
- public void testPropertyExceptionStringField() {
+ void testPropertyExceptionStringField() {
verifyPropertyExceptionStringField_AllPopulated(new PropertyException(PROPERTY, FIELD));
verifyPropertyExceptionStringField_NullProperty(new PropertyException(null, FIELD));
verifyPropertyExceptionStringField_NullField(new PropertyException(PROPERTY, null));
* (java.lang.String, java.lang.String, java.lang.String)}.
*/
@Test
- public void testPropertyExceptionStringFieldString() {
+ void testPropertyExceptionStringFieldString() {
verifyPropertyExceptionStringFieldString(new PropertyException(PROPERTY, FIELD, MESSAGE));
}
* (java.lang.String, java.lang.String, java.lang.Throwable)}.
*/
@Test
- public void testPropertyExceptionStringFieldThrowable() {
+ void testPropertyExceptionStringFieldThrowable() {
verifyPropertyExceptionStringFieldThrowable(new PropertyException(PROPERTY, FIELD, THROWABLE));
}
* (java.lang.String, java.lang.String, java.lang.String, java.lang.Throwable)}.
*/
@Test
- public void testPropertyExceptionStringFieldStringThrowable() {
+ void testPropertyExceptionStringFieldStringThrowable() {
verifyPropertyExceptionStringFieldStringThrowable(new PropertyException(PROPERTY, FIELD, MESSAGE, THROWABLE));
}
* ONAP Policy Engine - Common Modules
* ================================================================================
* Copyright (C) 2018, 2020 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.
package org.onap.policy.common.utils.properties.exception;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test class for PropertyInvalidException.
*/
-public class PropertyInvalidExceptionTest extends SupportBasicPropertyExceptionTester {
+class PropertyInvalidExceptionTest extends SupportBasicPropertyExceptionTester {
/**
* Test method for
* (java.lang.String, java.lang.String)}.
*/
@Test
- public void testPropertyExceptionStringField() {
+ void testPropertyExceptionStringField() {
verifyPropertyExceptionStringField_AllPopulated(new PropertyInvalidException(PROPERTY, FIELD));
verifyPropertyExceptionStringField_NullProperty(new PropertyInvalidException(null, FIELD));
verifyPropertyExceptionStringField_NullField(new PropertyInvalidException(PROPERTY, null));
* (java.lang.String, java.lang.String, java.lang.String)}.
*/
@Test
- public void testPropertyExceptionStringFieldString() {
+ void testPropertyExceptionStringFieldString() {
verifyPropertyExceptionStringFieldString(new PropertyInvalidException(PROPERTY, FIELD, MESSAGE));
}
* (java.lang.String, java.lang.String, java.lang.Throwable)}.
*/
@Test
- public void testPropertyExceptionStringFieldThrowable() {
+ void testPropertyExceptionStringFieldThrowable() {
verifyPropertyExceptionStringFieldThrowable(new PropertyInvalidException(PROPERTY, FIELD, THROWABLE));
}
* (java.lang.String, java.lang.String, java.lang.String, java.lang.Throwable)}.
*/
@Test
- public void testPropertyExceptionStringFieldStringThrowable() {
+ void testPropertyExceptionStringFieldStringThrowable() {
verifyPropertyExceptionStringFieldStringThrowable(
new PropertyInvalidException(PROPERTY, FIELD, MESSAGE, THROWABLE));
}
* ONAP Policy Engine - Common Modules
* ================================================================================
* Copyright (C) 2018, 2020 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.
package org.onap.policy.common.utils.properties.exception;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test class for PropertyMissingException.
*/
-public class PropertyMissingExceptionTest extends SupportBasicPropertyExceptionTester {
+class PropertyMissingExceptionTest extends SupportBasicPropertyExceptionTester {
/**
* Test method for
* (java.lang.String, java.lang.String)}.
*/
@Test
- public void testPropertyExceptionStringField() {
+ void testPropertyExceptionStringField() {
verifyPropertyExceptionStringField_AllPopulated(new PropertyMissingException(PROPERTY, FIELD));
verifyPropertyExceptionStringField_NullProperty(new PropertyMissingException(null, FIELD));
verifyPropertyExceptionStringField_NullField(new PropertyMissingException(PROPERTY, null));
* ONAP Policy Engine - Common Modules
* ================================================================================
* Copyright (C) 2018, 2020 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.
package org.onap.policy.common.utils.properties.exception;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Superclass used to test subclasses of {@link PropertyException}.
* ONAP
* ================================================================================
* Copyright (C) 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.
import java.io.IOException;
import java.nio.file.Path;
import org.apache.commons.io.FileUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class DirectoryUtilsTest {
+class DirectoryUtilsTest {
@Test
- public void testCreateTempDirectory() throws IOException {
+ void testCreateTempDirectory() throws IOException {
Path path = DirectoryUtils.createTempDirectory("directoryUtilsTest");
var file = path.toFile();
package org.onap.policy.common.utils.resources;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.FileWriter;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Set;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* The Class ResourceUtilsTest.
*
* @author Liam Fallon (liam.fallon@ericsson.com)
*/
-public class ResourceUtilsTest {
+class ResourceUtilsTest {
private File tmpDir = null;
private File tmpEmptyFile = null;
private File tmpUsedFile = null;
*
* @throws IOException Signals that an I/O exception has occurred.
*/
- @Before
+ @BeforeEach
public void setupResourceUtilsTest() throws IOException {
tmpDir = new File(System.getProperty("java.io.tmpdir"));
tmpEmptyFile = File.createTempFile(this.getClass().getName(), ".tmp");
/**
* Clean resource utils test.
*/
- @After
+ @AfterEach
public void cleanDownResourceUtilsTest() {
assertTrue(tmpEmptyFile.delete());
assertTrue(tmpUsedFile.delete());
* Test get url resource.
*/
@Test
- public void testgetUrlResource() {
+ void testgetUrlResource() {
URL theUrl = ResourceUtils.getUrlResource(tmpDir.getAbsolutePath());
assertNull(theUrl);
* Test get local file.
*/
@Test
- public void testGetLocalFile() {
+ void testGetLocalFile() {
URL theUrl = ResourceUtils.getLocalFile(tmpDir.getAbsolutePath());
assertNotNull(theUrl);
* Test get resource as stream.
*/
@Test
- public void testGetResourceAsStream() throws IOException {
+ void testGetResourceAsStream() throws IOException {
verifyStream(tmpDir.getAbsolutePath());
verifyStream(tmpEmptyFile.getAbsolutePath());
verifyStream(tmpUsedFile.getAbsolutePath());
* Test get resource as string.
*/
@Test
- public void testGetResourceAsString() {
+ void testGetResourceAsString() {
String theString = ResourceUtils.getResourceAsString(tmpDir.getAbsolutePath());
assertNotNull(theString);
}
@Test
- public void testgetUrl4Resource() {
+ void testgetUrl4Resource() {
URL theUrl = ResourceUtils.getUrl4Resource(tmpDir.getAbsolutePath());
assertNotNull(theUrl);
}
@Test
- public void testGetFilePath4Resource() {
+ void testGetFilePath4Resource() {
assertNull(ResourceUtils.getFilePath4Resource(null));
assertEquals("/something/else", ResourceUtils.getFilePath4Resource("/something/else"));
assertTrue(ResourceUtils.getFilePath4Resource("xml/example.xml").endsWith("xml/example.xml"));
}
@Test
- public void testGetDirectoryContents() throws MalformedURLException {
+ void testGetDirectoryContents() throws MalformedURLException {
assertTrue(ResourceUtils.getDirectoryContents(null).isEmpty());
assertTrue(ResourceUtils.getDirectoryContents("idontexist").isEmpty());
assertTrue(ResourceUtils.getDirectoryContents("logback-test.xml").isEmpty());
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2019-2024 Nordix Foundation.
* Modifications Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.common.utils.resources;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import org.apache.commons.io.FileUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test text file utilities.
*
* @author Liam Fallon (liam.fallon@est.tech)
*/
-public class TextFileUtilsTest {
+class TextFileUtilsTest {
private static final String FILE_CONTENT = "This is the contents of a text file";
@Test
- public void testPutToFile() throws IOException {
+ void testPutToFile() throws IOException {
final File tempTextFile = File.createTempFile("Test", ".txt");
tempTextFile.deleteOnExit();
}
@Test
- public void testPutToFileWithNewPath() throws IOException {
+ void testPutToFileWithNewPath() throws IOException {
String tempDirAndFileName = System.getProperty("java.io.tmpdir") + "/non/existant/path/Test.txt";
FileUtils.forceDeleteOnExit(new File(tempDirAndFileName));
}
@Test
- public void testCreateTempFile() throws IOException {
+ void testCreateTempFile() throws IOException {
var file = TextFileUtils.createTempFile("textFileUtilsTest", ".txt");
file.deleteOnExit();
}
@Test
- public void testSetDefaultPermissions() throws IOException {
+ void testSetDefaultPermissions() throws IOException {
var file = new File("target/tempfile.txt");
file.deleteOnExit();
* ONAP
* ================================================================================
* Copyright (C) 2019-2020 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.
package org.onap.policy.common.utils.security;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.security.GeneralSecurityException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
* Unit test for simple App.
*/
-public class CryptoUtilsTest {
+class CryptoUtilsTest {
private static Logger logger = LoggerFactory.getLogger(CryptoUtilsTest.class);
private static final String PASS = "HelloWorld";
private static final String SECRET_KEY = "MTIzNDU2Nzg5MDEyMzQ1Ng==";
private static final String ENCRYPTED_MSG = "original value : {} encrypted value: {}";
@Test
- public void testEncrypt() throws GeneralSecurityException {
+ void testEncrypt() throws GeneralSecurityException {
logger.info("testEncrypt:");
CryptoCoder cryptoUtils = new CryptoUtils(SECRET_KEY);
String encryptedValue = cryptoUtils.encrypt(PASS);
}
@Test
- public void testDecrypt() throws GeneralSecurityException {
+ void testDecrypt() throws GeneralSecurityException {
logger.info("testDecrypt:");
CryptoCoder cryptoUtils = new CryptoUtils(SECRET_KEY);
String decryptedValue = cryptoUtils.decrypt(ENCRYPTED_PASS);
}
@Test
- public void testStaticEncrypt() {
+ void testStaticEncrypt() {
logger.info("testStaticEncrypt:");
String encryptedValue = CryptoUtils.encrypt(PASS, SECRET_KEY);
logger.info(ENCRYPTED_MSG, PASS, encryptedValue);
}
@Test
- public void testStaticDecrypt() {
+ void testStaticDecrypt() {
logger.info("testStaticDecrypt:");
String decryptedValue = CryptoUtils.decrypt(ENCRYPTED_PASS, SECRET_KEY);
logger.info(DECRYPTED_MSG, ENCRYPTED_PASS, decryptedValue);
}
@Test
- public void testBadInputs() {
+ void testBadInputs() {
String badKey = CryptoUtils.encrypt(PASS, "test");
assertEquals(PASS, badKey);
}
@Test
- public void testAll() {
+ void testAll() {
logger.info("testAll:");
String encryptedValue = CryptoUtils.encrypt(PASS, SECRET_KEY);
logger.info(ENCRYPTED_MSG, PASS, encryptedValue);
* ONAP
* ================================================================================
* Copyright (C) 2019 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.
package org.onap.policy.common.utils.services;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
import java.util.function.Predicate;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class FeatureApiUtilsTest {
+class FeatureApiUtilsTest {
private static final String HANDLED = "handled";
private MyPred pred;
/**
* Initializes fields.
*/
- @Before
+ @BeforeEach
public void setUp() {
tried = new LinkedList<>();
errors = new LinkedList<>();
}
@Test
- public void testApplyFeatureTrue() {
+ void testApplyFeatureTrue() {
assertTrue(FeatureApiUtils.apply(Arrays.asList("exceptT0", "falseT1", HANDLED, "falseT2", HANDLED), pred,
(str, ex) -> errors.add(str)));
}
@Test
- public void testApplyFeatureFalse() {
+ void testApplyFeatureFalse() {
List<String> lst = Arrays.asList("falseF1", "exceptF2", "falseF3");
assertFalse(FeatureApiUtils.apply(lst, pred, (str, ex) -> errors.add(str)));
* utils
* ================================================================================
* Copyright (C) 2019 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.
package org.onap.policy.common.utils.services;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class OrderedServiceImplTest {
+class OrderedServiceImplTest {
private static final int HIGH_PRIORITY_NUM = -1000;
private static final int LOW_PRIORITY_NUM = 1000;
/**
* Saves the original state of the ordered service list to restore after each test.
*/
- @BeforeClass
+ @BeforeAll
public static void setup() {
List<GenericService> implementers = GenericService.providers.getList();
highPrioService = implementers.get(0);
/**
* Restores original state after each test.
*/
- @Before
+ @BeforeEach
public void resetOrder() {
highPrioService.setSequenceNumber(HIGH_PRIORITY_NUM);
lowPrioService.setSequenceNumber(LOW_PRIORITY_NUM);
* Tests obtaining a list of service implementers.
*/
@Test
- public void getListTest() {
+ void getListTest() {
List<GenericService> implementers = GenericService.providers.getList();
assertEquals(2, implementers.size());
* with the new order.
*/
@Test
- public void rebuildListInvertedPriorityTest() {
+ void rebuildListInvertedPriorityTest() {
List<GenericService> implementers = GenericService.providers.getList();
assertEquals(2, implementers.size());
* if the priorities are equivalent.
*/
@Test
- public void rebuildListEqualPriorityTest() {
+ void rebuildListEqualPriorityTest() {
List<GenericService> implementers = GenericService.providers.getList();
assertEquals(2, implementers.size());
* ONAP
* ================================================================================
* Copyright (C) 2019 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.
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class RegistryTest {
+class RegistryTest {
private static final String UNKNOWN = "unknown";
private static final String NAME_STR = "name-string";
private static final String NAME_OBJ = "name-object";
/**
* Set up.
*/
- @Before
+ @BeforeEach
public void setUp() {
Registry.newRegistry();
/**
* Ensure the registry is left empty when done.
*/
- @AfterClass
+ @AfterAll
public static void tearDownAfterClass() {
Registry.newRegistry();
}
* Sunny day scenario is tested by other tests, so we focus on exceptions here.
*/
@Test
- public void testRegister_Ex() {
+ void testRegister_Ex() {
assertThatIllegalStateException().isThrownBy(() -> Registry.register(NAME_STR, DATA_STR));
assertThatIllegalArgumentException().isThrownBy(() -> Registry.register(null, DATA_STR));
}
@Test
- public void testRegisterOrReplace() {
+ void testRegisterOrReplace() {
// should be able to replace
Registry.registerOrReplace(NAME_STR, DATA_STR);
Registry.registerOrReplace(NAME_STR, DATA_STR);
}
@Test
- public void testUnregister() {
+ void testUnregister() {
assertTrue(Registry.unregister(NAME_STR));
- assertEquals(null, Registry.getOrDefault(NAME_STR, String.class, null));
+ assertNull(Registry.getOrDefault(NAME_STR, String.class, null));
assertFalse(Registry.unregister(NAME_STR));
}
@Test
- public void testGet() {
+ void testGet() {
assertSame(DATA_STR, Registry.get(NAME_STR, String.class));
assertSame(DATA_OBJ, Registry.get(NAME_OBJ, Object.class));
assertSame(DATA_INT, Registry.get(NAME_INT, Integer.class));
}
@Test
- public void testGetOrDefault() {
+ void testGetOrDefault() {
assertSame(DATA_STR, Registry.getOrDefault(NAME_STR, String.class, null));
assertSame(DATA_OBJ, Registry.getOrDefault(NAME_OBJ, Object.class, "xyz"));
assertSame(DATA_INT, Registry.getOrDefault(NAME_INT, Integer.class, 10));
- assertEquals(null, Registry.getOrDefault(UNKNOWN, String.class, null));
+ assertNull(Registry.getOrDefault(UNKNOWN, String.class, null));
assertEquals("abc", Registry.getOrDefault(UNKNOWN, String.class, "abc"));
assertEquals(Integer.valueOf(11), Registry.getOrDefault(UNKNOWN, Integer.class, 11));
}
@Test
- public void testNewRegistry() {
+ void testNewRegistry() {
assertSame(DATA_STR, Registry.get(NAME_STR, String.class));
Registry.newRegistry();
// should not exist
- assertEquals(null, Registry.getOrDefault(NAME_STR, String.class, null));
+ assertNull(Registry.getOrDefault(NAME_STR, String.class, null));
// should be able to register it again now
Registry.register(NAME_STR, DATA_STR);
* ONAP
* ================================================================================
* Copyright (C) 2019 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.
package org.onap.policy.common.utils.services;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.capabilities.Startable;
import org.onap.policy.common.utils.services.ServiceManager.RunnableWithEx;
-public class ServiceManagerContainerTest {
+class ServiceManagerContainerTest {
private static final String MY_NAME = "my-name";
private static final String MY_ACTION = "my-action";
private static final String MY_OBJECT = "my-object";
/**
* Set up.
*/
- @Before
+ @BeforeEach
public void setUp() {
starter = mock(RunnableWithEx.class);
stopper = mock(RunnableWithEx.class);
}
@Test
- public void testServiceManagerContainer() throws Exception {
+ void testServiceManagerContainer() throws Exception {
// use no-arg constructor
cont = new MyCont();
assertEquals("service manager", cont.getName());
}
@Test
- public void test() throws Exception {
+ void test() throws Exception {
assertEquals(MY_NAME, cont.getName());
assertFalse(cont.isAlive());
}
@Test
- public void testShutdown() throws Exception {
+ void testShutdown() throws Exception {
cont.start();
cont.shutdown();
assertFalse(cont.isAlive());
* ONAP
* ================================================================================
* Copyright (C) 2019 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.
package org.onap.policy.common.utils.services;
-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.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class ServiceManagerExceptionTest {
+class ServiceManagerExceptionTest {
private ServiceManagerException sme;
@Test
- public void testServiceManagerException() {
+ void testServiceManagerException() {
sme = new ServiceManagerException();
assertNull(sme.getMessage());
assertNull(sme.getCause());
}
@Test
- public void testServiceManagerExceptionString() {
+ void testServiceManagerExceptionString() {
sme = new ServiceManagerException("hello");
assertEquals("hello", sme.getMessage());
assertNull(sme.getCause());
}
@Test
- public void testServiceManagerExceptionThrowable() {
+ void testServiceManagerExceptionThrowable() {
Throwable thrown = new Throwable("expected exception");
sme = new ServiceManagerException(thrown);
assertNotNull(sme.getMessage());
}
@Test
- public void testServiceManagerExceptionStringThrowable() {
+ void testServiceManagerExceptionStringThrowable() {
Throwable thrown = new Throwable("another expected exception");
sme = new ServiceManagerException("world", thrown);
assertEquals("world", sme.getMessage());
* ONAP
* ================================================================================
* Copyright (C) 2019 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.
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import java.util.Arrays;
import java.util.LinkedList;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.capabilities.Startable;
import org.onap.policy.common.utils.services.ServiceManager.RunnableWithEx;
-public class ServiceManagerTest {
+class ServiceManagerTest {
private static final String MY_NAME = "my-name";
private static final String ALREADY_RUNNING = MY_NAME + " is already running";
private static final String EXPECTED_EXCEPTION = "expected exception";
/**
* Initializes {@link #svcmgr}.
*/
- @Before
+ @BeforeEach
public void setUp() {
svcmgr = new ServiceManager(MY_NAME);
}
@Test
- public void testServiceName() {
+ void testServiceName() {
assertEquals("service manager", new ServiceManager().getName());
}
@Test
- public void testGetName() {
+ void testGetName() {
assertEquals(MY_NAME, svcmgr.getName());
}
@Test
- public void testAddAction() throws Exception {
+ void testAddAction() throws Exception {
RunnableWithEx start1 = mock(RunnableWithEx.class);
RunnableWithEx stop1 = mock(RunnableWithEx.class);
svcmgr.addAction("first action", start1, stop1);
}
@Test
- public void testAddStartable() {
+ void testAddStartable() {
Startable start1 = mock(Startable.class);
svcmgr.addService("first startable", start1);
}
@Test
- public void testStart() {
+ void testStart() {
Startable start1 = mock(Startable.class);
svcmgr.addService("test start", start1);
}
@Test
- public void testStart_Ex() {
+ void testStart_Ex() {
Startable start1 = mock(Startable.class);
svcmgr.addService("test start ex", start1);
}
@Test
- public void testStart_RewindEx() {
+ void testStart_RewindEx() {
Startable start1 = mock(Startable.class);
svcmgr.addService("test start rewind", start1);
}
@Test
- public void testStop() {
+ void testStop() {
Startable start1 = mock(Startable.class);
svcmgr.addService("first stop", start1);
}
@Test
- public void testStop_Ex() throws Exception {
+ void testStop_Ex() throws Exception {
RunnableWithEx start1 = mock(RunnableWithEx.class);
RunnableWithEx stop1 = mock(RunnableWithEx.class);
svcmgr.addAction("first stop ex", start1, stop1);
}
@Test
- public void testShutdown() {
+ void testShutdown() {
Startable start1 = mock(Startable.class);
svcmgr.addService("first stop", start1);
}
@Test
- public void testRewind() {
+ void testRewind() {
RunnableWithEx starter = mock(RunnableWithEx.class);
LinkedList<String> lst = new LinkedList<>();
* Common Utils
* ================================================================================
* Copyright (C) 2018 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.
package org.onap.policy.common.utils.time;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class CurrentTimeTest {
+class CurrentTimeTest {
@Test
- public void testGetMillis() {
+ void testGetMillis() {
long tcur = System.currentTimeMillis();
long tval = new CurrentTime().getMillis();
long tval2 = new CurrentTime().getMillis();
}
@Test
- public void testGetDate() {
+ void testGetDate() {
long tcur = System.currentTimeMillis();
long tval = new CurrentTime().getDate().getTime();
long tval2 = new CurrentTime().getDate().getTime();
}
@Test
- public void testSleep() throws Exception {
+ void testSleep() throws Exception {
long tcur = System.currentTimeMillis();
new CurrentTime().sleep(10);
long tend = System.currentTimeMillis();
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2024 Nordix Foundation.
* Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.common.utils.validation;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* The Class ResourceUtilsTest.
*
* @author Liam Fallon (liam.fallon@ericsson.com)
*/
-public class AssertionsTest {
+class AssertionsTest {
private static final String HELLO = "Hello";
private static final String IT_IS_OK = "it is OK";
private static final String IT_IS_NULL = "it is null";
private static final String IT_IS_FALSE = "it is false";
@Test
- public void testAssertions() {
+ void testAssertions() {
Assertions.argumentNotFalse(true, IT_IS_TRUE);
assertThatIllegalArgumentException().isThrownBy(() -> Assertions.argumentNotFalse(false, IT_IS_FALSE))
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
* Modifications Copyright (C) 2020 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.
package org.onap.policy.common.utils.validation;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Class to perform unit test of ParameterValidationUtils.
*
* @author Ram Krishna Verma (ram.krishna.verma@ericsson.com)
*/
-public class TestParameterValidationUtils {
+class TestParameterValidationUtils {
@Test
- public void testValidateStringParameter() {
+ void testValidateStringParameter() {
assertTrue(ParameterValidationUtils.validateStringParameter("Policy"));
assertFalse(ParameterValidationUtils.validateStringParameter(null));
assertFalse(ParameterValidationUtils.validateStringParameter(""));
}
@Test
- public void testValidateIntParameter() {
+ void testValidateIntParameter() {
assertTrue(ParameterValidationUtils.validateIntParameter(5555));
assertTrue(ParameterValidationUtils.validateIntParameter(Integer.valueOf(7777)));
assertFalse(ParameterValidationUtils.validateIntParameter(0));
}
@Test
- public void testValidateLongParameter() {
+ void testValidateLongParameter() {
assertTrue(ParameterValidationUtils.validateLongParameter(5555L));
assertTrue(ParameterValidationUtils.validateLongParameter(Long.valueOf(7777L)));
assertFalse(ParameterValidationUtils.validateLongParameter(0L));
* ONAP PAP
* ================================================================================
* Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-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.
package org.onap.policy.common.utils.validation;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class VersionTest {
+class VersionTest {
private static final String TYPE = "my-type";
private static final String NAME = "my-name";
private Version vers;
- @Before
+ @BeforeEach
public void setUp() {
vers = new Version(MAJOR, MINOR, PATCH);
}
@Test
- public void testHashCode() {
+ void testHashCode() {
int hash = vers.hashCode();
int hash2 = new Version(MAJOR, MINOR, PATCH + 1).hashCode();
assertNotEquals(hash, hash2);
}
@Test
- public void testMakeVersion() {
+ void testMakeVersion() {
assertEquals("9.8.7", Version.makeVersion(TYPE, NAME, "9.8.7").toString());
assertEquals("9.0.0", Version.makeVersion(TYPE, NAME, "9").toString());
}
@Test
- public void testNewVersion() {
+ void testNewVersion() {
vers = vers.newVersion();
assertEquals("11.0.0", vers.toString());
}
@Test
- public void testEquals() {
- assertNotEquals(vers, null);
+ void testEquals() {
+ assertNotEquals(null, vers);
assertNotEquals(vers, new Object());
assertEquals(vers, vers);
}
@Test
- public void testCompareTo() {
+ void testCompareTo() {
vers = new Version(101, 201, 301);
// equals case
}
@Test
- public void testToString() {
+ void testToString() {
assertEquals("10.2.3", vers.toString());
}
@Test
- public void testGetMajor() {
+ void testGetMajor() {
assertEquals(MAJOR, vers.getMajor());
}
@Test
- public void testGetMinor() {
+ void testGetMinor() {
assertEquals(MINOR, vers.getMinor());
}
@Test
- public void testGetPatch() {
+ void testGetPatch() {
assertEquals(PATCH, vers.getPatch());
}
@Test
- public void testVersionIntIntInt() {
+ void testVersionIntIntInt() {
assertEquals("5.6.7", new Version(5, 6, 7).toString());
}
@Test
- public void testVersion() {
+ void testVersion() {
assertEquals("0.0.0", new Version().toString());
}
}
Code Review / policy / common.git / commitdiff