X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-data-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fimpl%2Fcodecs%2FStringPatternCheckingCodecTest.java;h=4cf56becb503188523168ebf5c74595c5caede50;hb=42b62f098cbabbc286c3a506494c5e280f6c365b;hp=39ea19159402d50d40b3130c0f5379bf7ae4417a;hpb=891817dd764184f4986e9f2f3ad7c29af55a9249;p=yangtools.git diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/StringPatternCheckingCodecTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/StringPatternCheckingCodecTest.java index 39ea191594..4cf56becb5 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/StringPatternCheckingCodecTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/StringPatternCheckingCodecTest.java @@ -10,13 +10,10 @@ package org.opendaylight.yangtools.yang.data.impl.codecs; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.opendaylight.yangtools.yang.data.impl.codecs.TypeDefinitionAwareCodecTestHelper.getCodec; -import java.io.FileNotFoundException; import java.net.URI; -import java.net.URISyntaxException; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; @@ -25,7 +22,6 @@ import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,8 +31,7 @@ public class StringPatternCheckingCodecTest { private static final Logger LOG = LoggerFactory.getLogger(StringPatternCheckingCodecTest.class); @Test - public void testStringPatternCheckingCodec() throws ReactorException, URISyntaxException, - FileNotFoundException { + public void testStringPatternCheckingCodec() { final SchemaContext schemaContext = YangParserTestUtils.parseYangResource( "/string-pattern-checking-codec-test.yang"); assertNotNull(schemaContext); @@ -61,9 +56,8 @@ public class StringPatternCheckingCodecTest { codec.deserialize("abcd"); fail("Exception should have been thrown."); } catch (final IllegalArgumentException ex) { - LOG.debug("IllegalArgumentException was thrown as expected: {}", ex); - assertTrue(ex.getMessage().contains( - "Supplied value does not match the regular expression ^[A-Z]+$. [abcd]")); + LOG.debug("IllegalArgumentException was thrown as expected", ex); + assertEquals("Supplied value does not match the regular expression ^(?:[A-Z]+)$.", ex.getMessage()); } } }