Author: dazarov Date: 2007-09-05 12:27:16 -0400 (Wed, 05 Sep 2007) New Revision: 3462 Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.1 trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.2 trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java Log: http://jira.jboss.com/jira/browse/EXIN-337 Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.1 =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.1 2007-09-05 15:42:00 UTC (rev 3461) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.1 2007-09-05 16:27:16 UTC (rev 3462) @@ -2,6 +2,7 @@ <components xmlns="http://jboss.com/products/seam/components" xmlns:core="http://jboss.com/products/seam/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.2.xsd http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.2.xsd"> + <component class="java.lang.Boolean" name="myComponent" scope="page"> <property name="property1">value1</property> <property name="myList"> @@ -12,6 +13,7 @@ <value>map value 1</value> </property> </component> + <component class="java.lang.String" name="myPackage.myStringComponent" scope="application"> <property name="property1">value1</property> <property name="myList"> @@ -22,6 +24,7 @@ <value>map value 1</value> </property> </component> + <core:managed-persistence-context name="myPersistenceContext1"/> <core:resource-bundle> Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.2 =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.2 2007-09-05 15:42:00 UTC (rev 3461) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.2 2007-09-05 16:27:16 UTC (rev 3462) @@ -12,6 +12,18 @@ <value>map value 1</value> </property> </component> + + <component class="java.lang.String" name="myPackage.myTextComponent" scope="application"> + <property name="property1">value1</property> + <property name="myList"> + <value>value1</value> + </property> + <property name="myMap"> + <key>key1</key> + <value>map value 1</value> + </property> + </component> + <core:managed-persistence-context name="myPersistenceContext1"/> <core:resource-bundle> Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2007-09-05 15:42:00 UTC (rev 3461) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2007-09-05 16:27:16 UTC (rev 3462) @@ -69,6 +69,7 @@ public void testComponentView(){ addComponent(); + renameComponent(); deleteComponent(); } @@ -113,6 +114,68 @@ } } + + public void renameComponent(){ + CommonNavigator navigator = getSeamComponentsView(); + navigator.getCommonViewer().expandAll(); + + Tree tree = navigator.getCommonViewer().getTree(); + + ISeamPackage seamPackage = findSeamPackage(tree, "myPackage"); + assertTrue("Package \"myPackage\" not found!",seamPackage!=null); + + if(seamPackage != null){ + ISeamComponent component = findSeamComponent(seamPackage, "myPackage.myStringComponent"); + assertTrue("Component \"myPackage.myStringComponent\" not found!",component!=null); + } + + IFile file1 = project.getFile("WebContent/WEB-INF/components.2"); + assertTrue("Cannot find components.2 in test project", file1 != null && file1.exists()); + + try{ + file.setContents(file1.getContents(), false, false, new NullProgressMonitor()); + }catch(Exception ex){ + JUnitUtils.fail("Cannot read file WebContent/WEB-INF/components.2", ex); + } + + try { + project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor()); + } catch (Exception e) { + JUnitUtils.fail("Cannot build test Project", e); + } + + seamPackage = findSeamPackage(tree, "myPackage"); + assertTrue("Package \"myPackage\" not found!",seamPackage!=null); + + if(seamPackage != null){ + ISeamComponent component = findSeamComponent(seamPackage, "myPackage.myTextComponent"); + assertTrue("Component \"myPackage.myTextComponent\" not found!",component!=null); + } + + IFile file2 = project.getFile("WebContent/WEB-INF/components.3"); + assertTrue("Cannot find components.3 in test project", file2 != null && file2.exists()); + + try{ + file.setContents(file2.getContents(), false, false, new NullProgressMonitor()); + }catch(Exception ex){ + JUnitUtils.fail("Cannot read file WebContent/WEB-INF/components.3", ex); + } + + try { + project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor()); + } catch (Exception e) { + JUnitUtils.fail("Cannot build test Project", e); + } + + seamPackage = findSeamPackage(tree, "myNewPackage"); + assertTrue("Package \"myNewPackage\" not found!",seamPackage!=null); + + if(seamPackage != null){ + ISeamComponent component = findSeamComponent(seamPackage, "myNewPackage.myTextComponent"); + assertTrue("Component \"myNewPackage.myTextComponent\" not found!",component!=null); + } + + } public void deleteComponent(){ CommonNavigator navigator = getSeamComponentsView(); @@ -125,21 +188,21 @@ // showTreeItem(tree.getItem(i),0); // } - ISeamPackage seamPackage = findSeamPackage(tree, "myPackage"); - assertTrue("Package \"myPackage\" not found!",seamPackage!=null); + ISeamPackage seamPackage = findSeamPackage(tree, "myNewPackage"); + assertTrue("Package \"myNewPackage\" not found!",seamPackage!=null); if(seamPackage != null){ - ISeamComponent component = findSeamComponent(seamPackage, "myPackage.myStringComponent"); - assertTrue("Component \"myPackage.myStringComponent\" not found!",component!=null); + ISeamComponent component = findSeamComponent(seamPackage, "myNewPackage.myTextComponent"); + assertTrue("Component \"myNewPackage.myTextComponent\" not found!",component!=null); } - IFile file1 = project.getFile("WebContent/WEB-INF/components.2"); + IFile file1 = project.getFile("WebContent/WEB-INF/components.4"); assertTrue("Cannot find components.2 in test project", file1 != null && file1.exists()); try{ file.setContents(file1.getContents(), false, false, new NullProgressMonitor()); }catch(Exception ex){ - JUnitUtils.fail("Cannot read file WebContent/WEB-INF/components.2", ex); + JUnitUtils.fail("Cannot read file WebContent/WEB-INF/components.4", ex); } try { @@ -159,8 +222,8 @@ // showTreeItem(tree.getItem(i),0); // } - seamPackage = findSeamPackage(tree, "myPackage"); - assertTrue("Package \"myPackage\" found!",seamPackage==null); + seamPackage = findSeamPackage(tree, "myNewPackage"); + assertTrue("Package \"myNewPackage\" found!",seamPackage==null); }