[Ogoglio-commits] SF.net SVN: ogoglio: [342] maven/trunk/ogoglio-integration-test/src/test/ java/com/ogoglio/client/test/ClientTest.java

[<tre...@us...>]

Revision: 342
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=342&view=rev
Author:   trevorolio
Date:     2007-09-02 17:22:14 -0700 (Sun, 02 Sep 2007)

Log Message:
-----------
Fixed a bug in ObjParser which barfed if the mtl file is references but missing.
Fixed a bug in the integration tests around space membership which assumed that there were no existing memberships and confused the space owner web client with the member web client.
Added destruct and cleanup functions to template scripts, so that templates may tidy up during space shutdown or thing removal, respectively.

Modified Paths:
--------------
    maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java

Modified: maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java
===================================================================
--- maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java	2007-09-03 00:22:09 UTC (rev 341)
+++ maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java	2007-09-03 00:22:14 UTC (rev 342)
@@ -245,18 +245,18 @@
         WebAPIAuthenticator basicAuthenticator = new WebAPIAuthenticatorFactory().authenticate(wire1, descriptor1, USERNAME1, PASSWORD1);
         assertNotNull("got null auth cookie", basicAuthenticator.getAuthCookie());
         WebAPIClient basicWebClient = new WebAPIClient(descriptor1, basicAuthenticator, wire1);
-        
+
         TemplateDocument newTemplateDoc = basicWebClient.createTemplate("Viewed Test Template");
         assertNotNull(newTemplateDoc);
         basicWebClient.uploadTemplateGeometryStream(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID(), 0, UIConstants.getResource("sample-art3d/TestCube.obj"));
         basicWebClient.uploadTemplateResourceStream(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID(), "TestCube.mtl", UIConstants.getResource("sample-art3d/TestCube.mtl"));
         basicWebClient.uploadTemplateResourceStream(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID(), "TestCube.gif", UIConstants.getResource("sample-art3d/TestCube.gif"));
         basicWebClient.updateTemplateScript(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID(), StreamUtils.readInput(UIConstants.getResource("sample-art3d/TestCube.js")));
-        
+
         TemplateDocument[] templateDocs = basicWebClient.getTemplateDocuments(basicAuthenticator.getUsername());
         assertNotNull(templateDocs);
         assertTrue(templateDocs.length > 0);
-        
+
         SpaceDocument spaceDocument = basicWebClient.createSpace("Applet Test Space");
         assertNotNull(spaceDocument);
         PossessionDocument possDoc = basicWebClient.createPossession(newTemplateDoc.getTemplateID());
@@ -267,23 +267,23 @@
         ThingDocument thingDoc = basicWebClient.getThingDocument(spaceDocument.getSpaceID(), possDoc.getThingID());
         thingDoc.setZ(-10);
         basicWebClient.updateThing(spaceDocument.getSpaceID(), thingDoc);
-        
+
         AppletTestWindow testWindow = openAppletTestWindow(spaceDocument, basicAuthenticator);
 
         testWindow.applet.sendChatMessage("Hey, this is a chat message");
         assertEquals(basicAuthenticator.getAuthDocument(true).getUsername(), testWindow.applet.getUsername());
         testWindow.cleanup();
-        
+
         basicWebClient.deleteSpace(spaceDocument.getSpaceID());
     }
 
-    private AppletTestWindow openAppletTestWindow(SpaceDocument spaceDocument, WebAPIAuthenticator authenticator){
+    private AppletTestWindow openAppletTestWindow(SpaceDocument spaceDocument, WebAPIAuthenticator authenticator) {
         AppletTestWindow testWindow = new AppletTestWindow(descriptor1.getServiceURI(), spaceDocument.getSpaceID(), authenticator.getAuthCookie(), new Dimension(500, 500), true);
         testWindow.setVisible(true);
         testWindow.start();
 
         long startTime = System.currentTimeMillis();
-        while(!testWindow.applet.completedInitialLoad() && System.currentTimeMillis() < startTime + 10000){
+        while (!testWindow.applet.completedInitialLoad() && System.currentTimeMillis() < startTime + 10000) {
             try {
                 Thread.sleep(500);
             } catch (InterruptedException e) {
@@ -292,7 +292,7 @@
         assertTrue(testWindow.applet.completedInitialLoad());
         return testWindow;
     }
-    
+
     private void checkThingScripting(WebAPIClient webClient, ThingDocument thingDocument, SpaceDocument spaceDocument) throws IOException {
         //make sure script will return a value
         String script = webClient.getTemplateScript(webClient.getAuthenticator().getUsername(), thingDocument.getTemplateID());
@@ -349,29 +349,30 @@
     private void checkSpaceAuthWithMembership(WebAPIAuthenticator memberAuth, WebAPIClient memberClient, WebAPIClient ownerClient, SpaceDocument spaceDocument) throws IOException {
         SpaceMemberDocument[] membershipDocs;
         membershipDocs = memberClient.getUsersSpaceMemberships();
-        assertEquals(1, membershipDocs.length);
-        assertEquals(spaceDocument.getSpaceID(), membershipDocs[0].getSpaceID());
-        assertEquals(memberAuth.getUsername(), membershipDocs[0].getMemberUsername());
+        int numMemberships = membershipDocs.length;
+        ownerClient.addSpaceMember(spaceDocument.getSpaceID(), memberAuth.getUsername(), SpaceMemberDocument.MEMBER);
+        membershipDocs = memberClient.getUsersSpaceMemberships();
+        assertEquals(numMemberships + 1, membershipDocs.length);
+        assertEquals(spaceDocument.getSpaceID(), membershipDocs[membershipDocs.length - 1].getSpaceID());
+        assertEquals(memberAuth.getUsername(), membershipDocs[membershipDocs.length - 1].getMemberUsername());
         SpaceMemberDocument[] spaceMemberDocs = ownerClient.getSpaceMemberDocuments(spaceDocument.getSpaceID());
         assertFalse("member doc length = " + spaceMemberDocs.length, spaceMemberDocs.length == 0);
         assertEquals(spaceMemberDocs[0].getMemberUsername(), memberAuth.getUsername());
 
         ownerClient.removeSpaceMember(spaceDocument.getSpaceID(), memberAuth.getUsername());
         membershipDocs = memberClient.getUsersSpaceMemberships();
-        assertEquals(0, membershipDocs.length);
+        assertEquals(numMemberships, membershipDocs.length);
     }
 
     private void checkSpaceMembership(long spaceID, WebAPIClient webClient1) throws IOException {
-        SpaceMemberDocument[] membershipDocs = webClient1.getUsersSpaceMemberships();
-        assertNotNull(membershipDocs);
-        assertEquals(0, membershipDocs.length);
-
         webClient1.addSpaceMember(spaceID, USERNAME2, SpaceMemberDocument.MEMBER);
-        membershipDocs = webClient1.getSpaceMemberDocuments(spaceID);
-        assertNotNull(membershipDocs);
+        SpaceMemberDocument[] membershipDocs = webClient1.getSpaceMemberDocuments(spaceID);
         assertEquals(1, membershipDocs.length);
         assertEquals(USERNAME2, membershipDocs[0].getMemberUsername());
         assertEquals(SpaceMemberDocument.MEMBER, membershipDocs[0].getRole());
+        webClient1.removeSpaceMember(spaceID, USERNAME2);
+        membershipDocs = webClient1.getSpaceMemberDocuments(spaceID);
+        assertEquals(0, membershipDocs.length);
     }
 
     private void checkSettings(long spaceID, WebAPIClient webClient1) throws IOException {


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