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

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

Revision: 447
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=447&view=rev
Author:   trevorolio
Date:     2007-09-27 11:06:47 -0700 (Thu, 27 Sep 2007)

Log Message:
-----------
Halfway through a grand avatar rewhack.
In this half I switch over to using downloadable wadges of avatar data instead of in-jar resources for avatar data.
Removed the GeomtryProvider interface, which is now replaced by TemplateDataProvider and BodyDataProvider interfaces which are used to fill the J3DDataManager with cached versions of all network accessed resources.  This allows us to control memory usage, but also (eventually) reduces our memory footprint as we only make copies of data which is avatar specific.

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-27 18:06:43 UTC (rev 446)
+++ maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java	2007-09-27 18:06:47 UTC (rev 447)
@@ -343,7 +343,7 @@
         testWindow.start();
 
         long startTime = System.currentTimeMillis();
-        while (!testWindow.applet.completedInitialLoad() && System.currentTimeMillis() < startTime + 10000) {
+        while (!testWindow.applet.completedInitialLoad() && System.currentTimeMillis() < startTime + 20000) {
             try {
                 Thread.sleep(500);
             } catch (InterruptedException e) {
@@ -375,10 +375,6 @@
     }
 
     private UserDocument[] verifyUserDocsBySize(WebAPIClient webClient1, long spaceID, int expectedLen, String expectedUsername) throws IOException {
-	try {
-		Thread.sleep(2500);
-	} catch (Exception e) {}
-
         UserDocument[] userDocs = webClient1.getUserDocuments(spaceID);
         assertEquals(expectedLen, userDocs.length);
         if (expectedUsername != null) {
@@ -565,8 +561,9 @@
         space1.addListener(testListener, false);
 
         //make sure we can get one thing from the space (maybe floor?) and check geom stream
-        assertNotNull(space1.getThing(1));
-        InputStream stream = space1.getThing(1).getGeometryStream(0);
+        Thing thing = space1.getThing(1);
+        assertNotNull(thing);
+        InputStream stream = webClient1.getTemplateGeometryStream(thing.getTemplate().getOwnerUsername(), thing.getTemplate().getTemplateID(), 0);
         assertNotNull(stream);
         consume(stream);
 
@@ -599,11 +596,16 @@
 
         //now connect as a guest
         SpaceClient guestSpaceClient1 = new SpaceClient(spaceID, serviceURI1, guestCookie1, new TestSpaceClientListener());
-        try {
-            Thread.sleep(1000);
-            Thread.yield();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
+        long startTime = System.currentTimeMillis();
+        while(System.currentTimeMillis() - startTime < 60000){
+            try {
+                Thread.sleep(1000);
+                if(webClient1.getUserDocuments(spaceID).length == 2){
+                     break;
+                }
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
         }
 
         //two users currently connected and one of them better be same as our cookie?
@@ -1048,27 +1050,19 @@
         public void shapeMotionStopped(Shape shape, Transform3D position) {
         }
 
-        public void userAnimationStarted(User user, long animationID) {
+        public void userAnimationStarted(User user, String animationName) {
         }
 
         public void shapeMotionStarted(com.ogoglio.client.model.Shape shape, SplinePath path) {
-            // TODO Auto-generated method stub
-
         }
 
         public void shapeMotionStopped(com.ogoglio.client.model.Shape shape, Transform3D position) {
-            // TODO Auto-generated method stub
-
         }
 
         public void templateAdded(com.ogoglio.client.model.Template template) {
-            // TODO Auto-generated method stub
-
         }
 
         public void templateRemoved(com.ogoglio.client.model.Template template) {
-            // TODO Auto-generated method stub
-
         }
 
     }


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