Merge "NETCONF-540: do not ignore namespace when building error rpc-reply"

[netconf.git] / netconf / yanglib / src / test / java / org / opendaylight / yanglib / impl / YangLibRestAppTest.java

diff --git a/netconf/yanglib/src/test/java/org/opendaylight/yanglib/impl/YangLibRestAppTest.java b/netconf/yanglib/src/test/java/org/opendaylight/yanglib/impl/YangLibRestAppTest.java
index 62b81599db10ba7911872e0aeedb4e953cfd5f47..c72366d6f8676c987f40751a88f134077140b93d 100644 (file)
--- a/netconf/yanglib/src/test/java/org/opendaylight/yanglib/impl/YangLibRestAppTest.java
+++ b/netconf/yanglib/src/test/java/org/opendaylight/yanglib/impl/YangLibRestAppTest.java
@@ -9,44 +9,17 @@
 package org.opendaylight.yanglib.impl;
 
 import static junit.framework.TestCase.assertTrue;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.BDDMockito.then;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
 
 import java.util.Set;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.opendaylight.yanglib.api.YangLibRestAppService;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(FrameworkUtil.class)
 public class YangLibRestAppTest {
 
     @Test
     public void testYangLibRestApp() {
-        PowerMockito.mockStatic(FrameworkUtil.class);
-
-        final BundleContext bundleContext = mock(BundleContext.class);
-        final Bundle bundle = mock(Bundle.class);
-
-        given(FrameworkUtil.getBundle(any())).willReturn(bundle);
-        given(bundle.getBundleContext()).willReturn(bundleContext);
-
         final YangLibRestApp yangLibRestApp = new YangLibRestApp();
         final Set singleton = yangLibRestApp.getSingletons();
 
         assertTrue(singleton.contains(yangLibRestApp.getYangLibService()));
-
-        then(bundleContext).should(times(1))
-                .registerService(eq(YangLibRestAppService.class.getName()), eq(yangLibRestApp), eq(null));
     }
 }