Code Review
/
policy
/
models.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix some sonars in policy-models
[policy/models.git]
/
models-interactions
/
model-impl
/
sdc
/
src
/
test
/
java
/
org
/
onap
/
policy
/
sdc
/
ServiceTest.java
diff --git
a/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceTest.java
b/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceTest.java
index
dc5d9d3
..
1e6c6f9
100644
(file)
--- a/
models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceTest.java
+++ b/
models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceTest.java
@@
-2,7
+2,7
@@
* ============LICENSE_START=======================================================
* sdc
* ================================================================================
* ============LICENSE_START=======================================================
* sdc
* ================================================================================
- * Copyright (C) 2017-20
19
AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-20
20
AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019-2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* Modifications Copyright (C) 2019-2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-22,10
+22,8
@@
package org.onap.policy.sdc;
import static org.junit.Assert.assertEquals;
package org.onap.policy.sdc;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import java.util.UUID;
import java.util.UUID;
-
import org.junit.Test;
public class ServiceTest {
import org.junit.Test;
public class ServiceTest {
@@
-36,23
+34,23
@@
public class ServiceTest {
@Test
public void testConstructors() {
Service svc = new Service();
@Test
public void testConstructors() {
Service svc = new Service();
- assertEquals(null, svc.getServiceU
uid
());
- assertEquals(null, svc.getServiceInvariantU
uid
());
+ assertEquals(null, svc.getServiceU
UID
());
+ assertEquals(null, svc.getServiceInvariantU
UID
());
assertEquals(null, svc.getServiceName());
assertEquals(null, svc.getServiceVersion());
UUID uuid = UUID.randomUUID();
svc = new Service(uuid);
assertEquals(null, svc.getServiceName());
assertEquals(null, svc.getServiceVersion());
UUID uuid = UUID.randomUUID();
svc = new Service(uuid);
- assertEquals(uuid, svc.getServiceU
uid
());
- assertEquals(null, svc.getServiceInvariantU
uid
());
+ assertEquals(uuid, svc.getServiceU
UID
());
+ assertEquals(null, svc.getServiceInvariantU
UID
());
assertEquals(null, svc.getServiceName());
assertEquals(null, svc.getServiceVersion());
String name = "constTest";
svc = new Service(name);
assertEquals(null, svc.getServiceName());
assertEquals(null, svc.getServiceVersion());
String name = "constTest";
svc = new Service(name);
- assertEquals(null, svc.getServiceU
uid
());
+ assertEquals(null, svc.getServiceU
UID
());
assertEquals(name, svc.getServiceName());
assertEquals(name, svc.getServiceName());
- assertEquals(null, svc.getServiceInvariantU
uid
());
+ assertEquals(null, svc.getServiceInvariantU
UID
());
assertEquals(null, svc.getServiceVersion());
uuid = UUID.randomUUID();
assertEquals(null, svc.getServiceVersion());
uuid = UUID.randomUUID();
@@
-60,14
+58,14
@@
public class ServiceTest {
name = "constTestUUID";
String version = "0.0.1";
svc = new Service(uuid, uuidInvariant, name, version);
name = "constTestUUID";
String version = "0.0.1";
svc = new Service(uuid, uuidInvariant, name, version);
- assertEquals(uuid, svc.getServiceU
uid
());
- assertEquals(uuidInvariant, svc.getServiceInvariantU
uid
());
+ assertEquals(uuid, svc.getServiceU
UID
());
+ assertEquals(uuidInvariant, svc.getServiceInvariantU
UID
());
assertEquals(name, svc.getServiceName());
assertEquals(version, svc.getServiceVersion());
Service s2 = new Service(svc);
assertEquals(name, svc.getServiceName());
assertEquals(version, svc.getServiceVersion());
Service s2 = new Service(svc);
- assertEquals(uuid, s2.getServiceU
uid
());
- assertEquals(uuidInvariant, s2.getServiceInvariantU
uid
());
+ assertEquals(uuid, s2.getServiceU
UID
());
+ assertEquals(uuidInvariant, s2.getServiceInvariantU
UID
());
assertEquals(name, s2.getServiceName());
assertEquals(version, s2.getServiceVersion());
}
assertEquals(name, s2.getServiceName());
assertEquals(version, s2.getServiceVersion());
}
@@
-76,16
+74,16
@@
public class ServiceTest {
public void testUuid() {
Service svc = new Service();
UUID uuid = UUID.randomUUID();
public void testUuid() {
Service svc = new Service();
UUID uuid = UUID.randomUUID();
- svc.setServiceU
uid
(uuid);
- assertEquals(uuid, svc.getServiceU
uid
());
+ svc.setServiceU
UID
(uuid);
+ assertEquals(uuid, svc.getServiceU
UID
());
}
@Test
public void testInvariantUuid() {
Service svc = new Service();
UUID uuid = UUID.randomUUID();
}
@Test
public void testInvariantUuid() {
Service svc = new Service();
UUID uuid = UUID.randomUUID();
- svc.setServiceInvariantU
uid
(uuid);
- assertEquals(uuid, svc.getServiceInvariantU
uid
());
+ svc.setServiceInvariantU
UID
(uuid);
+ assertEquals(uuid, svc.getServiceInvariantU
UID
());
}
@Test
}
@Test
@@
-108,13
+106,13
@@
public class ServiceTest {
public void testEquals() {
Service s1 = new Service();
Service s2 = new Service(s1);
public void testEquals() {
Service s1 = new Service();
Service s2 = new Service(s1);
- assert
True(s1.equals(s2)
);
- assert
True(s2.equals(s1)
);
+ assert
Equals(s1, s2
);
+ assert
Equals(s2, s1
);
s1 = new Service(UUID.randomUUID(), UUID.randomUUID(), EQUALS_TEST, VERSION_111);
s2 = new Service(s1);
s1 = new Service(UUID.randomUUID(), UUID.randomUUID(), EQUALS_TEST, VERSION_111);
s2 = new Service(s1);
- assert
True(s1.equals(s2)
);
- assert
True(s2.equals(s1)
);
+ assert
Equals(s1, s2
);
+ assert
Equals(s2, s1
);
}
@Test
}
@Test