BUG-4688: switch revisions from Date to Revision

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

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java
index dcc3f3054853162d2ff33041c5b5682af540929f..67d03e70a0701cf40362db7dc445f5d0220679e4 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java
@@ -15,11 +15,12 @@ import static org.junit.Assert.assertTrue;
 import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource;
 
 import java.net.URI;
-import java.util.Date;
+import java.util.Optional;
 import java.util.Set;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
+import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
@@ -139,9 +140,9 @@ public class MoreRevisionsTest {
     private static void checkContentFullTest(final SchemaContext context) {
         URI yangTypesNS = URI.create("urn:ietf:params:xml:ns:yang:ietf-yang-types");
 
-        final Date rev20100924 = QName.parseRevision("2010-09-24");
-        final Date rev20130516 = QName.parseRevision("2013-05-16");
-        final Date rev20130715 = QName.parseRevision("2013-07-15");
+        final Revision rev20100924 = Revision.valueOf("2010-09-24");
+        final Revision rev20130516 = Revision.valueOf("2013-05-16");
+        final Revision rev20130715 = Revision.valueOf("2013-07-15");
 
         final QNameModule yangTypes_20100924 = QNameModule.create(yangTypesNS, rev20100924);
         final QNameModule yangTypes_20130516 = QNameModule.create(yangTypesNS, rev20130516);
@@ -162,28 +163,28 @@ public class MoreRevisionsTest {
         checkInterfacesModuleFullTest(context, rev20100924, dateTimeTypeDef_20100924);
     }
 
-    private static void checkInterfacesModuleFullTest(final SchemaContext context, final Date rev20100924,
+    private static void checkInterfacesModuleFullTest(final SchemaContext context, final Revision rev20100924,
             final QName dateTimeTypeDef_20100924) {
-        Date rev20121115 = QName.parseRevision("2012-11-15");
+        Revision rev20121115 = Revision.valueOf("2012-11-15");
 
         Module interfacesModule_20121115 = context.findModule("ietf-interfaces", rev20121115).get();
         Set<ModuleImport> imports = interfacesModule_20121115.getImports();
         assertEquals(1, imports.size());
         ModuleImport interfacesImport = imports.iterator().next();
         assertEquals("ietf-yang-types", interfacesImport.getModuleName());
-        assertEquals(rev20100924, interfacesImport.getRevision());
+        assertEquals(Optional.of(rev20100924), interfacesImport.getRevision());
     }
 
     private static void checkNetconfMonitoringModuleFullTest(final SchemaContext context,
-            final Date rev20130715, final QName dateTimeTypeDef_20130715) {
-        Date rev20101004 = QName.parseRevision("2010-10-04");
+            final Revision rev20130715, final QName dateTimeTypeDef_20130715) {
+        Revision rev20101004 = Revision.valueOf("2010-10-04");
 
         Module monitoringModule_20101004 = context.findModule("ietf-netconf-monitoring", rev20101004).get();
         Set<ModuleImport> imports = monitoringModule_20101004.getImports();
         assertEquals(2, imports.size());
         for (ModuleImport monitoringImport : imports) {
             if (monitoringImport.getModuleName().equals("ietf-yang-types")) {
-                assertEquals(rev20130715, monitoringImport.getRevision());
+                assertEquals(Optional.of(rev20130715), monitoringImport.getRevision());
             }
         }
     }
@@ -202,9 +203,9 @@ public class MoreRevisionsTest {
     private static void checkContentSimpleTest(final SchemaContext context) {
         URI yangTypesNS = URI.create("urn:ietf:params:xml:ns:yang:ietf-yang-types");
 
-        final Date rev20100924 = QName.parseRevision("2010-09-24");
-        final Date rev20130516 = QName.parseRevision("2013-05-16");
-        final Date rev20130715 = QName.parseRevision("2013-07-15");
+        final Revision rev20100924 = Revision.valueOf("2010-09-24");
+        final Revision rev20130516 = Revision.valueOf("2013-05-16");
+        final Revision rev20130715 = Revision.valueOf("2013-07-15");
 
         final QNameModule yangTypes_20100924 = QNameModule.create(yangTypesNS, rev20100924);
         final QNameModule yangTypes_20130516 = QNameModule.create(yangTypesNS, rev20130516);
@@ -226,9 +227,9 @@ public class MoreRevisionsTest {
     }
 
     private static void checkInterfacesModuleSimpleTest(final SchemaContext context,
-            final Date rev20100924, final QName dateTimeTypeDef_20100924) {
+            final Revision rev20100924, final QName dateTimeTypeDef_20100924) {
         URI interfacesNS = URI.create("urn:ietf:params:xml:ns:yang:ietf-interfaces");
-        Date rev20121115 = QName.parseRevision("2012-11-15");
+        Revision rev20121115 = Revision.valueOf("2012-11-15");
         final QNameModule interfacesNS_20121115 = QNameModule.create(interfacesNS, rev20121115);
         QName lastChange = QName.create(interfacesNS_20121115, "last-change");
 
@@ -244,16 +245,16 @@ public class MoreRevisionsTest {
         assertEquals(1, imports.size());
         ModuleImport interfacesImport = imports.iterator().next();
         assertEquals("ietf-yang-types", interfacesImport.getModuleName());
-        assertEquals(rev20100924, interfacesImport.getRevision());
+        assertEquals(Optional.of(rev20100924), interfacesImport.getRevision());
     }
 
     private static void checkNetconfMonitoringModuleSimpleTest(final SchemaContext context,
-            final Date rev20130715, final QName dateTimeTypeDef_20130715) {
+            final Revision rev20130715, final QName dateTimeTypeDef_20130715) {
         URI monitoringNS = URI.create("urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring");
-        final QNameModule monitoring_19700101 = QNameModule.create(monitoringNS, null);
+        final QNameModule monitoring_19700101 = QNameModule.create(monitoringNS);
         QName lockedTime = QName.create(monitoring_19700101, "locked-time");
 
-        Module monitoringModule_19700101 = context.findModule("ietf-netconf-monitoring", null).get();
+        Module monitoringModule_19700101 = context.findModule("ietf-netconf-monitoring").get();
         DataSchemaNode leafLockedTime = monitoringModule_19700101.getDataChildByName(lockedTime);
         assertNotNull(leafLockedTime);
 
@@ -265,7 +266,7 @@ public class MoreRevisionsTest {
         assertEquals(1, imports.size());
         ModuleImport monitoringImport = imports.iterator().next();
         assertEquals("ietf-yang-types", monitoringImport.getModuleName());
-        assertEquals(rev20130715, monitoringImport.getRevision());
+        assertEquals(Optional.of(rev20130715), monitoringImport.getRevision());
     }
 
     private static boolean findTypeDef(final Module module, final QName typedef) {