From 8b270bf3731cc49e299c85a363da762a74e9b8d4 Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@hostsharing.net>
Date: Fri, 06 May 2011 16:54:43 +0200
Subject: [PATCH] work on tests

---
 hsarback/test/de/hsadmin/remote/PacTest.java      |   10 +++++-----
 hsarback/test/de/hsadmin/remote/RemoteTest.java   |   19 ++++++++++---------
 hsarback/test/de/hsadmin/remote/UnixUserTest.java |    4 ++--
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/hsarback/test/de/hsadmin/remote/PacTest.java b/hsarback/test/de/hsadmin/remote/PacTest.java
index 3a6c238..2222e47 100644
--- a/hsarback/test/de/hsadmin/remote/PacTest.java
+++ b/hsarback/test/de/hsadmin/remote/PacTest.java
@@ -86,14 +86,14 @@
 	@Test
 	public void testCreate() {
 		int count = getPacsCount();
-		String user = "pe";
+		String user = "ad";
 		String grantingTicketURL = cas.getGrantingTicketURL(user);
 		Map<String, String> setParams = new HashMap<String, String>();
 		setParams.put("name", "aaa01");
-		setParams.put("hive", "h90");
+		setParams.put("hive", "h81");
 		setParams.put("customer", config.getProperty("accountprefix.customer") + "-aaa");
 		setParams.put("basepac", "DW/B");
-		setParams.put("curinetaddr", "83.223.95.133");
+		setParams.put("curinetaddr", "192.168.108.202");
 		Object[] params = new Object[] { user, 
 				cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()), 
 				setParams };
@@ -109,7 +109,7 @@
 	@Test
 	public void testDelete() {
 		int count = getPacsCount();
-		String user = "pe";
+		String user = "ad";
 		String grantingTicketURL = cas.getGrantingTicketURL(user);
 		Map<String, String> whereParams = new HashMap<String, String>();
 		whereParams.put("name", "aaa01");
@@ -127,7 +127,7 @@
 
 	private int getPacsCount() {
 		int count = 0;
-		String user = "hsh90-aaa";
+		String user = "hsh00-aaa";
 		String grantingTicketURL = cas.getGrantingTicketURL(user);
 		Map<String, String> whereParams = new HashMap<String, String>();
 		whereParams.put("customer", config.getProperty("accountprefix.customer") + "-aaa");
diff --git a/hsarback/test/de/hsadmin/remote/RemoteTest.java b/hsarback/test/de/hsadmin/remote/RemoteTest.java
index ba1cc6e..3f88d20 100644
--- a/hsarback/test/de/hsadmin/remote/RemoteTest.java
+++ b/hsarback/test/de/hsadmin/remote/RemoteTest.java
@@ -6,17 +6,18 @@
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
 	InitDataTest.class,
-	CustomerTest.class,
+	PacTest.class,
 	UnixUserTest.class,
-	MysqlDbTest.class,
-	MysqlUserTest.class,
-	PgsqlDbTest.class,
-	PgsqlUserTest.class,
-	EMailAliasTest.class,
-	EMailAddressTest.class,
-	DomainTest.class,
+	CustomerTest.class
+//	MysqlDbTest.class,
+//	MysqlUserTest.class,
+//	PgsqlDbTest.class,
+//	PgsqlUserTest.class,
+//	EMailAliasTest.class,
+//	EMailAddressTest.class,
+//	DomainTest.class,
 //	HostmasterTest.class,
-	QueueTaskTest.class
+//	QueueTaskTest.class
 })
 
 public class RemoteTest {
diff --git a/hsarback/test/de/hsadmin/remote/UnixUserTest.java b/hsarback/test/de/hsadmin/remote/UnixUserTest.java
index 17d4c04..d5c2e60 100644
--- a/hsarback/test/de/hsadmin/remote/UnixUserTest.java
+++ b/hsarback/test/de/hsadmin/remote/UnixUserTest.java
@@ -43,7 +43,7 @@
 		try {
 			Object execute = client.execute(MODULE + ".search", params);
 			Object[] result = (Object[]) execute;
-			assertEquals(1, result.length);
+			assertEquals(2, result.length);
 			for (Object o : result) {
 				if (o instanceof Map<?, ?>) {
 					Map<?, ?> row = (Map<?, ?>) o;
@@ -136,7 +136,7 @@
 			String grantingTicketURL = cas.getGrantingTicketURL(user);
 			Map<String, String> whereParams = new HashMap<String, String>();
 			Map<String, String> setParams = new HashMap<String, String>();
-			whereParams.put("name", "aaa00-test2");
+			whereParams.put("name", "aaa00-test3");
 			setParams.put("password", "test1234");
 			Object[] params = new Object[] { user, 
 					cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()), 

--
Gitblit v1.9.1