Google GitGoogle Git
Sign in
eclipse/jeetools/webtools.javaee.tests/31026350a4df9eb949df3a8e6fd7f07b59d9d7a7^!/.
commit
31026350a4df9eb949df3a8e6fd7f07b59d9d7a7
[log]
author
jsholl <jsholl>
Wed Oct 31 20:02:30 2007 +0000
committer
jsholl <jsholl>
Wed Oct 31 20:02:30 2007 +0000
tree
9cbc9f4319d3b939a7e3431bbcfaf485d633f765
parent
153b9ecef9edbe7d0890204e3a24817502c7ebeb [diff]
[208221] JUnits need optimization

diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/ear/operations/EARExportOperationTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/ear/operations/EARExportOperationTest.java
index 9bb4ca9..22486ca 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/ear/operations/EARExportOperationTest.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/ear/operations/EARExportOperationTest.java

@@ -214,7 +214,8 @@
 		IArchive earArchive = null;
 		try {
 			IDataModel exportModel = getExportDataModel(projectName, destination, true, true, true);
-			runAndVerify(exportModel);
+			//IMPROVE PERFORMENCE: don't need to verify export model again here, its already bean done in other tests
+			runDataModel(exportModel);
 			
 			earArchive = JavaEEArchiveUtilities.INSTANCE.openArchive(new Path(destination));
 			List<IArchiveResource> resources = earArchive.getArchiveResources();
@@ -254,7 +255,8 @@
 					referencedArchiveExportModel = JCAExportOperationTest.getRARExportDataModel(referencedArchiveProjectName, referencedArchiveDestination, true, true, true);
 				}
 				
-				runAndVerify(referencedArchiveExportModel);
+				//IMPROVE PERFORMENCE: don't need to verify export model again here, its already bean done in other tests
+				runDataModel(referencedArchiveExportModel);
 				
 				referencedProjectsArchiveMap.put(referencedArchiveProjectName, new Path(referencedArchiveDestination));
 			}

diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/JEEExportOperationTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/JEEExportOperationTest.java
index 553ed13..5281cd3 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/JEEExportOperationTest.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/JEEExportOperationTest.java

@@ -88,7 +88,6 @@
 		String archiveName = this.getClass().getSimpleName() + "_" + this.getName() + "_Defaults" + getModuleExtension();
 		String destination = getDataPath(archiveName);
 		
-
 		IDataModel exportModel = getExportDataModel(projectName, destination, false, true, false);
 		runAndVerify(exportModel);
 		
