BUG-4688: update Revision design a bit more

[yangtools.git] / yang / yang-parser-impl / src / test / java / org / opendaylight / yangtools / yang / stmt / Bug6491Test.java

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6491Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6491Test.java
index a8575b197cfe3bb2d2a94485ea4b32cc755784a8..eec7984dca03dc232a3e904a1de42545307d7e23 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6491Test.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6491Test.java
@@ -9,35 +9,28 @@ package org.opendaylight.yangtools.yang.stmt;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil.getRevisionFormat;
 
-import java.text.ParseException;
-import java.util.Date;
+import java.util.Optional;
 import java.util.Set;
-import org.junit.Before;
 import org.junit.Test;
+import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.ModuleImport;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 public class Bug6491Test {
-    private Date date;
-
-    @Before
-    public void setup() throws ParseException {
-        date = getRevisionFormat().parse("2016-01-01");
-    }
+    private static final Revision DATE = Revision.of("2016-01-01");
 
     @Test
     public void tetststs() throws Exception {
-        testRevision("withoutRevision", null, null);
-        testRevision("withRevision", date, date);
-        testRevision("importedModuleRevisionOnly", null, date);
-        testRevision("moduleRevisionOnly", date, null);
+        testRevision("withoutRevision", null, Optional.empty());
+        testRevision("withRevision", DATE, Optional.of(DATE));
+        testRevision("importedModuleRevisionOnly", null, Optional.of(DATE));
+        testRevision("moduleRevisionOnly", DATE, Optional.empty());
     }
 
-    private static void testRevision(final String path, final Date moduleRevision, final Date importedRevision)
-            throws Exception {
+    private static void testRevision(final String path, final Revision moduleRevision,
+            final Optional<Revision> importedRevision) throws Exception {
         final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug6491/".concat(path));
         assertNotNull(context);
         final Module module = context.findModule("bar", moduleRevision).get();