[jbosstools-commits] JBoss Tools SVN: r8214 - in trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test: wizard and 1 other directory.

Tuesday, 20 May 2008


Author: vrubezhny
Date: 2008-05-20 11:21:45 -0400 (Tue, 20 May 2008)
New Revision: 8214

Modified:
  
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java
  
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/AbstractSeamNewOperationTest.java
  
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12EARNewOperationTest.java
  
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12WARNewOperationTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-2004 Create JUnit tests for New Seam
Action/Form/Conversation/Entity wizards. It should invoke seam-gen and check results of
its work.

Test Cases are created for the Seam 1.2

Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java
===================================================================
---
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java	2008-05-20
14:54:26 UTC (rev 8213)
+++
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java	2008-05-20
15:21:45 UTC (rev 8214)
@@ -23,6 +23,7 @@
 import org.jboss.tools.seam.ui.test.preferences.SeamSettingsPreferencesPageTest;
 import org.jboss.tools.seam.ui.test.view.SeamComponentsViewAllTests;
 import org.jboss.tools.seam.ui.test.wizard.OpenSeamComponentDialogTest;
+import org.jboss.tools.seam.ui.test.wizard.Seam12EARNewOperationTest;
 import org.jboss.tools.seam.ui.test.wizard.Seam12WARNewOperationTest;
 import org.jboss.tools.seam.ui.test.wizard.SeamFormNewWizardTest;
 import org.jboss.tools.seam.ui.test.wizard.SeamProjectNewWizardTest;
@@ -37,6 +38,7 @@
 	public static Test suite() {
 		TestSuite suite = new TestSuite("Seam UI tests");
 
+/*
 		suite.addTestSuite(OpenSeamComponentDialogTest.class);
 		suite.addTest(SeamComponentsViewAllTests.suite());
 		suite.addTestSuite(SeamProjectNewWizardTest.class);
@@ -47,12 +49,25 @@
 		suite.addTestSuite(SeamELContentAssistJbide1676Test.class);
 		suite.addTestSuite(SeamELContentAssistJbide1645Test.class);
 		suite.addTest(new ProjectImportTestSetup(new
TestSuite(SeamSettingsPreferencesPageTest.class),
"org.jboss.tools.seam.ui.test",
"projects/TestSeamSettingsPreferencesPage",
"TestSeamSettingsPreferencesPage"));
-
+*/
+		suite.addTest(new ProjectImportTestSetup(new
TestSuite(Seam12EARNewOperationTest.class),
+					"org.jboss.tools.seam.ui.test",
+					new String[]{"projects/seam_ear", "projects/seam_ear-ejb",
"projects/seam_ear-test"},
+					new String[]{"seam_ear-war", "seam_ear-ejb",
"seam_ear-test"}));
 		suite.addTest(new ProjectImportTestSetup(new
TestSuite(Seam12WARNewOperationTest.class),
 				"org.jboss.tools.seam.ui.test",
 				new String[]{"projects/seam_war", "projects/seam_war-test"},
 				new String[]{"seam_war-war", "seam_war-test"}));
 
+//suite.addTest(new ProjectImportTestSetup(new
TestSuite(Seam20EARNewOperationTest.class),
+//"org.jboss.tools.seam.ui.test",
+//new String[]{"projects/seam_ear", "projects/seam_ear-ejb",
"projects/seam_ear-test"},
+//new String[]{"seam_ear-war", "seam_ear-ejb",
"seam_ear-test"}));
+//suite.addTest(new ProjectImportTestSetup(new
TestSuite(Seam20WARNewOperationTest.class),
+//"org.jboss.tools.seam.ui.test",
+//new String[]{"projects/seam_war", "projects/seam_war-test"},
+//new String[]{"seam_war-war", "seam_war-test"}));
+
 		return suite;
 	}
 }
\ No newline at end of file

Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/AbstractSeamNewOperationTest.java
===================================================================
---
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/AbstractSeamNewOperationTest.java	2008-05-20
14:54:26 UTC (rev 8213)
+++
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/AbstractSeamNewOperationTest.java	2008-05-20
15:21:45 UTC (rev 8214)
@@ -102,13 +102,13 @@
 		assertNotNull("Resource isn't created: " + path, resource);
 		assertTrue("Resource isn't created: " + path, resource.exists());
 
