aboutsummaryrefslogtreecommitdiffstats
path: root/model/context-model
diff options
context:
space:
mode:
authorRam Krishna Verma <ram.krishna.verma@est.tech>2019-06-27 19:12:16 +0000
committerGerrit Code Review <gerrit@onap.org>2019-06-27 19:12:16 +0000
commit9520a45c23ef2d0dc3130b0b885800a9df911fd7 (patch)
tree2a6bda338c0ed599e41b158af34c2d283e688972 /model/context-model
parentce9d82d2c0e863597d84cc8909955e398405f45a (diff)
parentfad6fa4890538fe8f4cbb96ae3fb0be6767d28d1 (diff)
Merge "Fix Sonar/Checkstyle issues in apex-pdp"
Diffstat (limited to 'model/context-model')
-rw-r--r--model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java13
-rw-r--r--model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java3
2 files changed, 9 insertions, 7 deletions
diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java
index eb0db0da7..d0d994a05 100644
--- a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java
+++ b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java
@@ -1,19 +1,20 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2019 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=========================================================
*/
@@ -36,7 +37,7 @@ import org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbums;
/**
* Context album tests.
- *
+ *
* @author Liam Fallon (liam.fallon@ericsson.com)
*/
public class ContextAlbumsTest {
@@ -125,7 +126,7 @@ public class ContextAlbumsTest {
assertTrue(album.equals(album));
assertTrue(album.equals(clonedAlbum));
assertFalse(album.equals(null));
- assertFalse(album.equals("Hello"));
+ assertFalse(album.equals((Object)"Hello"));
assertFalse(album.equals(new AxContextAlbum(new AxArtifactKey(), "Scope", false, AxArtifactKey.getNullKey())));
assertFalse(album.equals(new AxContextAlbum(newKey, "Scope", false, AxArtifactKey.getNullKey())));
assertFalse(album.equals(new AxContextAlbum(newKey, "NewAlbumScope", false, AxArtifactKey.getNullKey())));
@@ -192,7 +193,7 @@ public class ContextAlbumsTest {
assertTrue(albums.equals(albums));
assertTrue(albums.equals(clonedAlbums));
assertFalse(albums.equals(null));
- assertFalse(albums.equals("Hello"));
+ assertFalse(albums.equals((Object)"Hello"));
assertFalse(albums.equals(new AxContextAlbums(new AxArtifactKey())));
assertEquals(0, albums.compareTo(albums));
diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java
index fbf97881f..d2a4bc53a 100644
--- a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java
+++ b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java
@@ -1,6 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -66,7 +67,7 @@ public class ContextModelTest {
assertTrue(model.equals(model));
assertTrue(model.equals(clonedModel));
- assertFalse(model.equals("Hello"));
+ assertFalse(model.equals((Object)"Hello"));
assertFalse(model.equals(new AxContextModel(new AxArtifactKey())));
assertFalse(model.equals(new AxContextModel(new AxArtifactKey(), new AxContextSchemas(), new AxContextAlbums(),
new AxKeyInformation())));