[293599] JUnits need to be updated to test new versions
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/appclient/operations/AppClientProjectCreationOperationTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/appclient/operations/AppClientProjectCreationOperationTest.java index a823abe..2fc842d 100644 --- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/appclient/operations/AppClientProjectCreationOperationTest.java +++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/appclient/operations/AppClientProjectCreationOperationTest.java
@@ -71,6 +71,12 @@ OperationTestCase.runAndVerify(dm); } + public void testAC60_Defaults() throws Exception { + IDataModel dm = getAppClientCreationDataModel("greatApp", null, JavaEEFacetConstants.APP_CLIENT_6, true, false); + OperationTestCase.runAndVerify(dm); + } + + public void testAC12_NoDefaultClass() throws Exception{ IDataModel dm = getAppClientCreationDataModel("randomApp", null, JavaEEFacetConstants.APP_CLIENT_12, false, true); OperationTestCase.runAndVerify(dm); @@ -91,6 +97,12 @@ OperationTestCase.runAndVerify(dm); } + public void testAC60_NoDefaultClass() throws Exception { + IDataModel dm = getAppClientCreationDataModel("greatApp", null, JavaEEFacetConstants.APP_CLIENT_6, false, false); + OperationTestCase.runAndVerify(dm); + } + + public void testAC12_AddToEAR() throws Exception { IDataModel dm = getAppClientCreationDataModel("fooAppToEar", "someEar", JavaEEFacetConstants.APP_CLIENT_12, true, true); OperationTestCase.runAndVerify(dm); @@ -111,6 +123,12 @@ OperationTestCase.runAndVerify(dm); } + public void testAC60_AddToEAR() throws Exception { + IDataModel dm = getAppClientCreationDataModel("fooAppToEar", "niceEar", JavaEEFacetConstants.APP_CLIENT_6, true, false); + OperationTestCase.runAndVerify(dm); + } + + public void testAC12_InterestingName() throws Exception{ IDataModel dm = getAppClientCreationDataModel("kd3(2k_djfD3", null, JavaEEFacetConstants.APP_CLIENT_12, true, true); OperationTestCase.runAndVerify(dm); @@ -131,6 +149,12 @@ OperationTestCase.runAndVerify(dm); } + public void testAC60_InterestingName() throws Exception{ + IDataModel dm = getAppClientCreationDataModel("ASDbt_23()Gfr2", null, JavaEEFacetConstants.APP_CLIENT_6, true, false); + OperationTestCase.runAndVerify(dm); + } + + public void testAC12_AddToEAR_InterestingName() throws Exception{ IDataModel dm = getAppClientCreationDataModel("kd(32k_djfD)3", "hFdf(8G_Fij))3", JavaEEFacetConstants.APP_CLIENT_12, true, true); OperationTestCase.runAndVerify(dm); @@ -151,6 +175,11 @@ OperationTestCase.runAndVerify(dm); } + public void testAC60_AddToEAR_InterestingName() throws Exception{ + IDataModel dm = getAppClientCreationDataModel("ASDbt_23()Gfr2", "23Sgsd)(_fg4", JavaEEFacetConstants.APP_CLIENT_6, true, false); + OperationTestCase.runAndVerify(dm); + } + public void testAC50_WithDD() throws Exception { IDataModel dm = getAppClientCreationDataModel("insaneApp", null, JavaEEFacetConstants.APP_CLIENT_5, true, true); OperationTestCase.runAndVerify(dm); @@ -171,6 +200,26 @@ OperationTestCase.runAndVerify(dm); } + public void testAC60_WithDD() throws Exception { + IDataModel dm = getAppClientCreationDataModel("freshApp", null, JavaEEFacetConstants.APP_CLIENT_6, true, true); + OperationTestCase.runAndVerify(dm); + } + + public void testAC60_NoDefaultClass_WithDD() throws Exception { + IDataModel dm = getAppClientCreationDataModel("freshApp", null, JavaEEFacetConstants.APP_CLIENT_6, false, true); + OperationTestCase.runAndVerify(dm); + } + + public void testAC60_AddToEAR_WithDD() throws Exception { + IDataModel dm = getAppClientCreationDataModel("tryAddToEARWithDD", "tryEAR", JavaEEFacetConstants.APP_CLIENT_6, true, true); + OperationTestCase.runAndVerify(dm); + } + + public void testAC60_AddToEAR_InterestingName_WithDD() throws Exception { + IDataModel dm = getAppClientCreationDataModel("4vG_s(70)", "RAS_b46j)(a)1", JavaEEFacetConstants.APP_CLIENT_6, true, true); + OperationTestCase.runAndVerify(dm); + } + /** * Creates and returns an Application Client Data Model with the given name and of the given version. * If earName is not null then AppClient will be added to the EAR with earName, and if appropriate @@ -201,9 +250,16 @@ facetModel.setBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD, createDD); - - IDataModel javaFacetModel = facetMap.getFacetDataModel(IJ2EEFacetConstants.JAVA); - javaFacetModel.setProperty(IFacetDataModelProperties.FACET_VERSION, JavaEEFacetConstants.JAVA_5); + + if(version.equals(JavaEEFacetConstants.APP_CLIENT_6)) + { + IDataModel javaFacetModel = facetMap.getFacetDataModel(IJ2EEFacetConstants.JAVA); + javaFacetModel.setProperty(IFacetDataModelProperties.FACET_VERSION, JavaEEFacetConstants.JAVA_6); + } + else{ + IDataModel javaFacetModel = facetMap.getFacetDataModel(IJ2EEFacetConstants.JAVA); + javaFacetModel.setProperty(IFacetDataModelProperties.FACET_VERSION, JavaEEFacetConstants.JAVA_5); + } return dm; }
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/ear/operations/EARProjectCreationOperationTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/ear/operations/EARProjectCreationOperationTest.java index 2a68672..db07568 100644 --- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/ear/operations/EARProjectCreationOperationTest.java +++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/ear/operations/EARProjectCreationOperationTest.java
@@ -55,16 +55,19 @@ private static final String APP_CLIENT_PROJ_13 = "myAppClient_13"; private static final String APP_CLIENT_PROJ_14 = "myAppClient_14"; private static final String APP_CLIENT_PROJ_5 = "myAppClient_5"; + private static final String APP_CLIENT_PROJ_6 = "myAppClient_6"; private static final String EJB_PROJ_11 = "myEJB_11"; private static final String EJB_PROJ_2 = "myEJB_2"; private static final String EJB_PROJ_21 = "myEJB_21"; private static final String EJB_PROJ_3 = "myEJB_3"; + private static final String EJB_PROJ_31 = "myEJB_31"; private static final String WEB_PROJ_22 = "myWeb_22"; private static final String WEB_PROJ_23 = "myWeb_23"; private static final String WEB_PROJ_24 = "myWeb_24"; private static final String WEB_PROJ_25 = "myWeb_25"; + private static final String WEB_PROJ_30 = "myWeb_30"; private static final String CONNECTOR_PROJ_1 = "myConnector_1"; private static final String CONNECTOR_PROJ_15 = "myConnector_15"; @@ -97,6 +100,11 @@ OperationTestCase.runAndVerify(dm); } + public void testEAR60_Defaults() throws Exception{ + IDataModel dm = getEARDataModel("eeEAR", null, null, null, JavaEEFacetConstants.EAR_6, false); + OperationTestCase.runAndVerify(dm); + } + public void testEAR12_ChangedContentDir() throws Exception{ IDataModel dm = getEARDataModel("eEAR", "whosContent", null, null, JavaEEFacetConstants.EAR_12, true); @@ -118,6 +126,11 @@ OperationTestCase.runAndVerify(dm); } + public void testEAR60_ChangedContentDir() throws Exception{ + IDataModel dm = getEARDataModel("iEAR", "herContent", null, null, JavaEEFacetConstants.EAR_6, false); + OperationTestCase.runAndVerify(dm); + } + public void testEAR12_WithDependencies() throws Exception{ IDataModel dm = getEARDataModel("zEAR", null, getJ2EEDependencyList_12(), getJavaDependencyList_12(), JavaEEFacetConstants.EAR_12, true); @@ -139,6 +152,11 @@ OperationTestCase.runAndVerify(dm); } + public void testEAR60_WithDependencies() throws Exception{ + IDataModel dm = getEARDataModel("whyEAR", null, getJ2EEDependencyList_6(), getJavaDependencyList_6(), JavaEEFacetConstants.EAR_6, false); + OperationTestCase.runAndVerify(dm); + } + public void testEAR12_ChangedContentDir_WithDependencies() throws Exception{ IDataModel dm = getEARDataModel("zEAR", "myContent", getJ2EEDependencyList_12(), getJavaDependencyList_12(), JavaEEFacetConstants.EAR_12, true); @@ -160,16 +178,33 @@ OperationTestCase.runAndVerify(dm); } + public void testEAR60_ChangedContentDir_WithDependencies() throws Exception{ + IDataModel dm = getEARDataModel("xyzEAR", "hisContent", getJ2EEDependencyList_6(), getJavaDependencyList_6(), JavaEEFacetConstants.EAR_6, false); + OperationTestCase.runAndVerify(dm); + } + public void testEAR50_Defaults_WithDD() throws Exception{ IDataModel dm = getEARDataModel("myEAR", null, null, null, JavaEEFacetConstants.EAR_5, true); OperationTestCase.runAndVerify(dm); } + public void testEAR60_Defaults_WithDD() throws Exception{ + IDataModel dm = getEARDataModel("mineEAR", null, null, null, JavaEEFacetConstants.EAR_6, true); + OperationTestCase.runAndVerify(dm); + } + + public void testEAR50_ChangedContentDir_WithDD() throws Exception{ IDataModel dm = getEARDataModel("yourEAR", "ourContent", null, null, JavaEEFacetConstants.EAR_5, true); OperationTestCase.runAndVerify(dm); } + + public void testEAR60_ChangedContentDir_WithDD() throws Exception{ + IDataModel dm = getEARDataModel("thatEAR", "thatContent", null, null, JavaEEFacetConstants.EAR_6, true); + OperationTestCase.runAndVerify(dm); + } + /* public void testEAR50_WithDependencies_WithDD() throws Exception{ IDataModel dm = getEARDataModel("anEAR", null, getJ2EEDependencyList_5(), getJavaDependencyList_5(), JavaEEFacetConstants.EAR_5, true); @@ -326,4 +361,32 @@ public static List getJavaDependencyList_5() { return Collections.emptyList(); } + + public static List getJ2EEDependencyList_6() throws Exception { + getJ2EEDependencyList_5(); + List dependencies = new ArrayList(); + + List<IDataModel> models = new ArrayList<IDataModel>(); + + models.add(AppClientProjectCreationOperationTest.getAppClientCreationDataModel(APP_CLIENT_PROJ_6, null, JavaEEFacetConstants.APP_CLIENT_6, true, false)); + models.add(AppClientProjectCreationOperationTest.getAppClientCreationDataModel(APP_CLIENT_PROJ_6 + "_WithDD", null, JavaEEFacetConstants.APP_CLIENT_6, true, true)); + + models.add(EJBProjectCreationOperationTest.getEJBDataModel(EJB_PROJ_31, null, null, null, JavaEEFacetConstants.EJB_31, false)); + models.add(EJBProjectCreationOperationTest.getEJBDataModel(EJB_PROJ_31 + "_WithDD", null, null, null, JavaEEFacetConstants.EJB_31, true)); + + models.add(WebProjectCreationOperationTest.getWebDataModel(WEB_PROJ_30, null, null, null, null, JavaEEFacetConstants.WEB_30, false)); + models.add(WebProjectCreationOperationTest.getWebDataModel(WEB_PROJ_30 + "_WithDD", null, null, null, null, JavaEEFacetConstants.WEB_30, true)); + + for(int i = 0; i < models.size(); i++) { + OperationTestCase.runDataModel(models.get(i)); + } + + dependencies.addAll(Arrays.asList(JavaEEProjectUtilities.getAllProjects())); + + return dependencies; + } + + public static List getJavaDependencyList_6() { + return Collections.emptyList(); + } }
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/WebProjectCreationOperationTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/WebProjectCreationOperationTest.java index 6c0697e..9b88cee 100644 --- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/WebProjectCreationOperationTest.java +++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/WebProjectCreationOperationTest.java
@@ -68,7 +68,13 @@ public void testWeb25_Defaults() throws Exception { IDataModel dm = getWebDataModel("netoWeb", null, null, null, null, JavaEEFacetConstants.WEB_25, false); OperationTestCase.runAndVerify(dm); - } + } + + public void testWeb30_Defaults() throws Exception { + IDataModel dm = getWebDataModel("badWeb", null, null, null, null, JavaEEFacetConstants.WEB_30, false); + OperationTestCase.runAndVerify(dm); + } + public void testWeb22_ChangedContentDir() throws Exception { IDataModel dm = getWebDataModel("goodWeb", null, null, "myAwesomeContentDir", null, JavaEEFacetConstants.WEB_22, true); @@ -90,6 +96,10 @@ OperationTestCase.runAndVerify(dm); } + public void testWeb30_ChangedContentDir() throws Exception { + IDataModel dm = getWebDataModel("madWeb", null, null, "madContent", null, JavaEEFacetConstants.WEB_30, false); + OperationTestCase.runAndVerify(dm); + } public void testWeb22_ChangedJavaSrcDir() throws Exception { IDataModel dm = getWebDataModel("penWeb", null, null, null, "myJavaSrc", JavaEEFacetConstants.WEB_22, true); @@ -111,6 +121,11 @@ OperationTestCase.runAndVerify(dm); } + public void testWeb30_ChangedJavaSrcDir() throws Exception { + IDataModel dm = getWebDataModel("booWeb", null, null, null, "booSrc", JavaEEFacetConstants.WEB_30, false); + OperationTestCase.runAndVerify(dm); + } + public void testWeb22_ChangedContentDir_ChangedJavaSrcDir() throws Exception { IDataModel dm = getWebDataModel("aWeb", null, null, "contentA", "srcHi", JavaEEFacetConstants.WEB_22, true); @@ -132,6 +147,11 @@ OperationTestCase.runAndVerify(dm); } + public void testWeb30_ChangedContentDir_ChangedJavaSrcDir() throws Exception { + IDataModel dm = getWebDataModel("eeWeb", null, null, "contentEE", "srcTry", JavaEEFacetConstants.WEB_30, false); + OperationTestCase.runAndVerify(dm); + } + public void testWeb22_Defaults_WithEAR() throws Exception { IDataModel dm = getWebDataModel("testWeb", "teatEAR", null, null, null, JavaEEFacetConstants.WEB_22, true); @@ -153,6 +173,10 @@ OperationTestCase.runAndVerify(dm); } + public void testWeb30_Defaults_WithEAR() throws Exception { + IDataModel dm = getWebDataModel("badWeb", "badEAR", null, null, null, JavaEEFacetConstants.WEB_30, false); + OperationTestCase.runAndVerify(dm); + } public void testWeb22_ChangedContextRoot_WithEAR() throws Exception { IDataModel dm = getWebDataModel("myWeb", "earMy", "superContextRoot", null, null, JavaEEFacetConstants.WEB_22, true); @@ -174,6 +198,11 @@ OperationTestCase.runAndVerify(dm); } + public void testWeb30_ChangedContextRoot_WithEAR() throws Exception { + IDataModel dm = getWebDataModel("herWeb", "earHer", "herContextRoot", null, null, JavaEEFacetConstants.WEB_30, false); + OperationTestCase.runAndVerify(dm); + } + public void testWeb22_ChangedContentDir_WithEAR() throws Exception { IDataModel dm = getWebDataModel("goodWeb", "aEAR", null, "myAwesomeContentDir", null, JavaEEFacetConstants.WEB_22, true); @@ -195,6 +224,11 @@ OperationTestCase.runAndVerify(dm); } + public void testWeb30_ChangedContentDir_WithEAR() throws Exception { + IDataModel dm = getWebDataModel("madWeb", "eeEAR", null, "madContent", null, JavaEEFacetConstants.WEB_30, false); + OperationTestCase.runAndVerify(dm); + } + public void testWeb22_ChangedJavaSrcDir_WithEAR() throws Exception { IDataModel dm = getWebDataModel("penWeb", "fEAR", null, null, "myJavaSrc", JavaEEFacetConstants.WEB_22, true); @@ -216,6 +250,11 @@ OperationTestCase.runAndVerify(dm); } + public void testWeb30_ChangedJavaSrcDir_WithEAR() throws Exception { + IDataModel dm = getWebDataModel("booWeb", "jjEAR", null, null, "booSrc", JavaEEFacetConstants.WEB_30, false); + OperationTestCase.runAndVerify(dm); + } + public void testWeb22_ChangedContextRoot_ChangedContentDir_WithEAR() throws Exception { IDataModel dm = getWebDataModel("redWeb", "jEAR", "superCR", "content", null, JavaEEFacetConstants.WEB_22, true); @@ -237,6 +276,11 @@ OperationTestCase.runAndVerify(dm); } + public void testWeb30_ChangedContextRoot_ChangedContentDir_WithEAR() throws Exception { + IDataModel dm = getWebDataModel("pinkWeb", "nnEAR", "pinkCR", "pinkContent", null, JavaEEFacetConstants.WEB_30, false); + OperationTestCase.runAndVerify(dm); + } + public void testWeb22_ChangedContextRoot_ChangedJavaSrcDir_WithEAR() throws Exception { IDataModel dm = getWebDataModel("farWeb", "nEAR", "ourCR", null, "superSrc", JavaEEFacetConstants.WEB_22, true); @@ -258,6 +302,11 @@ OperationTestCase.runAndVerify(dm); } + public void testWeb30_ChangedContextRoot_ChangedJavaSrcDir_WithEAR() throws Exception { + IDataModel dm = getWebDataModel("veryfarWeb", "rEAR", "herCR", null, "verybadSrc", JavaEEFacetConstants.WEB_30, false); + OperationTestCase.runAndVerify(dm); + } + public void testWeb22_ChangedContentDir_ChangedJavaSrcDir_WithEAR() throws Exception { IDataModel dm = getWebDataModel("aWeb", "aEAR", null, "contentA", "srcHi", JavaEEFacetConstants.WEB_22, true); @@ -279,6 +328,11 @@ OperationTestCase.runAndVerify(dm); } + public void testWeb30_ChangedContentDir_ChangedJavaSrcDir_WithEAR() throws Exception { + IDataModel dm = getWebDataModel("eeWeb", "eeEAR", null, "contentEE", "srcTry", JavaEEFacetConstants.WEB_30, false); + OperationTestCase.runAndVerify(dm); + } + public void testWeb22_ChangedContextRoot_ChangedContentDir_ChangedJavaSrcDir_WithEAR() throws Exception { IDataModel dm = getWebDataModel("eWeb", "eEAR", "eRoot", "eContDir", "srcE", JavaEEFacetConstants.WEB_22, true); @@ -300,6 +354,10 @@ OperationTestCase.runAndVerify(dm); } + public void testWeb30_ChangedContextRoot_ChangedContentDir_ChangedJavaSrcDir_WithEAR() throws Exception { + IDataModel dm = getWebDataModel("iiWeb", "iiEAR", "iiRoot", "iiContDir", "srgII", JavaEEFacetConstants.WEB_30, false); + OperationTestCase.runAndVerify(dm); + } public void testWeb25_Defaults_WithDD() throws Exception { @@ -382,6 +440,77 @@ OperationTestCase.runAndVerify(dm); } + public void testWeb30_Defaults_WithDD() throws Exception { + IDataModel dm = getWebDataModel("badWeb", null, null, null, null, JavaEEFacetConstants.WEB_30, true); + OperationTestCase.runAndVerify(dm); + } + + public void testWeb30_ChangedContextRoot_WithDD() throws Exception { + IDataModel dm = getWebDataModel("herWeb", null, "herRootOfContext", null, null, JavaEEFacetConstants.WEB_30, true); + OperationTestCase.runAndVerify(dm); + } + + public void testWeb30_ChangedContentDir_WithDD() throws Exception { + IDataModel dm = getWebDataModel("madWeb", null, null, "madContent", null, JavaEEFacetConstants.WEB_30, true); + OperationTestCase.runAndVerify(dm); + } + + public void testWeb30_ChangedContextRoot_ChangedContentDir_WithDD() throws Exception { + IDataModel dm = getWebDataModel("pinkWeb", null, "pinkRC", "tryContent", null, JavaEEFacetConstants.WEB_30, true); + OperationTestCase.runAndVerify(dm); + } + + public void testWeb30_ChangedContextRoot_ChangedJavaSrcDir_WithDD() throws Exception { + IDataModel dm = getWebDataModel("farawayWeb", null, "farawayCR", null, "farSrc", JavaEEFacetConstants.WEB_30, true); + OperationTestCase.runAndVerify(dm); + } + + public void testWeb30_ChangedContentDir_ChangedJavaSrcDir_WithDD() throws Exception { + IDataModel dm = getWebDataModel("eeWeb", null, null, "contentE", "srcTry", JavaEEFacetConstants.WEB_30, true); + OperationTestCase.runAndVerify(dm); + } + + public void testWeb30_Defaults_WithEAR_WithDD() throws Exception { + IDataModel dm = getWebDataModel("badWeb", "badEAR", null, null, null, JavaEEFacetConstants.WEB_30, true); + OperationTestCase.runAndVerify(dm); + } + + public void testWeb30_ChangedContextRoot_WithEAR_WithDD() throws Exception { + IDataModel dm = getWebDataModel("herWeb", "earHer", "herContextRoot", null, null, JavaEEFacetConstants.WEB_30, true); + OperationTestCase.runAndVerify(dm); + } + + public void testWeb30_ChangedContentDir_WithEAR_WithDD() throws Exception { + IDataModel dm = getWebDataModel("madWeb", "eeEAR", null, "madContent", null, JavaEEFacetConstants.WEB_30, true); + OperationTestCase.runAndVerify(dm); + } + + public void testWeb30_ChangedJavaSrcDir_WithEAR_WithDD() throws Exception { + IDataModel dm = getWebDataModel("booWeb", "jjEAR", null, null, "booSrc", JavaEEFacetConstants.WEB_30, true); + OperationTestCase.runAndVerify(dm); + } + + public void testWeb30_ChangedContextRoot_ChangedContentDir_WithEAR_WithDD() throws Exception { + IDataModel dm = getWebDataModel("pinkWeb", "nnEAR", "pinkCR", "pinkContent", null, JavaEEFacetConstants.WEB_30, true); + OperationTestCase.runAndVerify(dm); + } + + public void testWeb30_ChangedContextRoot_ChangedJavaSrcDir_WithEAR_WithDD() throws Exception { + IDataModel dm = getWebDataModel("veryfarWeb", "rEAR", "herCR", null, "verybadSrc", JavaEEFacetConstants.WEB_30, true); + OperationTestCase.runAndVerify(dm); + } + + public void testWeb30_ChangedContentDir_ChangedJavaSrcDir_WithEAR_WithDD() throws Exception { + IDataModel dm = getWebDataModel("eeWeb", "eeEAR", null, "contentEE", "srcTry", JavaEEFacetConstants.WEB_30, true); + OperationTestCase.runAndVerify(dm); + } + + public void testWeb30_ChangedContextRoot_ChangedContentDir_ChangedJavaSrcDir_WithEAR_WithDD() throws Exception { + IDataModel dm = getWebDataModel("iiWeb", "iiEAR", "iiRoot", "iiContDir", "srgII", JavaEEFacetConstants.WEB_30, true); + OperationTestCase.runAndVerify(dm); + } + + /** * Creates and returns a Web Data Model with the given name and of the given version. * Can also be used to specify none default context root, content directory, and/or @@ -428,12 +557,16 @@ facetModel.setStringProperty(IWebFacetInstallDataModelProperties.SOURCE_FOLDER, javaSrcDir); } + facetModel.setBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD, createDD); - facetModel.setBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD, createDD); - + if(version.equals(JavaEEFacetConstants.WEB_30)) { + IDataModel javaFacetModel = facetMap.getFacetDataModel(IJ2EEFacetConstants.JAVA); + javaFacetModel.setProperty(IFacetDataModelProperties.FACET_VERSION, JavaEEFacetConstants.JAVA_6); + } + else{ IDataModel javaFacetModel = facetMap.getFacetDataModel(IJ2EEFacetConstants.JAVA); javaFacetModel.setProperty(IFacetDataModelProperties.FACET_VERSION, JavaEEFacetConstants.JAVA_5); - + } return dm; }
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/web/verifiers/WebProjectCreationDataModelVerifier.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/web/verifiers/WebProjectCreationDataModelVerifier.java index a57900f..154f1cc 100644 --- a/tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/web/verifiers/WebProjectCreationDataModelVerifier.java +++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/web/verifiers/WebProjectCreationDataModelVerifier.java
@@ -65,7 +65,7 @@ @Override protected void verifyDD(Object modelObj) { String version = J2EEProjectUtilities.getJ2EEProjectVersion(project); - if(version.equals(J2EEVersionConstants.VERSION_2_5_TEXT)){ + if(version.equals(J2EEVersionConstants.VERSION_2_5_TEXT) || version.equals(J2EEVersionConstants.VERSION_3_0_TEXT)){ WebApp web = (WebApp)modelObj; Assert.assertEquals("Invalid project version", version, web.getVersion().getLiteral()); } else {
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tets/appclient/verifiers/AppClientProjectCreationDataModelVerifier.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tets/appclient/verifiers/AppClientProjectCreationDataModelVerifier.java index 147e464..dc77adc 100644 --- a/tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tets/appclient/verifiers/AppClientProjectCreationDataModelVerifier.java +++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tets/appclient/verifiers/AppClientProjectCreationDataModelVerifier.java
@@ -57,6 +57,9 @@ if(version.equals(J2EEVersionConstants.VERSION_5_0_TEXT)){ ApplicationClient client = (ApplicationClient)modelObj; Assert.assertEquals("Invalid project version", J2EEVersionConstants.VERSION_5_TEXT, client.getVersion()); + } else if(version.equals(J2EEVersionConstants.VERSION_6_0_TEXT)){ + ApplicationClient client = (ApplicationClient)modelObj; + Assert.assertEquals("Invalid project version", J2EEVersionConstants.VERSION_6_TEXT, client.getVersion()); } else { org.eclipse.jst.j2ee.client.ApplicationClient client = (org.eclipse.jst.j2ee.client.ApplicationClient)modelObj; Assert.assertEquals("Invalid project version", version, client.getVersion());
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tets/ear/verifiers/EARProjectCreationDataModelVerifier.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tets/ear/verifiers/EARProjectCreationDataModelVerifier.java index f6bc293..c5a05ca 100644 --- a/tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tets/ear/verifiers/EARProjectCreationDataModelVerifier.java +++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tets/ear/verifiers/EARProjectCreationDataModelVerifier.java
@@ -54,6 +54,9 @@ if(version.equals(J2EEVersionConstants.VERSION_5_0_TEXT)){ Application ear = (Application)modelObj; Assert.assertEquals("Invalid project version", J2EEVersionConstants.VERSION_5_TEXT, ear.getVersion()); + } else if(version.equals(J2EEVersionConstants.VERSION_6_0_TEXT)){ + Application ear = (Application)modelObj; + Assert.assertEquals("Invalid project version", J2EEVersionConstants.VERSION_6_TEXT, ear.getVersion()); } else { org.eclipse.jst.j2ee.application.Application ear = (org.eclipse.jst.j2ee.application.Application)modelObj; Assert.assertEquals("Invalid project version", version, ear.getVersion());