-		IMarker[] markers = null;
+		int maxSevarityMarkersCount = -1;
 		try {
-			markers = resource.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_INFINITE);
+			maxSevarityMarkersCount = resource.findMaxProblemSeverity(IMarker.PROBLEM, false,
IResource.DEPTH_INFINITE);
 		} catch (CoreException e) {
 			JUnitUtils.fail(e.getMessage(), e);
 		}
-		assertFalse("At least one problem markar exists on resource: " + path,
(markers != null && markers.length > 0));
+		assertFalse("At least one problem marker exists on resource: " + path,
(maxSevarityMarkersCount >= 0));
 	}
 
 	
@@ -224,6 +224,8 @@
 		} catch (Exception e) {
 			JUnitUtils.fail(e.getMessage(), e);
 		}
+
+		assertNewFormFilesAreCreatedSuccessfully(registry);
 	}
 	/**
 	 * Test Seam Action for http://jira.jboss.com/jira/browse/JBIDE-2004
@@ -242,6 +244,13 @@
 		registry.createData();
 		registry.fillDataDefaults(SEAM_CONVERSATION_COMPONENT_NAME, getProject().getName());
 		performOperation(CREATE_SEAM_CONVERSATION, registry);
+		try {
+			EditorTestHelper.joinBackgroundActivities();
+		} catch (Exception e) {
+			JUnitUtils.fail(e.getMessage(), e);
+		}
+
+		assertNewConversationFilesAreCreatedSuccessfully(registry);
 	}
 	
 	/**
@@ -258,12 +267,36 @@
 		
 		setUpSeamProjects();
 
-		AdaptableRegistry registry = new AdaptableRegistry();
+		AdaptableRegistry registry = new AdaptableRegistry() {
+			protected void fillDataDefaults(String componentName, String projectName) {
+				super.fillDataDefaults(componentName, projectName);
+				setDefaultValue(IParameter.SEAM_PACKAGE_NAME,
getEntityBeanPackageName(getSeamFacetPreferences(projectName)));
+			}
+
+		};
 		registry.createData();
 		registry.fillDataDefaults(SEAM_ENTITY_COMPONENT_NAME, getProject().getName());
 		performOperation(CREATE_SEAM_ENTITY, registry);
+		try {
+			EditorTestHelper.joinBackgroundActivities();
+		} catch (Exception e) {
+			JUnitUtils.fail(e.getMessage(), e);
+		}
+
+		assertNewEntityFilesAreCreatedSuccessfully(registry);
 	}
-	
+
+	protected IEclipsePreferences getSeamFacetPreferences(String selectedProject) {
+		if(selectedProject!=null && selectedProject.length()>0) {
+			IProject project =
ResourcesPlugin.getWorkspace().getRoot().getProject(selectedProject);
+			if(project!=null) {
+				return SeamCorePlugin.getSeamPreferences(project);
+			}
+		}
+
+		return null;
+	}
+
 	protected String getDefaultPackageName(String selectedProject) {
 		String packageName = "";
 		if(selectedProject!=null && selectedProject.length()>0) {
@@ -339,7 +372,7 @@
 			add(SeamWizardFactory.createSeamMethodNameFieldEditor());
 			add(SeamWizardFactory.createSeamMasterPageNameFieldEditor());	
 			add(SeamWizardFactory.createSeamPageNameFieldEditor());	
-			
+			add(SeamWizardFactory.createSeamEntityClasNameFieldEditor());	
 			IProject rootSeamProject = SeamWizardUtils.getRootSeamProject(getProject());
 			String selectedProject = (rootSeamProject == null) ? "" :
rootSeamProject.getName();
 			String packageName = getDefaultPackageName(selectedProject);
@@ -352,6 +385,7 @@
 			setDefaultValue(IParameter.SEAM_COMPONENT_NAME, valueU); //$NON-NLS-1$
 			setDefaultValue(IParameter.SEAM_LOCAL_INTERFACE_NAME, valueU); //$NON-NLS-1$
 			setDefaultValue(IParameter.SEAM_BEAN_NAME, valueU+"Bean"); //$NON-NLS-1$
+			setDefaultValue(IParameter.SEAM_ENTITY_CLASS_NAME, valueU); //$NON-NLS-1$
 			setDefaultValue(IParameter.SEAM_METHOD_NAME, valueL); //$NON-NLS-1$
 			setDefaultValue(IParameter.SEAM_MASTER_PAGE_NAME, valueL+"List");
 			setDefaultValue(IParameter.SEAM_PAGE_NAME, valueL); //$NON-NLS-1$

Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12EARNewOperationTest.java
===================================================================
---
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12EARNewOperationTest.java	2008-05-20
14:54:26 UTC (rev 8213)
+++
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12EARNewOperationTest.java	2008-05-20
15:21:45 UTC (rev 8214)
@@ -42,7 +42,7 @@
 			earProject = ProjectImportTestSetup.loadProject(SEAM_EAR_PROJECTNAME);
 		}
 		if(earEjbProject==null) {
-			earProject = ProjectImportTestSetup.loadProject(SEAM_EAR_EJB_PROJECTNAME);
+			earEjbProject = ProjectImportTestSetup.loadProject(SEAM_EAR_EJB_PROJECTNAME);
 		}
 		if(testProject==null) {
 			testProject = ProjectImportTestSetup.loadProject(SEAM_EAR_TEST_PROJECTNAME);
@@ -93,52 +93,58 @@
 		String seamLocalInterfaceName = data.getValue(IParameter.SEAM_LOCAL_INTERFACE_NAME);
 		String seamBeanName = data.getValue(IParameter.SEAM_BEAN_NAME);
 
+//
+//		"${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/
+//		${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/
+//		${" + IParameter.SEAM_BEAN_NAME +"}.java", //$NON-NLS-1$ //$NON-NLS-2$
//$NON-NLS-3$ //$NON-NLS-4$
+
+		IResource beanJava = seamProjectSrcActionFolder.findMember(
+				sessionBeanPackagePath + "/" + seamBeanName + ".java");
+		assertResourceIsCreatedAndHasNoProblems(beanJava, 
+				seamProjectSrcActionFolder.toString() + "/" +
+				sessionBeanPackagePath + "/" + seamBeanName + ".java");
+
+//
+//		"${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/
+//		${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/
+//		${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java", //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+
 		IResource localInterfaceJava = seamProjectSrcActionFolder.findMember(
 				sessionBeanPackagePath + "/" + seamLocalInterfaceName +
".java");
 		assertResourceIsCreatedAndHasNoProblems(localInterfaceJava, 
 				seamProjectSrcActionFolder.toString() + "/" +
 				sessionBeanPackagePath + "/" + seamLocalInterfaceName +
".java");
 		
-		IResource beanJava = seamProjectSrcActionFolder.findMember(
-				sessionBeanPackagePath + "/" + seamBeanName + ".java");
-		assertResourceIsCreatedAndHasNoProblems(beanJava, 
-				seamProjectSrcActionFolder.toString() + "/" +
-				sessionBeanPackagePath + "/" + seamBeanName + ".java");
+//				
+//		"${" + IParameter.TEST_SOURCE_FOLDER + "}/
+//		${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/
+//		${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.java", //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 
 		IResource localInterfaceTestJava = testSourceFolder.findMember(
 				testCasesPackagePath + "/" + seamLocalInterfaceName +
"Test.java");
 		assertResourceIsCreatedAndHasNoProblems(localInterfaceTestJava, 
 				testSourceFolder.toString() + "/" +
-				sessionBeanPackagePath + "/" + seamLocalInterfaceName +
".java");
+				testCasesPackagePath + "/" + seamLocalInterfaceName +
"Test.java");
 
+//		"${" + IParameter.TEST_SOURCE_FOLDER + "}/
+//		${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/
+//		${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.xml", //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+
 		IResource localInterfaceTestXml = testSourceFolder.findMember(
 				testCasesPackagePath + "/" + seamLocalInterfaceName +
"Test.xml");
 		assertResourceIsCreatedAndHasNoProblems(localInterfaceTestXml, 
 				testSourceFolder.toString() + "/" +
-				sessionBeanPackagePath + "/" + seamLocalInterfaceName +
".java");
+				testCasesPackagePath + "/" + seamLocalInterfaceName +
"Test.xml");
 
+//		
+//		"${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/
+//		${" + IParameter.SEAM_PAGE_NAME +"}.xhtml",	 //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$
+
 		IResource seamPageNameXhtml = seamProjectWebContentFolder.findMember(
 				seamPageName + ".xhtml");
 		assertResourceIsCreatedAndHasNoProblems(seamPageNameXhtml, 
 				seamProjectWebContentFolder.toString() + "/" +
 				seamPageName + ".xhtml");
-		
-/*		
-		"${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/
-			${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/
-			${" + IParameter.SEAM_BEAN_NAME +"}.java", //$NON-NLS-1$ //$NON-NLS-2$
//$NON-NLS-3$ //$NON-NLS-4$
-		"${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/
-			${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/
-			${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java", //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		"${" + IParameter.TEST_SOURCE_FOLDER + "}/
-			${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/
-			${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.java", //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		"${" + IParameter.TEST_SOURCE_FOLDER + "}/
-			${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/
-			${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.xml", //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		"${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/
-			${" + IParameter.SEAM_PAGE_NAME +"}.xhtml",	 //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$
-*/
 	}
 
 	@Override
