Attachment #117820 for bug #255270

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 255270
Collapse All | Expand All

Lines 49-55 Link Here

(-)j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/AllTests.java (-1 / +1 lines)
49	addTest(WebProjectCreationOperationTest.suite());	49	addTest(WebProjectCreationOperationTest.suite());
50		50
51	addTest(WebDeployTest.suite());	51	addTest(WebDeployTest.suite());
52	//addTest(StaticWebProjectCreationOperationTest.suite());	52	addTest(StaticWebProjectCreationOperationTest.suite());
53	addTest(AddWebArtifactOperationTest.suite());	53	addTest(AddWebArtifactOperationTest.suite());
54	addTest(UrlPatternTest.suite());	54	addTest(UrlPatternTest.suite());
55	// addTest(WebComponentCreationTest.suite());	55	// addTest(WebComponentCreationTest.suite());




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;


        return new TestSuite(StaticWebProjectCreationOperationTest.class);
    }

	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 testStatic_Defaults() throws Exception{
		IDataModel dm = getStaticWebDataModel("aStaticWeb",null);
		OperationTestCase.runAndVerify(dm);
	} 
    
    public IDataModel getComponentCreationDataModelWithEar() {
    	return null;
    } 
}

Return to bug 255270

Lines 16-21 Link Here

(-)j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/StaticWebProjectCreationOperationTest.java (-14 / +12 lines)
16	import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;	16	import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
17	import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;	17	import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
18	import org.eclipse.wst.common.frameworks.datamodel.IDataModel;	18	import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
		19	import org.eclipse.wst.common.tests.OperationTestCase;
19	import org.eclipse.wst.project.facet.SimpleWebFacetProjectCreationDataModelProvider;	20	import org.eclipse.wst.project.facet.SimpleWebFacetProjectCreationDataModelProvider;
20	import org.eclipse.wtp.j2ee.headless.tests.j2ee.operations.ModuleProjectCreationOperationTest;	21	import org.eclipse.wtp.j2ee.headless.tests.j2ee.operations.ModuleProjectCreationOperationTest;
21		22
Lines 30-49 Link Here
30	return new TestSuite(StaticWebProjectCreationOperationTest.class);	31	return new TestSuite(StaticWebProjectCreationOperationTest.class);
31	}	32	}
32		33
33	/* (non-Javadoc)	34	public static IDataModel getStaticWebDataModel(String projName, String earName){
34	* @see org.eclipse.wtp.j2ee.headless.tests.j2ee.operations.ModuleProjectCreationOperationTest#getProjectCreationDataModel()	35	IDataModel model = DataModelFactory.createDataModel(new SimpleWebFacetProjectCreationDataModelProvider());
35	*/	36
36	public IDataModel getComponentCreationDataModel() {	37	model.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projName);
37	return DataModelFactory.createDataModel(new SimpleWebFacetProjectCreationDataModelProvider());	38
		39	return model;
38	}	40	}
39		41
40	public void createSimpleModule(String componentName) throws Exception {	42
41	IDataModel dataModel = getComponentCreationDataModel();	43	public void testStatic_Defaults() throws Exception{
42	dataModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, componentName);	44	IDataModel dm = getStaticWebDataModel("aStaticWeb",null);
43	runAndVerify(dataModel,false,true);	45	OperationTestCase.runAndVerify(dm);
44	}	46	}
45
46	public IDataModel getComponentCreationDataModelWithEar() {
47	return null;
48	}
49	}	47	}