Repository: stratos Updated Branches: refs/heads/tenant-isolation ee12ac759 -> 1ac7598bc
Update the test with uuid Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1ac7598b Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1ac7598b Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1ac7598b Branch: refs/heads/tenant-isolation Commit: 1ac7598bc7f2c0bddb712f5c9b5110b95dd861a9 Parents: ee12ac7 Author: Gayan Gunarathne <[email protected]> Authored: Thu Jul 9 23:20:01 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Thu Jul 9 23:20:01 2015 +0530 ---------------------------------------------------------------------- .../cartridge/agent/test/JavaCartridgeAgentTest.java | 5 +++-- .../test/PythonCartridgeAgentTest.java | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/1ac7598b/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java b/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java index 3f0e73e..b5a2be8 100644 --- a/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java +++ b/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java @@ -78,7 +78,8 @@ public class JavaCartridgeAgentTest { private static final String TENANT_ID = "-1234"; private static final String SERVICE_NAME = "php"; public static final String AGENT_NAME = "apache-stratos-cartridge-agent-4.1.0-SNAPSHOT"; - private static HashMap<String, Executor> executorList; + private static final String CARTRIDGE_UUID ="uuid" ; + private static HashMap<String, Executor> executorList; private static ArrayList<ServerSocket> serverSocketList; private final ArtifactUpdatedEvent artifactUpdatedEvent; private final Boolean expectedResult; @@ -442,7 +443,7 @@ public class JavaCartridgeAgentTest { */ private Topology createTestTopology() { Topology topology = new Topology(); - Service service = new Service(SERVICE_NAME, ServiceType.SingleTenant); + Service service = new Service(SERVICE_NAME, ServiceType.SingleTenant,CARTRIDGE_UUID); topology.addService(service); Cluster cluster = new Cluster(service.getServiceName(), CLUSTER_ID, DEPLOYMENT_POLICY_NAME, http://git-wip-us.apache.org/repos/asf/stratos/blob/1ac7598b/components/org.apache.stratos.python.cartridge.agent/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonCartridgeAgentTest.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cartridge.agent/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonCartridgeAgentTest.java b/components/org.apache.stratos.python.cartridge.agent/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonCartridgeAgentTest.java index bb116ce..e1dc6fc 100644 --- a/components/org.apache.stratos.python.cartridge.agent/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonCartridgeAgentTest.java +++ b/components/org.apache.stratos.python.cartridge.agent/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonCartridgeAgentTest.java @@ -68,10 +68,11 @@ public class PythonCartridgeAgentTest { private static final String NETWORK_PARTITION_ID = "network-partition-1"; private static final String PARTITION_ID = "partition-1"; private static final String TENANT_ID = "-1234"; - private static final String SERVICE_NAME = "php"; - public static final String SOURCE_PATH = "/tmp/stratos-pca-test-app-path/"; + private static final String SERVICE_NAME = "php"; + public static final String SOURCE_PATH = "/tmp/java.lang.Stringstratos-pca-test-app-path/"; + private static final String CARTRIDGE_UUID ="uuid" ; - private static List<ServerSocket> serverSocketList; + private static List<ServerSocket> serverSocketList; private static Map<String, Executor> executorList; private final ArtifactUpdatedEvent artifactUpdatedEvent; private final Boolean expectedResult; @@ -330,7 +331,7 @@ public class PythonCartridgeAgentTest { */ private Topology createTestTopology() { Topology topology = new Topology(); - Service service = new Service(SERVICE_NAME, ServiceType.SingleTenant); + Service service = new Service(SERVICE_NAME, ServiceType.SingleTenant,CARTRIDGE_UUID); topology.addService(service); Cluster cluster = new Cluster(service.getServiceName(), CLUSTER_ID, DEPLOYMENT_POLICY_NAME,