@@ -155,34 +161,37 @@
 		String seamLocalInterfaceName = data.getValue(IParameter.SEAM_LOCAL_INTERFACE_NAME);
 		String seamBeanName = data.getValue(IParameter.SEAM_BEAN_NAME);
 
+//
+//		"${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/
+//		${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/
+//		${" + IParameter.SEAM_BEAN_NAME +"}.java", //$NON-NLS-1$ //$NON-NLS-2$
//$NON-NLS-3$ //$NON-NLS-4$
+
 		IResource beanJava = seamProjectSrcActionFolder.findMember(
 				sessionBeanPackagePath + "/" + seamBeanName + ".java");
 		assertResourceIsCreatedAndHasNoProblems(beanJava, 
 				seamProjectSrcActionFolder.toString() + "/" +
 				sessionBeanPackagePath + "/" + seamBeanName + ".java");
-		
+
+//
+//		"${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/
+//		${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/
+//		${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java", //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+
 		IResource localInterfaceJava = seamProjectSrcActionFolder.findMember(
 				sessionBeanPackagePath + "/" + seamLocalInterfaceName +
".java");
 		assertResourceIsCreatedAndHasNoProblems(localInterfaceJava, 
 				seamProjectSrcActionFolder.toString() + "/" +
 				sessionBeanPackagePath + "/" + seamLocalInterfaceName +
".java");
 		
