[Mantisconnect-cvs] SF.net SVN: mantisconnect: [150] mantisconnect/trunk/clients/java/ client-api/src/test/org/mantisbt/connect/axis/MantisConnectPortTypeTest. java

[<pl...@us...>]

Revision: 150
          http://mantisconnect.svn.sourceforge.net/mantisconnect/?rev=150&view=rev
Author:   planser
Date:     2007-12-27 04:39:47 -0800 (Thu, 27 Dec 2007)

Log Message:
-----------
Adapted some testcases

Modified Paths:
--------------
    mantisconnect/trunk/clients/java/client-api/src/test/org/mantisbt/connect/axis/MantisConnectPortTypeTest.java

Modified: mantisconnect/trunk/clients/java/client-api/src/test/org/mantisbt/connect/axis/MantisConnectPortTypeTest.java
===================================================================
--- mantisconnect/trunk/clients/java/client-api/src/test/org/mantisbt/connect/axis/MantisConnectPortTypeTest.java	2007-12-07 13:47:05 UTC (rev 149)
+++ mantisconnect/trunk/clients/java/client-api/src/test/org/mantisbt/connect/axis/MantisConnectPortTypeTest.java	2007-12-27 12:39:47 UTC (rev 150)
@@ -627,17 +627,16 @@
 		}		
 		// Read
 		attachments = getFirstProjectAttachments();
+		assertNotNull(attachments);
 		assertEquals(cntOld + 1, attachments.length);
-		if (attachments == null) {
-			fail("Could not get project attachment information.");
-		}
-		ProjectAttachmentData description = attachments[attachments.length - 1];
-		assertEquals("ATitle", description.getTitle());
-		assertEquals("ADescription", description.getDescription());
+		ProjectAttachmentData newData = findProjectAttachmentById(attachments, newId);
+		assertNotNull(newData);
+		assertEquals("ATitle", newData.getTitle());
+		assertEquals("ADescription", newData.getDescription());
 		try {
 			byte[] attachmentData = portType.mc_project_attachment_get(user, pwd, newId);
 			assertTrue(attachmentData != null && attachmentData.length > 0);
-			assertEquals(attachmentData.length, description.getSize().longValue());
+			assertEquals(attachmentData.length, newData.getSize().longValue());
 		} catch (RemoteException e) {
 			fail(e.toString());
 		}
@@ -655,6 +654,17 @@
 		System.out.println("Project attachment added, read and deleted (ID = " + newId + ")");
 	}
 
+	private ProjectAttachmentData findProjectAttachmentById(ProjectAttachmentData[] attachments, BigInteger id) {
+		if (attachments != null) {
+			for (int i = 0; i < attachments.length; i++) {
+				if (attachments[i].getId().equals(id)) {
+					return attachments[i];
+				}
+			}		
+		}
+		return null;
+	}
+
 	/**
 	 * Create, read, update and delete issue.
 	 */
@@ -988,10 +998,12 @@
 		} catch (RemoteException e) {
 			fail(e.toString());
 		}
-		assertEquals(newVersionId, newData[0].getId());
-		assertEquals(name, newData[0].getName());
-		assertEquals(description, newData[0].getDescription());
-		assertFalse(newData[0].getReleased().booleanValue());
+		ProjectVersionData data = findProjectVersionById(newData, newVersionId);
+		assertNotNull(data);
+		assertEquals(newVersionId, data.getId());
+		assertEquals(name, data.getName());
+		assertEquals(description, data.getDescription());
+		assertFalse(data.getReleased().booleanValue());
 		// delete
 		try {
 			assertTrue(portType.mc_project_version_delete(user, pwd, newVersionId));
@@ -1007,4 +1019,15 @@
 		System.out.println("Version added, read, updated and deleted (ID = " + newVersionId + ")");
 	}
 
+	private ProjectVersionData findProjectVersionById(ProjectVersionData[] versions, BigInteger id) {
+		if (versions != null) {
+			for (int i = 0; i < versions.length; i++) {
+				if (versions[i].getId().equals(id)) {
+					return versions[i];
+				}
+			}		
+		}
+		return null;
+	}
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.