Google Git
Sign in
eclipse/jeetools/webtools.javaee.tests/26d809633bb317a39f1654fc1bb3110620a63321^!/.
commit
26d809633bb317a39f1654fc1bb3110620a63321
[log]
author
cbridgha <cbridgha>
Fri Dec 03 16:20:18 2004 +0000
committer
cbridgha <cbridgha>
Fri Dec 03 16:20:18 2004 +0000
tree
dd2dbb6426c703dd993cd5718381445387b21c55
parent
f300cfa4adb7b211a8e7f2d4c9089c0982fc2070 [diff]
refresh j2ee core tests

diff --git a/tests/org.eclipse.jst.j2ee.core.tests/build.properties b/tests/org.eclipse.jst.j2ee.core.tests/build.properties
index 900ffcb..76fc186 100644
--- a/tests/org.eclipse.jst.j2ee.core.tests/build.properties
+++ b/tests/org.eclipse.jst.j2ee.core.tests/build.properties

@@ -1,12 +1,9 @@
-bin.includes = plugin.xml,\
+bin.includes = tests.jar,\
+               plugin.xml,\
                my/,\
                my.bar,\
                test.xml,\
-               commonArchiveResources/,\
-               commonArchiveTests/,\
-               javaTests/,\
-               tests.jar,\
-               testData/
+               commonArchiveResources/
 output.tests.jar = bin/
 jars.compile.order = tests.jar
 source.tests.jar = commonArchiveTests/,\

diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AppClientEMFEditTest.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AppClientEMFEditTest.java
index 8ed8ac0..029f061 100644
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AppClientEMFEditTest.java
+++ b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AppClientEMFEditTest.java

@@ -64,13 +64,13 @@
 		setVersion(VERSION_1_3);
 		setModuleType(APP_CLIENT);
         editRoot(DD.getRootObject());
-
-        String out = "EditTests/EMFModelCreationTests/EditAppEAR";
+        String curDir = AutomatedBVT.baseDirectory;
+        String out = curDir + "testOutput/EMFModelCreationTests/EditAppEAR";
         appClientFile.extractTo(out, Archive.EXPAND_ALL);
         appClientFile.close();
 
         //Compare
-        String curDir = AutomatedBVT.baseDirectory;
+        
         String exampleDeploymentDesURI = curDir + "EMFTests/application-client.xml";
         String curDeploymentDesURI = curDir + out + "/AppClientfoo/META-INF/application-client.xml";
 		setIgnoreAtt(ignorableAttributes());

diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AppClientEMFTest.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AppClientEMFTest.java
index a03aadc..ad3edc4 100644
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AppClientEMFTest.java
+++ b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AppClientEMFTest.java

@@ -79,7 +79,7 @@
         //Compare
         String curDir = AutomatedBVT.baseDirectory;
         String exampleDeploymentDesURI = curDir + "EMFTestNoID/application-client.xml";
-        String curDeploymentDesURI = curDir + "testOutput/TestAppEAR/fooApp/META-INF/application-client.xml";
+        String curDeploymentDesURI = curDir + "testOutput/TestAppEAR/fooAPP/META-INF/application-client.xml";
 		setIgnoreAtt(ignorableAttributes());
 		compareContentsIgnoreWhitespace(curDeploymentDesURI, exampleDeploymentDesURI, null);
     }
@@ -128,7 +128,7 @@
     
     
 	public void getApp14Client() throws DuplicateObjectException, OpenFailureException {
-		String in = AutomatedBVT.baseDirectory + "testOutput/TestAppEAR14/fooApp";
+		String in = AutomatedBVT.baseDirectory + "testOutput/TestAppEAR14/fooAPP";
 		appClientFile14 = getArchiveFactory().openApplicationClientFile(in);
 	}
     

diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/EarEMFEditTest.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/EarEMFEditTest.java
index 70d7b19..f41160e 100644
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/EarEMFEditTest.java
+++ b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/EarEMFEditTest.java

