upd: allow clean testcase setup and teardown

[gigi.git] / tests / club / wpia / gigi / testUtils / ManagedTest.java

diff --git a/tests/club/wpia/gigi/testUtils/ManagedTest.java b/tests/club/wpia/gigi/testUtils/ManagedTest.java
index 2574922196c28d5262ba3778070ab6941dc42839..fd602b8302750d2ad4de834182f8863097254f90 100644 (file)
--- a/tests/club/wpia/gigi/testUtils/ManagedTest.java
+++ b/tests/club/wpia/gigi/testUtils/ManagedTest.java
@@ -196,6 +196,14 @@ public class ManagedTest extends ConfiguredTest {
         String type = testProps.getProperty("type");
         ter.destroy();
         if (type.equals("local")) {
+            if (testProps.getProperty("withSigner", "false").equals("true")) {
+                try {
+                    SimpleSigner.stopSigner();
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+            inited = false;
             return;
         }
         gigi.destroy();
@@ -204,6 +212,7 @@ public class ManagedTest extends ConfiguredTest {
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
+        inited = false;
     }
 
     public final String uniq = createUniqueName();
@@ -315,10 +324,10 @@ public class ManagedTest extends ConfiguredTest {
      *            the password
      * @return a new userid.
      */
-    public static int createAssuranceUser(String firstName, String lastName, String email, String password) {
+    public static int createVerificationUser(String firstName, String lastName, String email, String password) {
         int uid = createVerifiedUser(firstName, lastName, email, password);
 
-        makeAssurer(uid);
+        makeAgent(uid);
 
         return uid;
     }