Clean up PatternConstraint's String confusion

[yangtools.git] / yang / yang-model-util / src / test / java / org / opendaylight / yangtools / yang / model / util / PatternConstraintImplTest.java

diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/PatternConstraintImplTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/PatternConstraintImplTest.java
index dadeb1a79367f210698b4b83f9053a089ebdeda3..b475e8243c794bb910080db96ee7b1b21759f8c1 100644 (file)
--- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/PatternConstraintImplTest.java
+++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/PatternConstraintImplTest.java
@@ -33,13 +33,12 @@ public class PatternConstraintImplTest {
         final PatternConstraintImpl patternConstraint5 = new PatternConstraintImpl(regexExp2, description2, reference2);
 
         assertNotNull("Object of PatternConstraintImpl shouldn't be null.", patternConstraint);
-        assertEquals("Description should be 'test description'.", "test description",
+        assertEquals("Description should be 'test description'.", Optional.of("test description"),
                 patternConstraint.getDescription());
-        assertEquals("Error app tag shouldn't be null.", "invalid-regular-expression",
-                patternConstraint.getErrorAppTag());
-        assertNotNull(patternConstraint.getErrorMessage());
-        assertEquals("Reference should be equals 'RFC 6020'.", "RFC 6020", patternConstraint.getReference());
-        assertEquals("Regular expression should be equls '\\D'.", "\\D", patternConstraint.getRegularExpression());
+        assertEquals(Optional.of("invalid-regular-expression"), patternConstraint.getErrorAppTag());
+        assertTrue(patternConstraint.getErrorMessage().isPresent());
+        assertEquals(Optional.of("RFC 6020"), patternConstraint.getReference());
+        assertEquals("Regular expression should be equls '\\D'.", "\\D", patternConstraint.getJavaPatternString());
         assertNotEquals("Hash codes shouldn't be equals.", patternConstraint.hashCode(), patternConstraint2.hashCode());
         assertFalse("String representation shouldn't be empty.", patternConstraint.toString().isEmpty());