X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-clustering-commons%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fschema%2Fprovider%2Fimpl%2FRemoteYangTextSourceProviderImplTest.java;h=72170cad1b58b452fb3fec25dc0bffd0c601214a;hp=5d97dba235de5714afd88d4596ece73ae667514a;hb=4e696d9795fe7eef40369c05c340d137394126f3;hpb=159ab8006360ebb30cfb4252696b02d0479fd48c diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/provider/impl/RemoteYangTextSourceProviderImplTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/provider/impl/RemoteYangTextSourceProviderImplTest.java index 5d97dba235..72170cad1b 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/provider/impl/RemoteYangTextSourceProviderImplTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/schema/provider/impl/RemoteYangTextSourceProviderImplTest.java @@ -20,6 +20,7 @@ import java.util.Set; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; +import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.SchemaRepository; import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceException; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; @@ -30,11 +31,11 @@ import scala.concurrent.duration.Duration; public class RemoteYangTextSourceProviderImplTest { - private static final SourceIdentifier ID = SourceIdentifier.create("Test", Optional.of("2015-10-30")); + private static final SourceIdentifier ID = RevisionSourceIdentifier.create("Test", Optional.of("2015-10-30")); private RemoteYangTextSourceProviderImpl remoteRepository; private SchemaRepository mockedLocalRepository; - private Set providedSources = Collections.singleton(ID); + private final Set providedSources = Collections.singleton(ID); @Before public void setUp() { @@ -46,13 +47,16 @@ public class RemoteYangTextSourceProviderImplTest { @Test public void testGetExistingYangTextSchemaSource() throws Exception { String source = "Test source."; - YangTextSchemaSource schemaSource = YangTextSchemaSource.delegateForByteSource(ID, ByteSource.wrap(source.getBytes())); + YangTextSchemaSource schemaSource = YangTextSchemaSource.delegateForByteSource( + ID, ByteSource.wrap(source.getBytes())); Mockito.when(mockedLocalRepository.getSchemaSource(ID, YangTextSchemaSource.class)).thenReturn( Futures.immediateCheckedFuture(schemaSource)); - Future retrievedSourceFuture = remoteRepository.getYangTextSchemaSource(ID); + Future retrievedSourceFuture = + remoteRepository.getYangTextSchemaSource(ID); assertTrue(retrievedSourceFuture.isCompleted()); - YangTextSchemaSource resultSchemaSource = Await.result(retrievedSourceFuture, Duration.Zero()).getRepresentation(); + YangTextSchemaSource resultSchemaSource = Await.result(retrievedSourceFuture, + Duration.Zero()).getRepresentation(); assertEquals(resultSchemaSource.getIdentifier(), schemaSource.getIdentifier()); assertArrayEquals(resultSchemaSource.read(), schemaSource.read()); } @@ -63,15 +67,16 @@ public class RemoteYangTextSourceProviderImplTest { Futures.immediateFailedCheckedFuture( new SchemaSourceException("Source is not provided"))); - - Future retrievedSourceFuture = remoteRepository.getYangTextSchemaSource(ID); + Future retrievedSourceFuture = + remoteRepository.getYangTextSchemaSource(ID); assertTrue(retrievedSourceFuture.isCompleted()); Await.result(retrievedSourceFuture, Duration.Zero()); } @Test public void testGetProvidedSources() throws Exception { - Set remoteProvidedSources = Await.result(remoteRepository.getProvidedSources(), Duration.Zero()); + Set remoteProvidedSources = Await.result(remoteRepository + .getProvidedSources(), Duration.Zero()); assertEquals(providedSources, remoteProvidedSources); }