+//		
+//		"${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/
+//		${" + IParameter.SEAM_PAGE_NAME +"}.xhtml",	 //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$
+
 		IResource seamPageNameXhtml = seamProjectWebContentFolder.findMember(
 				seamPageName + ".xhtml");
 		assertResourceIsCreatedAndHasNoProblems(seamPageNameXhtml, 
 				seamProjectWebContentFolder.toString() + "/" +
 				seamPageName + ".xhtml");
-		
-/*		
-		"${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/
-			${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/
-			${" + IParameter.SEAM_BEAN_NAME +"}.java", //$NON-NLS-1$ //$NON-NLS-2$
//$NON-NLS-3$ //$NON-NLS-4$
-		"${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/
-			${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/
-			${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java", //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		"${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/
-			${" + IParameter.SEAM_PAGE_NAME +"}.xhtml",	 //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$
-*/
 	}
 
 	@Override
@@ -201,71 +210,62 @@
 		String seamMasterPageName = data.getValue(IParameter.SEAM_MASTER_PAGE_NAME);
 		String seamEntityClassName = data.getValue(IParameter.SEAM_ENTITY_CLASS_NAME);
 		
+//
+//		"${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/
+//		${" + IParameter.SEAM_PAGE_NAME +"}.xhtml", //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$
+
+		IResource seamPageNameXhtml = seamProjectWebContentFolder.findMember(
+				seamPageName + ".xhtml");
+		assertResourceIsCreatedAndHasNoProblems(seamPageNameXhtml, 
+				seamProjectWebContentFolder.toString() + "/" +
+				seamPageName + ".xhtml");
+
+//
+//		"${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/
+//		${" + IParameter.SEAM_MASTER_PAGE_NAME +"}.xhtml",	 //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$
+
+		IResource seamMasterPageNameXhtml = seamProjectWebContentFolder.findMember(
+				seamMasterPageName + ".xhtml");
+		assertResourceIsCreatedAndHasNoProblems(seamMasterPageNameXhtml, 
+				seamProjectWebContentFolder.toString() + "/" +
+				seamMasterPageName + ".xhtml");
+
+//
+//		"${" + IParameter.SEAM_PROJECT_SRC_MODEL + "}/
+//		${" + ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_PATH + "}/
+//		${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}.java", //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+
 		IResource entityClassJava = seamProjectSrcModelFolder.findMember(
 				entityBeanPackagePath + "/" + seamEntityClassName + ".java");
 		assertResourceIsCreatedAndHasNoProblems(entityClassJava, 
 				seamProjectSrcModelFolder.toString() + "/" +
 				entityBeanPackagePath + "/" + seamEntityClassName + ".java");
 		
