[255270] ee6 model providers

diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/AllTests.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/AllTests.java
index 3e42632..a2145a3 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/AllTests.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/AllTests.java

@@ -49,7 +49,7 @@
        addTest(WebProjectCreationOperationTest.suite());
        
        addTest(WebDeployTest.suite());
-       //addTest(StaticWebProjectCreationOperationTest.suite());
+       addTest(StaticWebProjectCreationOperationTest.suite());
        addTest(AddWebArtifactOperationTest.suite());
        addTest(UrlPatternTest.suite());
        // addTest(WebComponentCreationTest.suite());

diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/StaticWebProjectCreationOperationTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/StaticWebProjectCreationOperationTest.java
index bee8392..845fb88 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/StaticWebProjectCreationOperationTest.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/StaticWebProjectCreationOperationTest.java

@@ -16,6 +16,7 @@
 import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
 import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.tests.OperationTestCase;
 import org.eclipse.wst.project.facet.SimpleWebFacetProjectCreationDataModelProvider;
 import org.eclipse.wtp.j2ee.headless.tests.j2ee.operations.ModuleProjectCreationOperationTest;
 
@@ -29,20 +30,17 @@
         return new TestSuite(StaticWebProjectCreationOperationTest.class);
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.wtp.j2ee.headless.tests.j2ee.operations.ModuleProjectCreationOperationTest#getProjectCreationDataModel()
-     */
-    public IDataModel getComponentCreationDataModel() {
-        return DataModelFactory.createDataModel(new SimpleWebFacetProjectCreationDataModelProvider());
+	public static IDataModel getStaticWebDataModel(String projName, String earName){
+    	IDataModel model = DataModelFactory.createDataModel(new SimpleWebFacetProjectCreationDataModelProvider());
+    	
+    	model.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projName);
+    	
+    	return model;
     }
     
-    public void createSimpleModule(String componentName) throws Exception {
-        IDataModel dataModel = getComponentCreationDataModel();
-        dataModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, componentName);
-       runAndVerify(dataModel,false,true);
-    }
-    
-    public IDataModel getComponentCreationDataModelWithEar() {
-    	return null;
-    } 
+
+	public void testStatic_Defaults() throws Exception{
+		IDataModel dm = getStaticWebDataModel("aStaticWeb",null);
+		OperationTestCase.runAndVerify(dm);
+	} 
 }