Adjust to yangtools-2.0.0 changes

[controller.git] / opendaylight / config / config-manager-facade-xml / src / test / java / org / opendaylight / controller / config / facade / xml / mapping / attributes / fromxml / SimpleIdentityRefAttributeReadingStrategyTest.java

diff --git a/opendaylight/config/config-manager-facade-xml/src/test/java/org/opendaylight/controller/config/facade/xml/mapping/attributes/fromxml/SimpleIdentityRefAttributeReadingStrategyTest.java b/opendaylight/config/config-manager-facade-xml/src/test/java/org/opendaylight/controller/config/facade/xml/mapping/attributes/fromxml/SimpleIdentityRefAttributeReadingStrategyTest.java
index bf678ffed451f4c99214076b2cdce93d0bd6c89b..60d2118bdf022b0cabd57958731462511e103e2c 100644 (file)
--- a/opendaylight/config/config-manager-facade-xml/src/test/java/org/opendaylight/controller/config/facade/xml/mapping/attributes/fromxml/SimpleIdentityRefAttributeReadingStrategyTest.java
+++ b/opendaylight/config/config-manager-facade-xml/src/test/java/org/opendaylight/controller/config/facade/xml/mapping/attributes/fromxml/SimpleIdentityRefAttributeReadingStrategyTest.java
@@ -10,40 +10,37 @@ package org.opendaylight.controller.config.facade.xml.mapping.attributes.fromxml
 
 import static org.junit.Assert.assertEquals;
 
+import com.google.common.base.Optional;
 import com.google.common.collect.Maps;
 import java.net.URI;
 import java.util.Collections;
-import java.util.Date;
 import java.util.Map;
 import org.junit.Test;
 import org.opendaylight.controller.config.facade.xml.mapping.IdentityMapping;
 import org.opendaylight.controller.config.util.xml.XmlElement;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.Revision;
 
 public class SimpleIdentityRefAttributeReadingStrategyTest {
 
     @Test
     public void testReadIdRef() throws Exception {
-        final Map<String, Map<Date, IdentityMapping>> identityMapping = Maps.newHashMap();
+        final Map<String, Map<Optional<Revision>, IdentityMapping>> identityMapping = Maps.newHashMap();
         final IdentityMapping value = new IdentityMapping();
-        final Date rev = new Date();
+        final Optional<Revision> rev = Optional.of(Revision.of("2017-10-10"));
         identityMapping.put("namespace", Collections.singletonMap(rev, value));
         identityMapping.put("inner", Collections.singletonMap(rev, value));
         final SimpleIdentityRefAttributeReadingStrategy key = new SimpleIdentityRefAttributeReadingStrategy(null, "key",
                 identityMapping);
 
         String read = key.readElementContent(XmlElement.fromString("<el xmlns=\"namespace\">local</el>"));
-        assertEquals(
-                org.opendaylight.yangtools.yang.common.QName.create(URI.create("namespace"), rev, "local").toString(),
-                read);
+        assertEquals(QName.create(URI.create("namespace"), rev.toJavaUtil(), "local").toString(), read);
 
         read = key.readElementContent(XmlElement.fromString("<el xmlns:a=\"inner\" xmlns=\"namespace\">a:local</el>"));
-        assertEquals(org.opendaylight.yangtools.yang.common.QName.create(URI.create("inner"), rev, "local").toString(),
-                read);
+        assertEquals(QName.create(URI.create("inner"), rev.toJavaUtil(), "local").toString(), read);
 
         read = key.readElementContent(
-                XmlElement.fromString("<top xmlns=\"namespace\"><el>local</el></top>").getOnlyChildElement());
-        assertEquals(
-                org.opendaylight.yangtools.yang.common.QName.create(URI.create("namespace"), rev, "local").toString(),
-                read);
+            XmlElement.fromString("<top xmlns=\"namespace\"><el>local</el></top>").getOnlyChildElement());
+        assertEquals(QName.create(URI.create("namespace"), rev.toJavaUtil(), "local").toString(), read);
     }
 }