+//		
+//		"${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/
+//		${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/
+//		${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}Home.java", //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+
 		IResource entityHomeJava = seamProjectSrcActionFolder.findMember(
 				sessionBeanPackagePath + "/" + seamEntityClassName +
"Home.java");
 		assertResourceIsCreatedAndHasNoProblems(entityHomeJava, 
 				seamProjectSrcActionFolder.toString() + "/" +
 				sessionBeanPackagePath + "/" + seamEntityClassName +
"Home.java");
-		
+
+//
+//		"${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/
+//		${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/
+//		${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}List.java", //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+
 		IResource entityListJava = seamProjectSrcActionFolder.findMember(
 				sessionBeanPackagePath + "/" + seamEntityClassName +
"List.java");
 		assertResourceIsCreatedAndHasNoProblems(entityListJava, 
 				seamProjectSrcActionFolder.toString() + "/" +
 				sessionBeanPackagePath + "/" + seamEntityClassName +
"List.java");
-		
-		IResource seamMasterPageNameXhtml = seamProjectWebContentFolder.findMember(
-				seamMasterPageName + ".xhtml");
-		assertResourceIsCreatedAndHasNoProblems(seamMasterPageNameXhtml, 
-				seamProjectWebContentFolder.toString() + "/" +
-				seamMasterPageName + ".xhtml");
-		
-		IResource seamPageNameXhtml = seamProjectWebContentFolder.findMember(
-				seamPageName + ".xhtml");
-		assertResourceIsCreatedAndHasNoProblems(seamPageNameXhtml, 
-				seamProjectWebContentFolder.toString() + "/" +
-				seamPageName + ".xhtml");
-		
-/*		
-		"${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/
-			${" + IParameter.SEAM_PAGE_NAME +"}.xhtml", //$NON-NLS-1$ //$NON-NLS-2$
//$NON-NLS-3$
-		"${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/
-			${" + IParameter.SEAM_MASTER_PAGE_NAME +"}.xhtml",	 //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$
-		"${" + IParameter.SEAM_PROJECT_SRC_MODEL + "}/
-			${" + ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_PATH + "}/
-			${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}.java", //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		"${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/
-			${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/
-			${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}Home.java", //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		"${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/
-			${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/
-			${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}List.java", //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-*/
 	}
 
 	@Override
 	void assertNewFormFilesAreCreatedSuccessfully(AdaptableRegistry data) {
 		assertNewActionFilesAreCreatedSuccessfully(data);
-/*		
-		"${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/
-			${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/
-			${" + IParameter.SEAM_BEAN_NAME +"}.java", //$NON-NLS-1$ //$NON-NLS-2$
//$NON-NLS-3$ //$NON-NLS-4$
-		"${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/
-			${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/
-			${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java", //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		"${" + IParameter.TEST_SOURCE_FOLDER + "}/
-			${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/
-			${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.java", //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		"${" + IParameter.TEST_SOURCE_FOLDER + "}/
-			${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/
-			${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.xml", //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		"${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/
-			${" + IParameter.SEAM_PAGE_NAME +"}.xhtml",	//$NON-NLS-1$ //$NON-NLS-2$
//$NON-NLS-3$
-*/				
 	}
 }

Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12WARNewOperationTest.java
===================================================================
---
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12WARNewOperationTest.java	2008-05-20
14:54:26 UTC (rev 8213)
+++
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12WARNewOperationTest.java	2008-05-20
15:21:45 UTC (rev 8214)
@@ -132,13 +132,13 @@
 		IContainer seamProjectWebContentFolder = seamPrjSet.getViewsFolder();
 		
 		String seamPageName = data.getValue(IParameter.SEAM_PAGE_NAME);
