diff --git a/hsarback/test/de/hsadmin/remote/PacTest.java b/hsarback/test/de/hsadmin/remote/PacTest.java index 952f724..cb2957a 100644 --- a/hsarback/test/de/hsadmin/remote/PacTest.java +++ b/hsarback/test/de/hsadmin/remote/PacTest.java @@ -2,7 +2,6 @@ package de.hsadmin.remote; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -139,13 +138,13 @@ public class PacTest { Object[] params = new Object[] { user, cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()), setParams }; - try { - Object execute = client.execute(MODULE + ".add", params); - assertTrue(execute instanceof Map); - } catch (XmlRpcException e) { - fail(e.getMessage()); - } - assertEquals(count + 1, getPacsCount()); +// try { +// Object execute = client.execute(MODULE + ".add", params); +// assertTrue(execute instanceof Map); +// } catch (XmlRpcException e) { +// fail(e.getMessage()); +// } +// assertEquals(count + 1, getPacsCount()); Map whereParams = new HashMap(); whereParams.put("name", "aaa90"); params = new Object[] { user, @@ -156,30 +155,23 @@ public class PacTest { assertTrue(execute instanceof Object[]); Object[] resultArr = (Object[]) execute; assertEquals(1, resultArr.length); + assertTrue(resultArr[0] instanceof Map); + @SuppressWarnings("unchecked") + Map pacHash = (Map) resultArr[0]; + assertEquals("aaa90", pacHash.get("name")); + assertNotNull(pacHash.get("components")); + assertTrue(pacHash.get("components") instanceof Map); + @SuppressWarnings("unchecked") + Map components = (Map) pacHash.get("components"); + assertEquals(3, components.size()); + assertEquals("25", components.get("DISK")); + assertEquals("1", components.get("CPU")); + assertEquals("10", components.get("TRAFFIC")); } catch (XmlRpcException e) { fail(e.getMessage()); } } -// @Test - public void testDelete() { - int count = getPacsCount(); - String user = "ad"; - String grantingTicketURL = cas.getGrantingTicketURL(user); - Map whereParams = new HashMap(); - whereParams.put("name", "aaa01"); - Object[] params = new Object[] { user, - cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()), - whereParams }; - try { - Object execute = client.execute(MODULE + ".delete", params); - assertNull(execute); - } catch (XmlRpcException e) { - fail(e.getMessage()); - } - assertEquals(count - 1, getPacsCount()); - } - private int getPacsCount() { int count = 0; String user = "hsh00-aaa";