Repository: ode Updated Branches: refs/heads/master f70933c43 -> 0b530a887
fix test case clean up. Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/0b530a88 Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/0b530a88 Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/0b530a88 Branch: refs/heads/master Commit: 0b530a887ce48e040c87be8f26c1cb64ebdb4643 Parents: f70933c Author: Tammo van Lessen <[email protected]> Authored: Fri Feb 27 17:06:40 2015 +0100 Committer: Tammo van Lessen <[email protected]> Committed: Fri Feb 27 17:06:40 2015 +0100 ---------------------------------------------------------------------- .../test/java/org/apache/ode/axis2/management/RedeployTest.java | 2 ++ .../test/java/org/apache/ode/axis2/management/Retire2Test.java | 3 +++ .../src/test/java/org/apache/ode/axis2/management/RetireTest.java | 3 +++ .../test/java/org/apache/ode/axis2/management/RetireTestVar.java | 3 +++ 4 files changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/0b530a88/axis2-war/src/test/java/org/apache/ode/axis2/management/RedeployTest.java ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/management/RedeployTest.java b/axis2-war/src/test/java/org/apache/ode/axis2/management/RedeployTest.java index 2b032a5..2d3af47 100644 --- a/axis2-war/src/test/java/org/apache/ode/axis2/management/RedeployTest.java +++ b/axis2-war/src/test/java/org/apache/ode/axis2/management/RedeployTest.java @@ -47,5 +47,7 @@ public class RedeployTest extends Axis2TestBase { String response = sendRequestFile("http://localhost:8888/processes/testretire";, bundleName + "/1", "testRequest2.soap"); + + if (server.isDeployed("withVar")) server.undeployProcess(bundleName + "/withVar"); } } http://git-wip-us.apache.org/repos/asf/ode/blob/0b530a88/axis2-war/src/test/java/org/apache/ode/axis2/management/Retire2Test.java ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/management/Retire2Test.java b/axis2-war/src/test/java/org/apache/ode/axis2/management/Retire2Test.java index 66ff01d..746de72 100644 --- a/axis2-war/src/test/java/org/apache/ode/axis2/management/Retire2Test.java +++ b/axis2-war/src/test/java/org/apache/ode/axis2/management/Retire2Test.java @@ -53,5 +53,8 @@ public class Retire2Test extends Axis2TestBase { System.out.println(response); System.out.println("###############################################"); assertTrue(response.indexOf("TEST2") > 0); + + if (server.isDeployed("1")) server.undeployProcess(bundleName + "/1"); + if (server.isDeployed("2")) server.undeployProcess(bundleName + "/2"); } } http://git-wip-us.apache.org/repos/asf/ode/blob/0b530a88/axis2-war/src/test/java/org/apache/ode/axis2/management/RetireTest.java ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/management/RetireTest.java b/axis2-war/src/test/java/org/apache/ode/axis2/management/RetireTest.java index 326e46b..72a7bf8 100644 --- a/axis2-war/src/test/java/org/apache/ode/axis2/management/RetireTest.java +++ b/axis2-war/src/test/java/org/apache/ode/axis2/management/RetireTest.java @@ -52,5 +52,8 @@ public class RetireTest extends Axis2TestBase { System.out.println(response); System.out.println("###############################################"); assertTrue(response.indexOf("DONE") > 0); + + if (server.isDeployed("1")) server.undeployProcess(bundleName + "/1"); + if (server.isDeployed("2")) server.undeployProcess(bundleName + "/2"); } } http://git-wip-us.apache.org/repos/asf/ode/blob/0b530a88/axis2-war/src/test/java/org/apache/ode/axis2/management/RetireTestVar.java ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/management/RetireTestVar.java b/axis2-war/src/test/java/org/apache/ode/axis2/management/RetireTestVar.java index 0ee6091..872d856 100644 --- a/axis2-war/src/test/java/org/apache/ode/axis2/management/RetireTestVar.java +++ b/axis2-war/src/test/java/org/apache/ode/axis2/management/RetireTestVar.java @@ -58,5 +58,8 @@ public class RetireTestVar extends Axis2TestBase { bundleName + "/1", "testRequest2.soap"); assertTrue("'" + response + "' does not contain 'XYZ'.", response.indexOf("XYZ") > 0); + + if (server.isDeployed("withVar")) server.undeployProcess(bundleName + "/withVar"); + if (server.isDeployed("noVar")) server.undeployProcess(bundleName + "/noVar"); } }
