diff options
Diffstat (limited to 'models-pdp/src/test')
3 files changed, 16 insertions, 89 deletions
diff --git a/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyIdent.java b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyIdent.java index 4cd5570e2..da942468a 100644 --- a/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyIdent.java +++ b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyIdent.java @@ -22,11 +22,8 @@ package org.onap.policy.models.pdp.concepts; 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 org.junit.Test; -import org.onap.policy.models.base.PfValidationResult; /** * Test the other constructors, as {@link TestModels} tests the other methods. @@ -62,29 +59,4 @@ public class TestPolicyIdent extends IdentTestBase<PolicyIdent> { orig = new PolicyIdent(NAME, VERSION); assertEquals(orig.toString(), new PolicyIdent(orig).toString()); } - - @Test - public void testValidate() throws Exception { - assertTrue(makeIdent(NAME, VERSION).validate(new PfValidationResult()).isValid()); - - // everything is null - PfValidationResult result = makeIdent(null, null).validate(new PfValidationResult()); - assertFalse(result.isValid()); - assertEquals(2, result.getMessageList().size()); - - // name is null - result = makeIdent(null, VERSION).validate(new PfValidationResult()); - assertFalse(result.isValid()); - assertEquals(1, result.getMessageList().size()); - - // version is null - result = makeIdent(NAME, null).validate(new PfValidationResult()); - assertFalse(result.isValid()); - assertEquals(1, result.getMessageList().size()); - - // version is invalid - result = makeIdent(NAME, "!!!" + VERSION).validate(new PfValidationResult()); - assertFalse(result.isValid()); - assertEquals(1, result.getMessageList().size()); - } } diff --git a/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyIdentOptVersion.java b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyIdentOptVersion.java index 3428ac1be..6ae7ad32b 100644 --- a/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyIdentOptVersion.java +++ b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyIdentOptVersion.java @@ -26,7 +26,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.onap.policy.models.base.PfValidationResult; /** * Test the other constructors, as {@link TestModels} tests the other methods. @@ -40,6 +39,22 @@ public class TestPolicyIdentOptVersion extends IdentTestBase<PolicyIdentOptVersi } @Test + public void testAllArgsConstructor_testIsNullVersion() { + assertThatThrownBy(() -> new PolicyIdentOptVersion(null, VERSION)).isInstanceOf(NullPointerException.class); + + // with null version + PolicyIdentOptVersion orig = new PolicyIdentOptVersion(NAME, null); + assertEquals(NAME, orig.getName()); + assertEquals(null, orig.getVersion()); + assertTrue(orig.isNullVersion()); + + orig = new PolicyIdentOptVersion(NAME, VERSION); + assertEquals(NAME, orig.getName()); + assertEquals(VERSION, orig.getVersion()); + assertFalse(orig.isNullVersion()); + } + + @Test public void testCopyConstructor() throws Exception { assertThatThrownBy(() -> new PolicyIdentOptVersion(null)).isInstanceOf(NullPointerException.class); @@ -52,36 +67,4 @@ public class TestPolicyIdentOptVersion extends IdentTestBase<PolicyIdentOptVersi orig = makeIdent(NAME, VERSION); assertEquals(orig.toString(), new PolicyIdentOptVersion(orig).toString()); } - - @Test - public void testValidate() throws Exception { - assertThatThrownBy(() -> makeIdent(NAME, VERSION).validate(null)).isInstanceOf(NullPointerException.class); - assertTrue(makeIdent(NAME, VERSION).validate(new PfValidationResult()).isValid()); - assertTrue(makeIdent(NAME, null).validate(new PfValidationResult()).isValid()); - - // everything is null - PfValidationResult result = makeIdent(null, null).validate(new PfValidationResult()); - assertFalse(result.isValid()); - assertEquals(1, result.getMessageList().size()); - - // name is null - result = makeIdent(null, VERSION).validate(new PfValidationResult()); - assertFalse(result.isValid()); - assertEquals(1, result.getMessageList().size()); - - // name is null, version is invalid - result = makeIdent(null, "$$$" + VERSION).validate(new PfValidationResult()); - assertFalse(result.isValid()); - assertEquals(2, result.getMessageList().size()); - - // name is invalid - result = makeIdent("!!!invalid name$$$", VERSION).validate(new PfValidationResult()); - assertFalse(result.isValid()); - assertEquals(1, result.getMessageList().size()); - - // version is invalid - result = makeIdent(NAME, "!!!" + VERSION).validate(new PfValidationResult()); - assertFalse(result.isValid()); - assertEquals(1, result.getMessageList().size()); - } } diff --git a/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyTypeIdent.java b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyTypeIdent.java index 5b7494ebf..9247544fd 100644 --- a/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyTypeIdent.java +++ b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/TestPolicyTypeIdent.java @@ -22,11 +22,8 @@ package org.onap.policy.models.pdp.concepts; 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 org.junit.Test; -import org.onap.policy.models.base.PfValidationResult; /** * Test the other constructors, as {@link TestModels} tests the other methods. @@ -63,29 +60,4 @@ public class TestPolicyTypeIdent extends IdentTestBase<PolicyTypeIdent> { assertEquals(orig.toString(), new PolicyTypeIdent(orig).toString()); } - @Test - public void testValidate() throws Exception { - assertTrue(makeIdent(NAME, VERSION).validate(new PfValidationResult()).isValid()); - - // everything is null - PfValidationResult result = makeIdent(null, null).validate(new PfValidationResult()); - assertFalse(result.isValid()); - assertEquals(2, result.getMessageList().size()); - - // name is null - result = makeIdent(null, VERSION).validate(new PfValidationResult()); - assertFalse(result.isValid()); - assertEquals(1, result.getMessageList().size()); - - // version is null - result = makeIdent(NAME, null).validate(new PfValidationResult()); - assertFalse(result.isValid()); - assertEquals(1, result.getMessageList().size()); - - // version is invalid - result = makeIdent(NAME, "!!!" + VERSION).validate(new PfValidationResult()); - assertFalse(result.isValid()); - assertEquals(1, result.getMessageList().size()); - } - } |