diff --git a/hsarback/test/de/hsadmin/remote/CustomerTest.java b/hsarback/test/de/hsadmin/remote/CustomerTest.java index d9ee6b5..1b3c9a2 100644 --- a/hsarback/test/de/hsadmin/remote/CustomerTest.java +++ b/hsarback/test/de/hsadmin/remote/CustomerTest.java @@ -64,10 +64,11 @@ public class CustomerTest { try { client.execute(MODULE + ".add", params); assertEquals(membersCount + 1, getMembersCount(user)); - for (int idx=11; idx < 99; idx++) { + for (int idx=11; idx < 100; idx++) { setParams.put("membercode", "hsh00-n" + idx); setParams.put("memberno", "200" + idx); - setParams.put("contact_street", "Hauptstr. " + idx); + setParams.put("contact_street", "Hauptstr. " + idx); + params[1] = cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()); client.execute(MODULE + ".add", params); } } catch (XmlRpcException e) { @@ -86,7 +87,7 @@ public class CustomerTest { try { Object execute = client.execute(MODULE + ".search", params); Object[] result = (Object[]) execute; - assertTrue(result.length > 98); + assertTrue(result.length > 90); } catch (XmlRpcException e) { fail(e.getMessage()); } diff --git a/hsarback/test/de/hsadmin/remote/InitDataTest.java b/hsarback/test/de/hsadmin/remote/InitDataTest.java index cebacaf..2f31547 100644 --- a/hsarback/test/de/hsadmin/remote/InitDataTest.java +++ b/hsarback/test/de/hsadmin/remote/InitDataTest.java @@ -35,12 +35,12 @@ public class InitDataTest { @Test public void testAddMember() { - String user = "pe"; + String user = "ad"; int membersCount = -9999; membersCount = getMembersCount(); String grantingTicketURL = cas.getGrantingTicketURL(user); Map setParams = new HashMap(); - setParams.put("membercode", "hsh90-aaa"); + setParams.put("membercode", "hsh00-aaa"); setParams.put("password", "geheimnIs"); setParams.put("memberno", "20001"); setParams.put("membersince", "01.10.2010"); @@ -72,14 +72,14 @@ public class InitDataTest { @Test public void testAddPac() { int count = getPacsCount(); - String user = "pe"; + String user = "ad"; String grantingTicketURL = cas.getGrantingTicketURL(user); Map setParams = new HashMap(); setParams.put("name", "aaa00"); - setParams.put("hive", "h90"); - setParams.put("customer", "hsh90-aaa"); + setParams.put("hive", "h81"); + setParams.put("customer", "hsh00-aaa"); setParams.put("basepac", "DW/B"); - setParams.put("curinetaddr", "83.223.95.132"); + setParams.put("curinetaddr", "192.168.108.201"); Object[] params = new Object[] { user, cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()), setParams }; @@ -95,7 +95,7 @@ public class InitDataTest { @Test public void testDelPac() { int count = getPacsCount(); - String user = "pe"; + String user = "ad"; String grantingTicketURL = cas.getGrantingTicketURL(user); Map whereParams = new HashMap(); whereParams.put("name", "aaa00"); @@ -113,10 +113,10 @@ public class InitDataTest { @Test public void testDelMember() { int count = getMembersCount(); - String user = "pe"; + String user = "ad"; String grantingTicketURL = cas.getGrantingTicketURL(user); Map whereParams = new HashMap(); - whereParams.put("membercode", "hsh90-aaa"); + whereParams.put("membercode", "hsh00-aaa"); Object[] params = new Object[] { user, cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()), whereParams }; @@ -130,7 +130,7 @@ public class InitDataTest { private int getMembersCount() { int count = 0; - String user = "pe"; + String user = "ad"; String grantingTicketURL = cas.getGrantingTicketURL(user); Map whereParams = new HashMap(); Object[] params = new Object[] { user, @@ -149,10 +149,10 @@ public class InitDataTest { private int getPacsCount() { int count = 0; - String user = "pe"; + String user = "ad"; String grantingTicketURL = cas.getGrantingTicketURL(user); Map whereParams = new HashMap(); - whereParams.put("customer", "hsh90-aaa"); + whereParams.put("customer", "hsh00-aaa"); Object[] params = new Object[] { user, cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()), whereParams }; diff --git a/hsarback/test/de/hsadmin/remote/RemoteTest.java b/hsarback/test/de/hsadmin/remote/RemoteTest.java index bfeb293..ba1cc6e 100644 --- a/hsarback/test/de/hsadmin/remote/RemoteTest.java +++ b/hsarback/test/de/hsadmin/remote/RemoteTest.java @@ -5,11 +5,13 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ + InitDataTest.class, CustomerTest.class, UnixUserTest.class, -// MySqlDatabaseTest.class, -// MySqlUserTest.class, -// PgSqlUserTest.class, + MysqlDbTest.class, + MysqlUserTest.class, + PgsqlDbTest.class, + PgsqlUserTest.class, EMailAliasTest.class, EMailAddressTest.class, DomainTest.class,