Modified two test files

[nemo.git] / nemo-impl / src / test / java / org / opendaylight / nemo / user / vnspacemanager / structurestyle / updateintent / UpdateResultTest.java

diff --git a/nemo-impl/src/test/java/org/opendaylight/nemo/user/vnspacemanager/structurestyle/updateintent/UpdateResultTest.java b/nemo-impl/src/test/java/org/opendaylight/nemo/user/vnspacemanager/structurestyle/updateintent/UpdateResultTest.java
index fca411bea4dff7dafcedde283122f435a2960669..384b3ed603b8433ccd5ff3461feb42b39d92275c 100644 (file)
--- a/nemo-impl/src/test/java/org/opendaylight/nemo/user/vnspacemanager/structurestyle/updateintent/UpdateResultTest.java
+++ b/nemo-impl/src/test/java/org/opendaylight/nemo/user/vnspacemanager/structurestyle/updateintent/UpdateResultTest.java
@@ -6,46 +6,64 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
 package org.opendaylight.nemo.user.vnspacemanager.structurestyle.updateintent;\r
-import static org.mockito.Mockito.mock;\r
+import org.opendaylight.nemo.user.vnspacemanager.structurestyle.updateintent.UpdateResult;\r
 \r
+import static org.mockito.Mockito.mock;\r
+import static org.mockito.Mockito.*;\r
 import org.junit.Assert;\r
+import org.junit.Before;\r
+import org.junit.Test;\r
+\r
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;\r
+import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;\r
+import org.opendaylight.nemo.user.tenantmanager.TenantManage;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.UserId;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.intent.rev151010.Users;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.intent.rev151010.user.intent.Operations;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.intent.rev151010.user.intent.operations.Operation;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.intent.rev151010.user.intent.operations.OperationBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.intent.rev151010.user.intent.operations.OperationKey;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.intent.rev151010.users.User;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.intent.rev151010.users.UserKey;\r
+import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;\r
+import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;\r
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;\r
+import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;\r
+import com.google.common.util.concurrent.CheckedFuture;\r
+import com.google.common.util.concurrent.FutureCallback;\r
+import com.google.common.util.concurrent.Futures;\r
+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;\r
 import org.opendaylight.nemo.user.tenantmanager.TenantManage;\r
-import org.opendaylight.nemo.user.vnspacemanager.instancecheck.ResultInstanceCheck;\r
-import org.opendaylight.nemo.user.vnspacemanager.syntaxcheck.ResultDefinitionCheck;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.UserId;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.intent.rev151010.user.intent.Results;\r
-/**\r
- * Created by ldzd11 on 2015/11/9.\r
- */\r
-public class UpdateResultTest {\r
 \r
 \r
+public class UpdateResultTest {\r
+\r
     private UpdateResult updateResult;\r
 \r
     private DataBroker dataBroker;\r
     private TenantManage tenantManage;\r
-    private ResultDefinitionCheck resultDefinitionCheck;\r
-    private ResultInstanceCheck resultInstanceCheck;\r
     private UserId userId;\r
     private Results results;\r
-\r
+    \r
     @org.junit.Before\r
     public void setUp() throws Exception {\r
         dataBroker = mock(DataBroker.class);\r
         tenantManage = mock(TenantManage.class);\r
-        resultDefinitionCheck = mock(ResultDefinitionCheck.class);\r
-        resultInstanceCheck = mock(ResultInstanceCheck.class);\r
+\r
         userId = mock(UserId.class);\r
         results = mock(Results.class);\r
-\r
-        updateResult = mock(UpdateResult.class);\r
-\r
+        \r
+        updateResult = new UpdateResult(dataBroker, tenantManage);\r
 \r
     }\r
 \r
     @org.junit.Test\r
     public void testResultHandling() throws Exception {\r
+       \r
         Assert.assertNull(updateResult.ResultHandling(userId, results));\r
 \r
     }\r