[Ogoglio-commits] SF.net SVN: ogoglio: [256] maven/trunk/ogoglio-server/src/test/java/com/ ogoglio/client/test/ClientTests.java

[<ian...@us...>]

Revision: 256
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=256&view=rev
Author:   iansmith
Date:     2007-08-21 09:23:41 -0700 (Tue, 21 Aug 2007)

Log Message:
-----------
ClientTests was unhappy being checked in last time.

Modified Paths:
--------------
    maven/trunk/ogoglio-server/src/test/java/com/ogoglio/client/test/ClientTests.java

Modified: maven/trunk/ogoglio-server/src/test/java/com/ogoglio/client/test/ClientTests.java
===================================================================
--- maven/trunk/ogoglio-server/src/test/java/com/ogoglio/client/test/ClientTests.java	2007-08-21 16:22:50 UTC (rev 255)
+++ maven/trunk/ogoglio-server/src/test/java/com/ogoglio/client/test/ClientTests.java	2007-08-21 16:23:41 UTC (rev 256)
@@ -470,7 +470,7 @@
             assertTrue(e.getMessage().indexOf("404") != -1); //very weak test  
         }
 
-        webClient1.uploadTemplateGeometryStream(ownerUsername, templateID, 0, new FileInputStream("src/com/ogoglio/persist/resources/TestCylinder.obj"));
+        webClient1.uploadTemplateGeometryStream(ownerUsername, templateID, 0, getClass().getResourceAsStream("/sample-art3d/TestCylinder.obj"));
     }
 
     private void checkPageManipulation(WebAPIClient webClient1, ThingDocument someThing, SpaceDocument spaceDoc) throws IOException {
@@ -515,10 +515,11 @@
         String CUBE_GIF = "TestCube.gif";
         String CUBE_MATERIAL = "TestCube.mtl";
 
-        webClient1.uploadTemplateGeometryStream(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID(), 0, new FileInputStream("src/com/ogoglio/persist/resources/TestCube.obj"));
-        webClient1.uploadTemplateResourceStream(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID(), CUBE_MATERIAL, new FileInputStream("src/com/ogoglio/persist/resources/TestCube.mtl"));
-        webClient1.uploadTemplateResourceStream(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID(),  CUBE_GIF, new FileInputStream("src/com/ogoglio/persist/resources/TestCube.gif"));
-        webClient1.updateTemplateScript(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID(), StreamUtils.readInput(new FileInputStream("src/com/ogoglio/persist/resources/TestCube.js")));
+        Class clazz=getClass();
+        webClient1.uploadTemplateGeometryStream(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID(), 0, clazz.getResourceAsStream("/sample-art3d/TestCube.obj"));
+        webClient1.uploadTemplateResourceStream(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID(), CUBE_MATERIAL, clazz.getResourceAsStream("/sample-art3d/TestCube.mtl"));
+        webClient1.uploadTemplateResourceStream(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID(),  CUBE_GIF, clazz.getResourceAsStream("/sample-art3d/TestCube.gif"));
+        webClient1.updateTemplateScript(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID(), StreamUtils.readInput(clazz.getResourceAsStream("/sample-art3d/TestCube.js")));
 
         baseDoc = webClient1.getTemplateDocument(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID());
         //make sure the sequence right above didn't take more than 1 sec
@@ -549,7 +550,7 @@
         }
 
         //change the geometry to the cylinder
-        webClient1.uploadTemplateGeometryStream(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID(),  0, new FileInputStream("src/com/ogoglio/persist/resources/TestCylinder.obj"));
+        webClient1.uploadTemplateGeometryStream(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID(),  0, getClass().getResourceAsStream("/sample-art3d/TestCylinder.obj"));
         afterCylDoc = webClient1.getTemplateDocument(newTemplateDoc.getOwnerUsername(), newTemplateDoc.getTemplateID());
         verifyLastChangedTimes(baseDoc.getGeometryModifiedTime(0), afterCylDoc.getGeometryModifiedTime(0), 1000, true, false);
 
@@ -632,7 +633,7 @@
         }
 
         previousLength = possDocs.length;
-//        webClient1.deletePossession(targetID);
+        webClient1.deletePossession(targetID);
         possDocs = webClient1.getPossessionDocuments();
         assertEquals(previousLength - 1, possDocs.length);
     }


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