@@ -68,13 +68,14 @@
 		setVersion(VERSION_1_3);
 		setModuleType(APPICATION); 
         editRoot(DD.getRootObject());
-
-        String out = "EditOutput/EMFModelCreationTests/EditEAR";
+        String curDir = AutomatedBVT.baseDirectory;
+        
+        String out = curDir +"testOutput/EditOutput/EMFModelCreationTests/EditEAR";
         earFile.extractTo(out, Archive.EXPAND_ALL);
         earFile.close();
 
         //Compare work in progress
-        String curDir = AutomatedBVT.baseDirectory;
+       
         String exampleDeploymentDesURI = curDir + "EMFTests/application.xml";
         String curDeploymentDesURI = curDir + out + "/META-INF/application.xml";
         //compareContents(curDeploymentDesURI, exampleDeploymentDesURI);

diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/EjbEMFEditTest.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/EjbEMFEditTest.java
index 9b1641f..ed53dba 100644
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/EjbEMFEditTest.java
+++ b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/EjbEMFEditTest.java

@@ -97,14 +97,14 @@
 		setVersion(VERSION_1_3);
 		setModuleType(EJB); 
         editRoot(DD.getRootObject());
-
-        String out = "testOutput/EMFModelCreationTests/EditEjbEAR";
+        String curDir = AutomatedBVT.baseDirectory;
+        String out = curDir + "testOutput/EMFModelCreationTests/EditEjbEAR";
         ejbFile.extractTo(out, Archive.EXPAND_ALL);
         ejbFile.close();
         
         
         //Compare work in progress
-        String curDir = AutomatedBVT.baseDirectory;
+        
         String exampleDeploymentDesURI = null;
         if (RendererFactory.getDefaultRendererFactory() == EMF2SAXRendererFactory.INSTANCE){
             exampleDeploymentDesURI = curDir + "EMFTests/ejb-jar2-0sax.xml";

diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/RarEMFEditTest.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/RarEMFEditTest.java
index 7ec3af0..58a6ce0 100644
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/RarEMFEditTest.java
+++ b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/RarEMFEditTest.java

@@ -62,13 +62,14 @@
        	setVersion(VERSION_1_3);
        	setModuleType(CONNECTOR);       
         editRoot(DD.getRootObject());
-
-        String out = "editOutput/EMFModelCreationTests/EditRarEAR";
+        String curDir = AutomatedBVT.baseDirectory;
+        
+        String out = curDir + "testOutput/EMFModelCreationTests/EditRarEAR";
         rarFile.extractTo(out, Archive.EXPAND_ALL);
         rarFile.close();
 
         //Compare work in progress
-        String curDir = AutomatedBVT.baseDirectory;
+        
         String exampleDeploymentDesURI = curDir + "EMFTests/ra.xml";
         String curDeploymentDesURI = curDir + out + "/fooRAR/META-INF/ra.xml";
         //compareContents(curDeploymentDesURI, exampleDeploymentDesURI);

diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/WarEMFEditTest.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/WarEMFEditTest.java
index c26781f..da88d8f 100644
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/WarEMFEditTest.java
+++ b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/WarEMFEditTest.java

@@ -74,13 +74,13 @@
 		setVersion(VERSION_1_3);
 		setModuleType(WEB); 
         editRoot(DD.getRootObject());
-
-        String out = "editOutput/EMFModelCreationTests/EditWarEAR";
+        String curDir = AutomatedBVT.baseDirectory;
+        String out = curDir + "testOutput/EMFModelCreationTests/EditWarEAR";
         warFile.extractTo(out, Archive.EXPAND_ALL);
         warFile.close();
 
         //Compare work in progress
-        String curDir = AutomatedBVT.baseDirectory;
+       
         String exampleDeploymentDesURI = curDir + "EMFTests/web.xml";
         String curDeploymentDesURI = curDir + out + "/fooWAR/WEB-INF/web.xml";
         //compareContents(curDeploymentDesURI, exampleDeploymentDesURI);