Merge "MD-SAL Statistics Manager -Added group-id to group-statistics API"

[controller.git] / opendaylight / md-sal / sal-rest-connector / src / test / java / org / opendaylight / controller / sal / restconf / impl / test / RestconfImplTest.java

diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java
index 8263c467b04aeac223edf8f676036de8faa50c13..c36de6e4eabc9abc11c10d20cb3eab353e73d096 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java
@@ -19,14 +19,13 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 public class RestconfImplTest {
 
-    private static final RestconfImpl restconfImpl = new RestconfImpl();
+    private static final RestconfImpl restconfImpl = RestconfImpl.getInstance();
 
     @BeforeClass
     public static void init() throws FileNotFoundException {
         Set<Module> allModules = TestUtils.loadModules(RestconfImplTest.class.getResource("/full-versions/yangs").getPath());
-        assertEquals(4, allModules.size());
         SchemaContext schemaContext = TestUtils.loadSchemaContext(allModules);
-        ControllerContext controllerContext = new ControllerContext();
+        ControllerContext controllerContext = ControllerContext.getInstance();
         controllerContext.setSchemas(schemaContext);
         restconfImpl.setControllerContext(controllerContext);
     }