@@ -150,7 +149,8 @@
 		
 		try {
 			IDataModel exportModel = getExportDataModel(projectName, destination, false, true, false);
-			runAndVerify(exportModel);
+			//IMPROVE PERFORMENCE: don't need to verify export model again here, its already bean done in other tests
+			runDataModel(exportModel);
 		
 			IDataModel exportModelOverwrite = getExportDataModel(projectName, destination, false, true, false);
 			IStatus status = exportModelOverwrite.validate();
@@ -171,7 +171,8 @@
 		
 		try {
 			IDataModel exportModel = getExportDataModel(projectName, destination, false, true, true);
-			runAndVerify(exportModel);
+			//IMPROVE PERFORMENCE: don't need to verify export model again here, its already bean done in other tests
+			runDataModel(exportModel);
 			
 			IDataModel exportModelOverwrite = getExportDataModel(projectName, destination, false, true, true);
 			IStatus status = exportModelOverwrite.validate();

diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/JEEImportOperationTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/JEEImportOperationTest.java
index 4286b9e..9c787c2 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/JEEImportOperationTest.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/JEEImportOperationTest.java

@@ -160,7 +160,8 @@
 		try {
 			IDataModel exportModel = getExportDataModel(projectName, exportDestination, exportSource, runBuild, true);
 
-			OperationTestCase.runAndVerify(exportModel);
+			//IMPROVE PERFORMENCE: don't need to verify export model again here, its already bean done in other tests
+			runDataModel(exportModel);
 			
 			importedArchive = JavaEEArchiveUtilities.INSTANCE.openArchive(new Path(importedArchivePath));
 			exportedArchive = JavaEEArchiveUtilities.INSTANCE.openArchive(new Path(exportDestination));

diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/utility/operations/UtilityExportOperationTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/utility/operations/UtilityExportOperationTest.java
index af20534..a775ac8 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/utility/operations/UtilityExportOperationTest.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/utility/operations/UtilityExportOperationTest.java

@@ -47,7 +47,8 @@
 	
     public void testUtilityExport_AddToExisitingEAR12() throws Exception {
     	IDataModel earModel = EARProjectCreationOperationTest.getEARDataModel(EAR_PROJECT_NAME, null, null, null, JavaEEFacetConstants.EAR_12, true);
-    	OperationTestCase.runAndVerify(earModel);
+    	//IMPROVE PERFORMENCE: don't need to verify export model again here, its already bean done in other tests
+		runDataModel(earModel);
     	
     	IDataModel dm = UtilityProjectCreationOperationTest.getUtilityDataModel("cJavaUtility", EAR_PROJECT_NAME);
     	OperationTestCase.runAndVerify(dm);
@@ -57,7 +58,8 @@
     
     public void testUtilityExport_AddToExisitingEAR13() throws Exception {
     	IDataModel earModel = EARProjectCreationOperationTest.getEARDataModel(EAR_PROJECT_NAME, null, null, null, JavaEEFacetConstants.EAR_13, true);
-    	OperationTestCase.runAndVerify(earModel);
+    	//IMPROVE PERFORMENCE: don't need to verify export model again here, its already bean done in other tests
+		runDataModel(earModel);
     	
     	IDataModel dm = UtilityProjectCreationOperationTest.getUtilityDataModel("dJavaUtility", EAR_PROJECT_NAME);
     	OperationTestCase.runAndVerify(dm);
@@ -67,7 +69,8 @@
     
     public void testUtilityExport_AddToExisitingEAR14() throws Exception {
     	IDataModel earModel = EARProjectCreationOperationTest.getEARDataModel(EAR_PROJECT_NAME, null, null, null, JavaEEFacetConstants.EAR_14, true);
-    	OperationTestCase.runAndVerify(earModel);
+    	//IMPROVE PERFORMENCE: don't need to verify export model again here, its already bean done in other tests
+		runDataModel(earModel);
     	
     	IDataModel dm = UtilityProjectCreationOperationTest.getUtilityDataModel("eJavaUtility", EAR_PROJECT_NAME);
     	OperationTestCase.runAndVerify(dm);
@@ -77,7 +80,8 @@
     
     public void testUtilityExport_AddToExisitingEAR5_WithoutDD() throws Exception {
     	IDataModel earModel = EARProjectCreationOperationTest.getEARDataModel(EAR_PROJECT_NAME, null, null, null, JavaEEFacetConstants.EAR_5, false);
-    	OperationTestCase.runAndVerify(earModel);
+    	//IMPROVE PERFORMENCE: don't need to verify export model again here, its already bean done in other tests
+		runDataModel(earModel);
     	
     	IDataModel dm = UtilityProjectCreationOperationTest.getUtilityDataModel("fJavaUtility", EAR_PROJECT_NAME);
     	OperationTestCase.runAndVerify(dm);
@@ -87,7 +91,8 @@
     
     public void testUtilityExport_AddToExisitingEAR5_WithDD() throws Exception {
     	IDataModel earModel = EARProjectCreationOperationTest.getEARDataModel(EAR_PROJECT_NAME, null, null, null, JavaEEFacetConstants.EAR_5, true);
-    	OperationTestCase.runAndVerify(earModel);
+    	//IMPROVE PERFORMENCE: don't need to verify export model again here, its already bean done in other tests
+		runDataModel(earModel);
     	
     	IDataModel dm = UtilityProjectCreationOperationTest.getUtilityDataModel("gJavaUtility", EAR_PROJECT_NAME);
     	OperationTestCase.runAndVerify(dm);

diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/utility/operations/UtilityProjectCreationOperationTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/utility/operations/UtilityProjectCreationOperationTest.java
index c7ff4d1..7b6b907 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/utility/operations/UtilityProjectCreationOperationTest.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/utility/operations/UtilityProjectCreationOperationTest.java

@@ -47,7 +47,8 @@
     
     public void testUtility_AddToExisitingEAR12() throws Exception {
     	IDataModel earModel = EARProjectCreationOperationTest.getEARDataModel("cEAR", null, null, null, JavaEEFacetConstants.EAR_12, true);
-    	OperationTestCase.runAndVerify(earModel);
+    	//IMPROVE PERFORMENCE: don't need to verify export model again here, its already bean done in other tests
+		runDataModel(earModel);
     	
     	IDataModel dm = getUtilityDataModel("cJavaUtility", "cEAR");
     	OperationTestCase.runAndVerify(dm);
@@ -55,7 +56,8 @@
     
     public void testUtility_AddToExisitingEAR13() throws Exception {
     	IDataModel earModel = EARProjectCreationOperationTest.getEARDataModel("dEAR", null, null, null, JavaEEFacetConstants.EAR_13, true);
-    	OperationTestCase.runAndVerify(earModel);
+    	//IMPROVE PERFORMENCE: don't need to verify export model again here, its already bean done in other tests
+		runDataModel(earModel);
     	
     	IDataModel dm = getUtilityDataModel("dJavaUtility", "dEAR");
     	OperationTestCase.runAndVerify(dm);
@@ -63,7 +65,8 @@
     
     public void testUtility_AddToExisitingEAR14() throws Exception {
     	IDataModel earModel = EARProjectCreationOperationTest.getEARDataModel("eEAR", null, null, null, JavaEEFacetConstants.EAR_14, true);
-    	OperationTestCase.runAndVerify(earModel);
+    	//IMPROVE PERFORMENCE: don't need to verify export model again here, its already bean done in other tests
+		runDataModel(earModel);
     	
     	IDataModel dm = getUtilityDataModel("eJavaUtility", "eEAR");
     	OperationTestCase.runAndVerify(dm);
@@ -71,7 +74,8 @@
     
     public void testUtility_AddToExisitingEAR5_WithoutDD() throws Exception {
     	IDataModel earModel = EARProjectCreationOperationTest.getEARDataModel("fEAR", null, null, null, JavaEEFacetConstants.EAR_5, false);
-    	OperationTestCase.runAndVerify(earModel);
+    	//IMPROVE PERFORMENCE: don't need to verify export model again here, its already bean done in other tests
+		runDataModel(earModel);
     	
     	IDataModel dm = getUtilityDataModel("fJavaUtility", "fEAR");
     	OperationTestCase.runAndVerify(dm);
@@ -79,7 +83,8 @@
     
     public void testUtility_AddToExisitingEAR5_WithDD() throws Exception {
     	IDataModel earModel = EARProjectCreationOperationTest.getEARDataModel("gEAR", null, null, null, JavaEEFacetConstants.EAR_5, true);
-    	OperationTestCase.runAndVerify(earModel);
+    	//IMPROVE PERFORMENCE: don't need to verify export model again here, its already bean done in other tests
+		runDataModel(earModel);
     	
     	IDataModel dm = getUtilityDataModel("gJavaUtility", "gEAR");
     	OperationTestCase.runAndVerify(dm);