Update adaptors to sodium

Update sli/adaptors to OpenDaylight Sodium release.  2 changes were
needed:

- mdsal-resource : needed to add unimplemented abstract methods in
inner anonymous BundleContext class in test case.
- resource-assignment: needed to correct unit test problems that were
ignored in earlier versions of h2

Change-Id: Ice63bfce64768e46c4376db55e3e9e97d0b934ad
Issue-ID: CCSDK-2551
Signed-off-by: Dan Timoney <dtimoney@att.com>

1 files changed, 41 insertions, 8 deletions

diff --git a/mdsal-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/TestMdsalResourceActivator.java b/mdsal-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/TestMdsalResourceActivator.java
index 397915d0..6174bc84 100644
--- a/mdsal-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/TestMdsalResourceActivator.java
+++ b/mdsal-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/TestMdsalResourceActivator.java
@@ -30,7 +30,9 @@ import org.osgi.framework.BundleListener;
 import org.osgi.framework.Filter;
 import org.osgi.framework.FrameworkListener;
 import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceFactory;
 import org.osgi.framework.ServiceListener;
+import org.osgi.framework.ServiceObjects;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
 
@@ -49,8 +51,7 @@ public class TestMdsalResourceActivator {
         mdsal = new MdsalResourceActivator();
     }
 
-
-    @Test (expected = ConfigurationException.class)
+    @Test(expected = ConfigurationException.class)
     public void testStartResource() throws Exception {
         BundleContext ctx = new BundleContext() {
             @Override
@@ -119,27 +120,32 @@ public class TestMdsalResourceActivator {
             }
 
             @Override
-            public ServiceRegistration<?> registerService(String[] clazzes, Object service, Dictionary<String, ?> properties) {
+            public ServiceRegistration<?> registerService(String[] clazzes, Object service,
+                    Dictionary<String, ?> properties) {
                 return null;
             }
 
             @Override
-            public ServiceRegistration<?> registerService(String clazz, Object service, Dictionary<String, ?> properties) {
+            public ServiceRegistration<?> registerService(String clazz, Object service,
+                    Dictionary<String, ?> properties) {
                 return null;
             }
 
             @Override
-            public <S> ServiceRegistration<S> registerService(Class<S> clazz, S service, Dictionary<String, ?> properties) {
+            public <S> ServiceRegistration<S> registerService(Class<S> clazz, S service,
+                    Dictionary<String, ?> properties) {
                 return null;
             }
 
             @Override
-            public ServiceReference<?>[] getServiceReferences(String clazz, String filter) throws InvalidSyntaxException {
+            public ServiceReference<?>[] getServiceReferences(String clazz, String filter)
+                    throws InvalidSyntaxException {
                 return new ServiceReference[0];
             }
 
             @Override
-            public ServiceReference<?>[] getAllServiceReferences(String clazz, String filter) throws InvalidSyntaxException {
+            public ServiceReference<?>[] getAllServiceReferences(String clazz, String filter)
+                    throws InvalidSyntaxException {
                 return new ServiceReference[0];
             }
 
@@ -154,7 +160,8 @@ public class TestMdsalResourceActivator {
             }
 
             @Override
-            public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> clazz, String filter) throws InvalidSyntaxException {
+            public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> clazz, String filter)
+                    throws InvalidSyntaxException {
                 return null;
             }
 
@@ -182,6 +189,19 @@ public class TestMdsalResourceActivator {
             public Bundle getBundle(String location) {
                 return null;
             }
+
+            @Override
+            public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory,
+                    Dictionary<String, ?> properties) {
+                // TODO Auto-generated method stub
+                return null;
+            }
+
+            @Override
+            public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) {
+                // TODO Auto-generated method stub
+                return null;
+            }
         };
 
         mdsal.start(ctx);
@@ -320,6 +340,19 @@ public class TestMdsalResourceActivator {
             public Bundle getBundle(String location) {
                 return null;
             }
+
+            @Override
+            public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory,
+                    Dictionary<String, ?> properties) {
+                // TODO Auto-generated method stub
+                return null;
+            }
+
+            @Override
+            public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) {
+                // TODO Auto-generated method stub
+                return null;
+            }
         };
 
         mdsal.stop(ctx);