aboutsummaryrefslogtreecommitdiffstats
path: root/auth
diff options
context:
space:
mode:
authorLiam Fallon <liam.fallon@est.tech>2020-07-13 11:36:59 +0000
committerGerrit Code Review <gerrit@onap.org>2020-07-13 11:36:59 +0000
commit2a2d8564fc10258cd7f9b402c4622d7f55688e55 (patch)
tree1d8debea4d955805193208f32d0c06e8f16f3ac9 /auth
parent3b1c78af2c59867d422a29ea4ff325ba25fea4cc (diff)
parent5f64a68614acdc83f8dbc73df7700d63175ca9be (diff)
Merge "Fix assertTrue SONAR issues in apex-pdp"
Diffstat (limited to 'auth')
-rw-r--r--auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/CommandLineCommandTest.java11
-rw-r--r--auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorScriptingTest.java8
-rw-r--r--auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/ContextAlbumsTest.java10
-rw-r--r--auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/FileMacroTest.java3
-rw-r--r--auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/LogicBlockTest.java13
5 files changed, 22 insertions, 23 deletions
diff --git a/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/CommandLineCommandTest.java b/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/CommandLineCommandTest.java
index 5c541e14a..f05757fc8 100644
--- a/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/CommandLineCommandTest.java
+++ b/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/CommandLineCommandTest.java
@@ -21,7 +21,6 @@
package org.onap.policy.apex.auth.clieditor;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
@@ -127,13 +126,13 @@ public class CommandLineCommandTest {
@Test
public void testEquals() {
- assertFalse(commandLineCommand.equals(new Object()));
- assertTrue(commandLineCommand.equals(commandLineCommand));
- assertFalse(commandLineCommand.equals(null));
+ assertNotEquals(commandLineCommand, new Object());
+ assertEquals(commandLineCommand, commandLineCommand);
+ assertNotEquals(commandLineCommand, null);
CommandLineCommand otherCommand = new CommandLineCommand();
- assertTrue(commandLineCommand.equals(otherCommand));
+ assertEquals(commandLineCommand, otherCommand);
otherCommand.getKeywordlist().add("TestKeyword");
- assertFalse(commandLineCommand.equals(otherCommand));
+ assertNotEquals(commandLineCommand, otherCommand);
}
}
diff --git a/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorScriptingTest.java b/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorScriptingTest.java
index c863461ef..b41cd49b2 100644
--- a/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorScriptingTest.java
+++ b/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorScriptingTest.java
@@ -1,7 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -106,9 +106,9 @@ public class CommandLineEditorScriptingTest {
compareModel.getKeyInformation().getKeyInfoMap().clear();
compareNoAlbumsModel.getKeyInformation().getKeyInfoMap().clear();
- assertTrue(writtenModel.equals(compareModel));
- assertTrue(writtenModel.equals(compareNoAlbumsModel));
- assertTrue(compareModel.equals(compareNoAlbumsModel));
+ assertEquals(writtenModel, compareModel);
+ assertEquals(writtenModel, compareNoAlbumsModel);
+ assertEquals(compareModel, compareNoAlbumsModel);
}
/**
diff --git a/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/ContextAlbumsTest.java b/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/ContextAlbumsTest.java
index f82453b95..db44bbb9a 100644
--- a/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/ContextAlbumsTest.java
+++ b/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/ContextAlbumsTest.java
@@ -1,19 +1,20 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -22,7 +23,6 @@ package org.onap.policy.apex.auth.clieditor;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
@@ -91,6 +91,6 @@ public class ContextAlbumsTest {
writtenModel.getKeyInformation().getKeyInfoMap().clear();
compareModel.getKeyInformation().getKeyInfoMap().clear();
- assertTrue(writtenModel.equals(compareModel));
+ assertEquals(writtenModel, compareModel);
}
}
diff --git a/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/FileMacroTest.java b/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/FileMacroTest.java
index 44bdc798a..7acf2ab89 100644
--- a/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/FileMacroTest.java
+++ b/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/FileMacroTest.java
@@ -22,7 +22,6 @@
package org.onap.policy.apex.auth.clieditor;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
@@ -95,7 +94,7 @@ public class FileMacroTest {
writtenModel.getKeyInformation().getKeyInfoMap().clear();
compareModel.getKeyInformation().getKeyInfoMap().clear();
- assertTrue(writtenModel.equals(compareModel));
+ assertEquals(writtenModel, compareModel);
// The output event is in this file
final File outputLogFile = new File(tempLogFile.getCanonicalPath());
diff --git a/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/LogicBlockTest.java b/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/LogicBlockTest.java
index caaa12925..702013945 100644
--- a/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/LogicBlockTest.java
+++ b/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/LogicBlockTest.java
@@ -1,26 +1,27 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
package org.onap.policy.apex.auth.clieditor;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
import java.io.File;
import java.io.IOException;
@@ -95,7 +96,7 @@ public class LogicBlockTest {
writtenModel.getKeyInformation().getKeyInfoMap().clear();
compareModel.getKeyInformation().getKeyInfoMap().clear();
- assertTrue(writtenModel.equals(compareModel));
+ assertEquals(writtenModel, compareModel);
}
/**
@@ -123,6 +124,6 @@ public class LogicBlockTest {
writtenModel.getKeyInformation().getKeyInfoMap().clear();
compareModel.getKeyInformation().getKeyInfoMap().clear();
- assertTrue(writtenModel.equals(compareModel));
+ assertEquals(writtenModel, compareModel);
}
}