[330840] WTP-JUNIT_HeaderParserTests.runEAR50Test() assertions should be different for EAR with and whitout deployment descriptor.

tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/HeaderParserTests.java

diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/HeaderParserTests.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/HeaderParserTests.java
index 4059e42..b3eacc3 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/HeaderParserTests.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/HeaderParserTests.java
@@ -47,6 +47,8 @@
 		int modVersion;
 
 		int eeVersion;
+		
+		boolean deploymentDescriptor;
 
 		Class modelObjectInterface;
 
@@ -61,6 +63,11 @@
 			this(fileName, type, modVersion, eeVersion);
 			this.modelObjectInterface = modelTypeClass;
 		}
+		
+		public TestData(String fileName, int type, int modVersion, int eeVersion, Class modelTypeClass,boolean deploymentDescriptor) {
+			this(fileName, type, modVersion, eeVersion,modelTypeClass);
+			this.deploymentDescriptor = deploymentDescriptor;
+		}
 	}
 	
 	public void testNull() throws Exception {
@@ -299,7 +306,7 @@
     	nestedArchiveData.add(new TestData("Web25_WithDD.war", J2EEVersionConstants.WEB_TYPE, J2EEVersionConstants.WEB_2_5_ID, J2EEVersionConstants.JEE_5_0_ID, org.eclipse.jst.javaee.web.WebApp.class));
     	
     	TestData earData = new TestData("EAR5_NoDD.ear", J2EEVersionConstants.APPLICATION_TYPE, J2EEVersionConstants.JEE_5_0_ID, J2EEVersionConstants.JEE_5_0_ID,
-				org.eclipse.jst.javaee.application.Application.class);
+				org.eclipse.jst.javaee.application.Application.class,false);
     	runEAR50Tests(earData, nestedArchiveData);
     }
     
@@ -334,7 +341,7 @@
     	nestedArchiveData.add(new TestData("Web25_WithDD.war", J2EEVersionConstants.WEB_TYPE, J2EEVersionConstants.WEB_2_5_ID, J2EEVersionConstants.JEE_5_0_ID, org.eclipse.jst.javaee.web.WebApp.class));
     
     	TestData earData = new TestData("EAR5_WithDD.ear", J2EEVersionConstants.APPLICATION_TYPE, J2EEVersionConstants.JEE_5_0_ID, J2EEVersionConstants.JEE_5_0_ID,
-				org.eclipse.jst.javaee.application.Application.class);
+				org.eclipse.jst.javaee.application.Application.class,true);
     	runEAR50Tests(earData, nestedArchiveData);
     }
     
@@ -348,9 +355,14 @@
     		earArchive.getArchiveOptions().setOption(JavaEEArchiveUtilities.DISCRIMINATE_EJB_ANNOTATIONS, Boolean.TRUE);
 			JavaEEQuickPeek peek = JavaEEArchiveUtilities.INSTANCE.getJavaEEQuickPeek(earArchive);
 			Assert.assertEquals(earData.fileName + " type", earData.type, peek.getType());
-			Assert.assertEquals(earData.fileName + " mod version", earData.modVersion, peek.getVersion());
-			Assert.assertEquals(earData.fileName + " ee version", earData.eeVersion, peek.getJavaEEVersion());
-			
+			if (earData.deploymentDescriptor){
+				Assert.assertEquals(earData.fileName + " mod version", earData.modVersion, peek.getVersion());
+				Assert.assertEquals(earData.fileName + " ee version", earData.eeVersion, peek.getJavaEEVersion());
+			}
+			else{
+				Assert.assertTrue(earData.fileName + " mod version", peek.getVersion() >= earData.modVersion);
+				Assert.assertTrue(earData.fileName + " ee version", peek.getJavaEEVersion() >= earData.eeVersion);
+			}
 			IArchiveResource innerArchiveResource;
 			IArchive innerArchive = null;
 			for(TestData testData : nestedArchiveData) {