-		String seamLocalInterfaceName = data.getValue(IParameter.SEAM_LOCAL_INTERFACE_NAME);
-
-		IResource localInterfaceJava = seamProjectSrcActionFolder.findMember(
-				sessionBeanPackagePath + "/" + seamLocalInterfaceName +
".java");
-		assertResourceIsCreatedAndHasNoProblems(localInterfaceJava, 
+		String seamBeanName = data.getValue(IParameter.SEAM_BEAN_NAME);
+		
+		IResource seamBeanJava = seamProjectSrcActionFolder.findMember(
+				sessionBeanPackagePath + "/" + seamBeanName + ".java");
+		assertResourceIsCreatedAndHasNoProblems(seamBeanJava, 
 				seamProjectSrcActionFolder.toString() + "/" +
-				sessionBeanPackagePath + "/" + seamLocalInterfaceName +
".java");
+				sessionBeanPackagePath + "/" + seamBeanName + ".java");
 		
 		IResource seamPageNameXhtml = seamProjectWebContentFolder.findMember(
 				seamPageName + ".xhtml");
@@ -171,6 +171,18 @@
 		String seamMasterPageName = data.getValue(IParameter.SEAM_MASTER_PAGE_NAME);
 		String seamEntityClassName = data.getValue(IParameter.SEAM_ENTITY_CLASS_NAME);
 		
+		IResource seamPageNameXhtml = seamProjectWebContentFolder.findMember(
+				seamPageName + ".xhtml");
+		assertResourceIsCreatedAndHasNoProblems(seamPageNameXhtml, 
+				seamProjectWebContentFolder.toString() + "/" +
+				seamPageName + ".xhtml");
+		
+		IResource seamMasterPageNameXhtml = seamProjectWebContentFolder.findMember(
+				seamMasterPageName + ".xhtml");
+		assertResourceIsCreatedAndHasNoProblems(seamMasterPageNameXhtml, 
+				seamProjectWebContentFolder.toString() + "/" +
+				seamMasterPageName + ".xhtml");
+		
 		IResource entityClassJava = seamProjectSrcModelFolder.findMember(
 				entityBeanPackagePath + "/" + seamEntityClassName + ".java");
 		assertResourceIsCreatedAndHasNoProblems(entityClassJava, 
@@ -189,18 +201,6 @@
 				seamProjectSrcActionFolder.toString() + "/" +
 				sessionBeanPackagePath + "/" + seamEntityClassName +
"List.java");
 		
-		IResource seamMasterPageNameXhtml = seamProjectWebContentFolder.findMember(
-				seamMasterPageName + ".xhtml");
-		assertResourceIsCreatedAndHasNoProblems(seamMasterPageNameXhtml, 
-				seamProjectWebContentFolder.toString() + "/" +
-				seamMasterPageName + ".xhtml");
-		
-		IResource seamPageNameXhtml = seamProjectWebContentFolder.findMember(
-				seamPageName + ".xhtml");
-		assertResourceIsCreatedAndHasNoProblems(seamPageNameXhtml, 
-				seamProjectWebContentFolder.toString() + "/" +
-				seamPageName + ".xhtml");
-		
 /*		
 		"${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/
 			${" + IParameter.SEAM_PAGE_NAME +"}.xhtml", //$NON-NLS-1$ //$NON-NLS-2$
//$NON-NLS-3$


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

[jbosstools-commits] JBoss Tools SVN: r8214 - in trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test: wizard and 1 other directory.