CSEN-88 After merge fix

bwsw · Feb 6, 2018 · b8a6dce · b8a6dce
1 parent 262c154
commit b8a6dce
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 26 deletions.
diff --git a/src/test/scala/com/bwsw/cloudstack/entities/dao/AccountDaoTestSuite.scala b/src/test/scala/com/bwsw/cloudstack/entities/dao/AccountDaoTestSuite.scala
@@ -102,9 +102,7 @@ class AccountDaoTestSuite extends FlatSpec with TestData {
   }
 
   "find" should "handle child of AccountFindRequest" in {
-    val accountId = UUID.randomUUID()
-    val userId = UUID.randomUUID()
-    val expectedAccountList = List(Account(accountId, List(User(userId, accountId))))
+    val expectedAccountList = List(testAccount)
 
     class TestAccountFindRequest extends AccountFindRequest
 
@@ -113,7 +111,7 @@ class AccountDaoTestSuite extends FlatSpec with TestData {
     val executor = new Executor(executorSettings, clientCreator){
       override def executeRequest(request: ApacheCloudStackRequest): String = {
         assert(childRequest.getRequest == request)
-        Response.getAccountResponseJson(accountId.toString, userId.toString)
+        Response.getAccountResponseJson(testAccount)
       }
     }
 

diff --git a/src/test/scala/com/bwsw/cloudstack/entities/dao/TagDaoTestSuite.scala b/src/test/scala/com/bwsw/cloudstack/entities/dao/TagDaoTestSuite.scala
@@ -25,9 +25,7 @@ import br.com.autonomiccs.apacheCloudStack.exceptions.ApacheCloudStackClientRequ
 import com.bwsw.cloudstack.entities.Executor
 import com.bwsw.cloudstack.entities.requests.tag.types.UserTagType
 import com.bwsw.cloudstack.entities.requests.tag.{TagCreateRequest, TagFindRequest}
-import com.bwsw.cloudstack.entities.TestConstants.ParameterValues.DUMMY_VALUE
 import com.bwsw.cloudstack.entities.responses.tag.Tag
-import com.bwsw.cloudstack.entities.responses.Tag
 import org.scalatest.FlatSpec
 
 class TagDaoTestSuite extends FlatSpec with TestData {

diff --git a/src/test/scala/com/bwsw/cloudstack/entities/dao/UserDaoTestSuite.scala b/src/test/scala/com/bwsw/cloudstack/entities/dao/UserDaoTestSuite.scala
@@ -99,9 +99,7 @@ class UserDaoTestSuite extends FlatSpec with TestData {
   }
 
   "find" should "handle child of UserFindRequest" in {
-    val userId = UUID.randomUUID()
-    val accountId = UUID.randomUUID()
-    val expectedUserList = List(User(userId, accountId))
+    val expectedUserList = List(testUser)
 
     class TestUserFindRequest extends UserFindRequest
 
@@ -110,7 +108,7 @@ class UserDaoTestSuite extends FlatSpec with TestData {
     val executor = new Executor(executorSettings, clientCreator){
       override def executeRequest(request: ApacheCloudStackRequest): String = {
         assert(findUserRequest.getRequest == request)
-        Response.getUserResponseJson(userId.toString, accountId.toString)
+        Response.getUserResponseJson(testUser)
       }
     }
 

diff --git a/src/test/scala/com/bwsw/cloudstack/entities/dao/VirtualMachineDaoTestSuite.scala b/src/test/scala/com/bwsw/cloudstack/entities/dao/VirtualMachineDaoTestSuite.scala
@@ -101,10 +101,7 @@ class VirtualMachineDaoTestSuite extends FlatSpec with TestData {
   }
 
   "find" should "handle child of VmFindRequest" in {
-    val vmId = UUID.randomUUID()
-    val accountName = "test"
-    val domainId = UUID.randomUUID()
-    val expectedVmList = List(VirtualMachine(vmId, accountName, domainId))
+    val expectedVmList = List(testVm)
 
     class TestVmFindRequest extends VmFindRequest
 
@@ -113,7 +110,7 @@ class VirtualMachineDaoTestSuite extends FlatSpec with TestData {
     val executor = new Executor(executorSettings, clientCreator){
       override def executeRequest(request: ApacheCloudStackRequest): String = {
         assert(vmFindRequest.getRequest == request)
-        Response.getVmResponseJson(vmId.toString, accountName, domainId.toString)
+        Response.getVmResponseJson(testVm)
       }
     }
 

diff --git a/...est/scala/com/bwsw/cloudstack/entities/requests/domain/DomainCreateRequestTestSuite.scala b/...est/scala/com/bwsw/cloudstack/entities/requests/domain/DomainCreateRequestTestSuite.scala
@@ -36,7 +36,7 @@ class DomainCreateRequestTestSuite extends FlatSpec {
   it should "create a request with predefined and specified (via constructor) parameters" in {
     val request = new DomainCreateRequest(domainName)
 
-    assert(request.request.getParameters.asScala.toSet == defaultParameters)
-    assert(request.request.getCommand == Commands.CREATE_DOMAIN)
+    assert(request.getRequest.getParameters.asScala.toSet == defaultParameters)
+    assert(request.getRequest.getCommand == Commands.CREATE_DOMAIN)
   }
 }
diff --git a/src/test/scala/com/bwsw/cloudstack/entities/requests/domain/DomainFindRequestTestSuite.scala b/src/test/scala/com/bwsw/cloudstack/entities/requests/domain/DomainFindRequestTestSuite.scala
@@ -33,7 +33,7 @@ class DomainFindRequestTestSuite extends FlatSpec {
   it should "create a request with predefined parameters" in {
     val request = new DomainFindRequest
 
-    assert(request.request.getParameters.asScala.toSet == defaultParameters)
-    assert(request.request.getCommand == Commands.LIST_DOMAINS)
+    assert(request.getRequest.getParameters.asScala.toSet == defaultParameters)
+    assert(request.getRequest.getCommand == Commands.LIST_DOMAINS)
   }
 }
diff --git a/...sw/cloudstack/entities/requests/serviceoffering/ServiceOfferingFindRequestTestSuite.scala b/...sw/cloudstack/entities/requests/serviceoffering/ServiceOfferingFindRequestTestSuite.scala
@@ -33,7 +33,7 @@ class ServiceOfferingFindRequestTestSuite extends FlatSpec {
   it should "create a request with predefined parameters" in {
     val request = new ServiceOfferingFindRequest
 
-    assert(request.request.getParameters.asScala.toSet == defaultParameters)
-    assert(request.request.getCommand == Commands.LIST_SERVICE_OFFERINGS)
+    assert(request.getRequest.getParameters.asScala.toSet == defaultParameters)
+    assert(request.getRequest.getCommand == Commands.LIST_SERVICE_OFFERINGS)
   }
 }
diff --git a/...t/scala/com/bwsw/cloudstack/entities/requests/template/TemplateFindRequestTestSuite.scala b/...t/scala/com/bwsw/cloudstack/entities/requests/template/TemplateFindRequestTestSuite.scala
@@ -35,7 +35,7 @@ class TemplateFindRequestTestSuite extends FlatSpec {
   it should "create a request with predefined and specified (via constructor) parameters" in {
     val request = new TemplateFindRequest(All)
 
-    assert(request.request.getParameters.asScala.toSet == defaultParameters)
-    assert(request.request.getCommand == Commands.LIST_TEMPLATES)
+    assert(request.getRequest.getParameters.asScala.toSet == defaultParameters)
+    assert(request.getRequest.getCommand == Commands.LIST_TEMPLATES)
   }
 }
diff --git a/src/test/scala/com/bwsw/cloudstack/entities/requests/zone/ZoneFindRequestTestSuite.scala b/src/test/scala/com/bwsw/cloudstack/entities/requests/zone/ZoneFindRequestTestSuite.scala
@@ -34,8 +34,8 @@ class ZoneFindRequestTestSuite extends FlatSpec {
   it should "create a request with predefined parameters" in {
     val request = new ZoneFindRequest
 
-    assert(request.request.getParameters.asScala.toSet == defaultParameters)
-    assert(request.request.getCommand == Commands.LIST_ZONES)
+    assert(request.getRequest.getParameters.asScala.toSet == defaultParameters)
+    assert(request.getRequest.getCommand == Commands.LIST_ZONES)
   }
 
 
@@ -44,6 +44,6 @@ class ZoneFindRequestTestSuite extends FlatSpec {
     val expectedParameters = defaultParameters ++ Set(new ApacheCloudStackApiCommandParameter(ParameterKeys.AVAILABLE, isAvailable))
     val request = new ZoneFindRequest
 
-    assert(request.withAvailableFlag(isAvailable).request.getParameters.asScala.toSet == expectedParameters)
+    assert(request.withAvailableFlag(isAvailable).getRequest.getParameters.asScala.toSet == expectedParameters)
   }
 }