X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fyanglib%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fyanglib%2Fimpl%2FYangLibProviderTest.java;h=7fe78602dafd5b7fdbe45069f69f8ab65fe38486;hb=f402dcd49a468e018192c96151bef3a0cdf70d62;hp=36db57aa783c2e2e9206a7c43315aab8e9bf8669;hpb=65e365b57106b134ac29f274db520995b59bb154;p=netconf.git diff --git a/netconf/yanglib/src/test/java/org/opendaylight/yanglib/impl/YangLibProviderTest.java b/netconf/yanglib/src/test/java/org/opendaylight/yanglib/impl/YangLibProviderTest.java index 36db57aa78..7fe78602da 100644 --- a/netconf/yanglib/src/test/java/org/opendaylight/yanglib/impl/YangLibProviderTest.java +++ b/netconf/yanglib/src/test/java/org/opendaylight/yanglib/impl/YangLibProviderTest.java @@ -8,20 +8,23 @@ package org.opendaylight.yanglib.impl; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; +import static org.opendaylight.mdsal.common.api.CommitInfo.emptyFluentFuture; -import com.google.common.util.concurrent.Futures; import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Map; import org.apache.commons.io.FileUtils; import org.junit.AfterClass; import org.junit.Before; @@ -30,26 +33,28 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.WriteTransaction; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.ModulesState; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.ModulesStateBuilder; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.OptionalRevision; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.RevisionIdentifier; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.module.list.Module; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.module.list.ModuleBuilder; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.module.list.ModuleKey; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160621.ModulesState; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160621.ModulesStateBuilder; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160621.RevisionIdentifier; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160621.RevisionUtils; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160621.module.list.CommonLeafs.Revision; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160621.module.list.Module; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160621.module.list.ModuleBuilder; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160621.module.list.ModuleKey; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.YangIdentifier; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.yanglib.impl.rev141210.YanglibConfig; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.yanglib.impl.rev141210.YanglibConfigBuilder; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.common.Revision; +import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; import org.opendaylight.yangtools.yang.model.repo.api.YinSchemaSourceRepresentation; import org.opendaylight.yangtools.yang.model.repo.spi.PotentialSchemaSource; +import org.opendaylight.yangtools.yang.parser.impl.YangParserFactoryImpl; import org.opendaylight.yangtools.yang.parser.rfc7950.repo.ASTSchemaSource; public class YangLibProviderTest { @@ -88,8 +93,8 @@ public class YangLibProviderTest { } final YanglibConfig yanglibConfig = new YanglibConfigBuilder().setBindingAddr("www.fake.com") - .setBindingPort(300L).setCacheFolder(CACHE_DIR.getAbsolutePath()).build(); - yangLibProvider = new YangLibProvider(yanglibConfig, dataBroker); + .setBindingPort(Uint32.valueOf(300)).setCacheFolder(CACHE_DIR.getAbsolutePath()).build(); + yangLibProvider = new YangLibProvider(yanglibConfig, dataBroker, new YangParserFactoryImpl()); } @Test @@ -107,35 +112,36 @@ public class YangLibProviderTest { list.add( PotentialSchemaSource.create( - RevisionSourceIdentifier.create("with-revision", Revision.of("2016-04-28")), + RevisionSourceIdentifier.create("with-revision", + org.opendaylight.yangtools.yang.common.Revision.of("2016-04-28")), YangTextSchemaSource.class, PotentialSchemaSource.Costs.IMMEDIATE.getValue())); - when(writeTransaction.submit()).thenReturn(Futures.immediateCheckedFuture(null)); + doReturn(emptyFluentFuture()).when(writeTransaction).commit(); yangLibProvider.schemaSourceRegistered(list); - List newModulesList = new ArrayList<>(); + Map newModulesList = new HashMap<>(); Module newModule = new ModuleBuilder() .setName(new YangIdentifier("no-revision")) - .setRevision(new OptionalRevision("")) + .setRevision(RevisionUtils.emptyRevision()) .setSchema(new Uri("http://www.fake.com:300/yanglib/schemas/no-revision/")) .build(); - newModulesList.add(newModule); + newModulesList.put(newModule.key(), newModule); newModule = new ModuleBuilder() .setName(new YangIdentifier("with-revision")) - .setRevision(new OptionalRevision(new RevisionIdentifier("2016-04-28"))) + .setRevision(new Revision(new RevisionIdentifier("2016-04-28"))) .setSchema(new Uri("http://www.fake.com:300/yanglib/schemas/with-revision/2016-04-28")) .build(); - newModulesList.add(newModule); + newModulesList.put(newModule.key(), newModule); verify(dataBroker).newWriteOnlyTransaction(); verify(writeTransaction).merge(eq(LogicalDatastoreType.OPERATIONAL), eq(InstanceIdentifier.create(ModulesState.class)), eq(new ModulesStateBuilder().setModule(newModulesList).build())); - verify(writeTransaction).submit(); + verify(writeTransaction).commit(); } @Test @@ -171,7 +177,7 @@ public class YangLibProviderTest { YangTextSchemaSource.class, PotentialSchemaSource.Costs.IMMEDIATE.getValue())); when(dataBroker.newWriteOnlyTransaction()).thenReturn(writeTransaction); - when(writeTransaction.submit()).thenReturn(Futures.immediateCheckedFuture(null)); + doReturn(emptyFluentFuture()).when(writeTransaction).commit(); yangLibProvider.schemaSourceRegistered(potentialSources); verify(dataBroker).newWriteOnlyTransaction(); @@ -179,7 +185,7 @@ public class YangLibProviderTest { verify(writeTransaction).merge(eq(LogicalDatastoreType.OPERATIONAL), eq(InstanceIdentifier.create(ModulesState.class)), modulesStateCaptor.capture()); assertEquals(modulesStateCaptor.getValue().getModule().size(), 1); - verify(writeTransaction).submit(); + verify(writeTransaction).commit(); } @Test @@ -205,7 +211,7 @@ public class YangLibProviderTest { doNothing().when(writeTransaction) .delete(eq(LogicalDatastoreType.OPERATIONAL), any(InstanceIdentifier.class)); - when(writeTransaction.submit()).thenReturn(Futures.immediateCheckedFuture(null)); + doReturn(emptyFluentFuture()).when(writeTransaction).commit(); PotentialSchemaSource yangUnregistererSource = PotentialSchemaSource.create( @@ -219,13 +225,14 @@ public class YangLibProviderTest { eq(InstanceIdentifier.create(ModulesState.class) .child(Module.class, new ModuleKey(new YangIdentifier("unregistered-yang-schema-without-revision"), - new OptionalRevision(""))))); + RevisionUtils.emptyRevision())))); - verify(writeTransaction).submit(); + verify(writeTransaction).commit(); yangUnregistererSource = PotentialSchemaSource.create( - RevisionSourceIdentifier.create("unregistered-yang-with-revision", Revision.of("2016-04-28")), + RevisionSourceIdentifier.create("unregistered-yang-with-revision", + org.opendaylight.yangtools.yang.common.Revision.of("2016-04-28")), YangTextSchemaSource.class, PotentialSchemaSource.Costs.LOCAL_IO.getValue()); yangLibProvider.schemaSourceUnregistered(yangUnregistererSource); @@ -235,8 +242,8 @@ public class YangLibProviderTest { eq(InstanceIdentifier.create(ModulesState.class) .child(Module.class, new ModuleKey(new YangIdentifier("unregistered-yang-with-revision"), - new OptionalRevision(new RevisionIdentifier("2016-04-28")))))); + new Revision(new RevisionIdentifier("2016-04-28")))))); - verify(writeTransaction, times(2)).submit(); + verify(writeTransaction, times(2)).commit(); } }