From 73bf30dec7bbda557752ae7024f3d8e329409635 Mon Sep 17 00:00:00 2001 From: Michael Dürre Date: Fri, 10 Jul 2020 05:07:17 +0200 Subject: upgrade northbound to sodium MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixed unit test due changes in sodium Issue-ID: CCSDK-2544 Signed-off-by: Michael Dürre Change-Id: I69af992f1db267e282a0ed66b4e4bed72d4f2bd4 --- daexim-offsite-backup/provider/pom.xml | 4 +++ .../DaeximOffsiteBackupProviderTest.java | 39 +++++++++------------- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/daexim-offsite-backup/provider/pom.xml b/daexim-offsite-backup/provider/pom.xml index 94ffc441..a9f72b1c 100755 --- a/daexim-offsite-backup/provider/pom.xml +++ b/daexim-offsite-backup/provider/pom.xml @@ -61,6 +61,10 @@ sli-provider ${sdnctl.sli.version} + + com.google.code.findbugs + annotations + junit junit diff --git a/daexim-offsite-backup/provider/src/test/java/org/onap/ccsdk/sli/northbound/daeximoffsitebackup/DaeximOffsiteBackupProviderTest.java b/daexim-offsite-backup/provider/src/test/java/org/onap/ccsdk/sli/northbound/daeximoffsitebackup/DaeximOffsiteBackupProviderTest.java index 65d0dcaf..d070c30e 100644 --- a/daexim-offsite-backup/provider/src/test/java/org/onap/ccsdk/sli/northbound/daeximoffsitebackup/DaeximOffsiteBackupProviderTest.java +++ b/daexim-offsite-backup/provider/src/test/java/org/onap/ccsdk/sli/northbound/daeximoffsitebackup/DaeximOffsiteBackupProviderTest.java @@ -21,23 +21,12 @@ package org.onap.ccsdk.sli.northbound.daeximoffsitebackup; -import org.eclipse.jdt.annotation.Nullable; -import org.junit.Before; -import org.junit.Test; - -import org.opendaylight.controller.md.sal.binding.api.*; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; -import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; - -import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.daeximoffsitebackup.rev180926.DaeximOffsiteBackupService; - -import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.daeximoffsitebackup.rev180926.RetrieveDataInput; - -import org.opendaylight.yangtools.yang.binding.Augmentation; -import org.opendaylight.yangtools.yang.binding.DataContainer; - +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; import com.google.common.util.concurrent.CheckedFuture; - import java.io.File; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -46,9 +35,16 @@ import java.util.Arrays; import java.util.List; import java.util.Properties; import java.util.concurrent.ExecutionException; - -import static org.mockito.Mockito.*; -import static org.junit.Assert.*; +import org.eclipse.jdt.annotation.Nullable; +import org.junit.Before; +import org.junit.Test; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; +import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; +import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; +import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; +import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.daeximoffsitebackup.rev180926.DaeximOffsiteBackupService; +import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.daeximoffsitebackup.rev180926.RetrieveDataInput; +import org.opendaylight.yangtools.yang.binding.Augmentation; public class DaeximOffsiteBackupProviderTest { public DataBroker dataBroker; @@ -153,10 +149,7 @@ public class DaeximOffsiteBackupProviderTest { return "Some Timestamp"; } - @Override - public Class getImplementedInterface() { - return null; - } + }; try { assertNotNull(provider.retrieveData(input)); -- cgit 1.2.3-korg