From jbosstools-commits at lists.jboss.org Fri May 15 12:44:15 2009 Content-Type: multipart/mixed; boundary="===============0688941027301061259==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r15308 - in trunk/seam/tests/org.jboss.tools.seam.core.test: projects/Test1-ear/EarContent and 3 other directories. Date: Fri, 15 May 2009 12:39:14 -0400 Message-ID: --===============0688941027301061259== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dazarov Date: 2009-05-15 12:39:14 -0400 (Fri, 15 May 2009) New Revision: 15308 Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarCo= ntent/test.jsp trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarCo= ntent/test.properties trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbMo= dule/org/domain/Test1/session/TestComponent.java trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbMo= dule/org/domain/Test1/session/TestSeamComponent.java trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebConten= t/test.jsp trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebConten= t/test.properties Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbMo= dule/seam.properties trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam= /core/test/refactoring/SeamComponentRefactoringTest.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam= /core/test/refactoring/SeamRefactoringAllTests.java Log: Tests for https://jira.jboss.org/jira/browse/JBIDE-1077 Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebCo= ntent/test.jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebConte= nt/test.jsp (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebConte= nt/test.jsp 2009-05-15 16:39:14 UTC (rev 15308) @@ -0,0 +1,12 @@ +<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h" %> +<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f" %> + + + + + + + + + = + = Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projec= ts/Test1/WebContent/test.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebCo= ntent/test.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebConte= nt/test.properties (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebConte= nt/test.properties 2009-05-15 16:39:14 UTC (rev 15308) @@ -0,0 +1 @@ +TEST_VALUE =3D This value is #{test.value}! \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projec= ts/Test1/WebContent/test.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/E= arContent/test.jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarC= ontent/test.jsp (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarC= ontent/test.jsp 2009-05-15 16:39:14 UTC (rev 15308) @@ -0,0 +1,12 @@ +<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h" %> +<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f" %> + + + + + + + + + = + = Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projec= ts/Test1-ear/EarContent/test.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/E= arContent/test.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarC= ontent/test.properties (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarC= ontent/test.properties 2009-05-15 16:39:14 UTC (rev 15308) @@ -0,0 +1 @@ +TEST_VALUE =3D This value is #{test.value}! \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projec= ts/Test1-ear/EarContent/test.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/e= jbModule/org/domain/Test1/session/TestComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbM= odule/org/domain/Test1/session/TestComponent.java (= rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbM= odule/org/domain/Test1/session/TestComponent.java 2009-05-15 16:39:14 UTC (= rev 15308) @@ -0,0 +1,22 @@ +package org.domain.Test1.session; + +import org.jboss.seam.annotations.*; + +(a)Name(value=3D"test") +public class TestComponent { + = + String password; + = + public Object getPart(){ + return null; + } + = + public boolean operate(){ + return true; + } + = + public String value(){ + return "Default Value"; + } + +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projec= ts/Test1-ejb/ejbModule/org/domain/Test1/session/TestComponent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/e= jbModule/org/domain/Test1/session/TestSeamComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbM= odule/org/domain/Test1/session/TestSeamComponent.java = (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbM= odule/org/domain/Test1/session/TestSeamComponent.java 2009-05-15 16:39:14 U= TC (rev 15308) @@ -0,0 +1,41 @@ +package org.domain.Test1.session; + +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Logger; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Factory; +import org.jboss.seam.log.Log; +import org.jboss.seam.security.Identity; + + +(a)Name("component") +public class TestSeamComponent +{ + @Logger Log log; + = + @In Identity identity; + = + @In String test; + = + @In("test") boolean flag; + = + @Factory("test") + int getVar(){ + return 2; + }; + = + @Factory + String getTest(){ + return "Test value is #{test.value}!"; + }; + = + public boolean authenticate() + { + log.info("authenticating #0", identity.getUsername()); + //write your authentication logic here, + //return true if the authentication was + //successful, false otherwise + identity.addRole("admin"); + return true; + } +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projec= ts/Test1-ejb/ejbModule/org/domain/Test1/session/TestSeamComponent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ej= b/ejbModule/seam.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbM= odule/seam.properties 2009-05-15 16:38:06 UTC (rev 15307) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbM= odule/seam.properties 2009-05-15 16:39:14 UTC (rev 15308) @@ -0,0 +1 @@ +test.operate =3D Test Component Operation \ No newline at end of file Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/too= ls/seam/core/test/refactoring/SeamComponentRefactoringTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/sea= m/core/test/refactoring/SeamComponentRefactoringTest.java 2009-05-15 16:38:= 06 UTC (rev 15307) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/sea= m/core/test/refactoring/SeamComponentRefactoringTest.java 2009-05-15 16:39:= 14 UTC (rev 15308) @@ -19,9 +19,14 @@ import junit.framework.TestCase; = public class SeamComponentRefactoringTest extends TestCase { - static String warProjectName =3D "SeamWebWarTestProject"; + static String warProjectName =3D "Test1"; + static String earProjectName =3D "Test1-ear"; + static String ejbProjectName =3D "Test1-ejb"; static IProject warProject; + static IProject earProject; + static IProject ejbProject; static ISeamProject seamWarProject; + static ISeamProject seamEjbProject; = public SeamComponentRefactoringTest(){ super("Seam Component Refactoring Test"); @@ -34,62 +39,84 @@ if(seamWarProject=3D=3Dnull) { seamWarProject =3D loadSeamProject(warProject); } + = + if(earProject=3D=3Dnull) { + earProject =3D ProjectImportTestSetup.loadProject(earProjectName); + } + = + if(ejbProject=3D=3Dnull) { + ejbProject =3D ProjectImportTestSetup.loadProject(ejbProjectName); + } + if(seamEjbProject=3D=3Dnull) { + seamEjbProject =3D loadSeamProject(ejbProject); + } } = private ISeamProject loadSeamProject(IProject project) throws CoreExcepti= on { + JobUtils.waitForIdle(); + System.out.println("Project - "+project); ISeamProject seamProject =3D SeamCorePlugin.getSeamProject(project, true= ); assertNotNull("Seam project for " + project.getName() + " is null", seam= Project); - JobUtils.waitForIdle(); + = return seamProject; } = public void testSeamComponentRename() throws CoreException { ArrayList list =3D new ArrayList(); = - TestChangeStructure structure =3D new TestChangeStructure("/src/action/o= rg/domain/SeamWebWarTestProject/session/TestComponent.java", - 113, 6, "\"best\""); + TestChangeStructure structure =3D new TestChangeStructure(ejbProject.get= Project(), "/ejbModule/org/domain/"+warProjectName+"/session/TestComponent.= java", + 89, 6, "\"best\""); list.add(structure); - = + /* structure =3D new TestChangeStructure("/WebContent/WEB-INF/components.xm= l", 2660, 6, "best"); list.add(structure); structure =3D new TestChangeStructure("/WebContent/WEB-INF/components.xm= l", 2756, 4, "best"); list.add(structure); - = - structure =3D new TestChangeStructure("/src/action/org/domain/SeamWebWar= TestProject/session/TestSeamComponent.java", - 413, 0, "(\"best\")"); + */ + structure =3D new TestChangeStructure(ejbProject, "/ejbModule/org/domain= /"+warProjectName+"/session/TestSeamComponent.java", + 420, 11, "@In(\"best\")"); list.add(structure); - structure =3D new TestChangeStructure("/src/action/org/domain/SeamWebWar= TestProject/session/TestSeamComponent.java", - 436, 11, "@In(\"best\")"); + structure =3D new TestChangeStructure(ejbProject, "/ejbModule/org/domain= /"+warProjectName+"/session/TestSeamComponent.java", + 389, 8, "(\"best\")"); list.add(structure); - structure =3D new TestChangeStructure("/src/action/org/domain/SeamWebWar= TestProject/session/TestSeamComponent.java", - 471, 16, "@Factory(\"best\")"); + structure =3D new TestChangeStructure(ejbProject, "/ejbModule/org/domain= /"+warProjectName+"/session/TestSeamComponent.java", + 455, 16, "@Factory(\"best\")"); list.add(structure); - structure =3D new TestChangeStructure("/src/action/org/domain/SeamWebWar= TestProject/session/TestSeamComponent.java", - 545, 0, "(\"best\")"); + structure =3D new TestChangeStructure(ejbProject, "/ejbModule/org/domain= /"+warProjectName+"/session/TestSeamComponent.java", + 529, 8, "(\"best\")"); list.add(structure); - structure =3D new TestChangeStructure("/src/action/org/domain/SeamWebWar= TestProject/session/TestSeamComponent.java", - 597, 4, "best"); + structure =3D new TestChangeStructure(ejbProject, "/ejbModule/org/domain= /"+warProjectName+"/session/TestSeamComponent.java", + 589, 4, "best"); list.add(structure); = - structure =3D new TestChangeStructure("/src/seam.properties", + structure =3D new TestChangeStructure(ejbProject, "/ejbModule/seam.prope= rties", 0, 4, "best"); list.add(structure); = - structure =3D new TestChangeStructure("/WebContent/login.xhtml", - 1033, 4, "best"); + structure =3D new TestChangeStructure(warProject, "/WebContent/test.jsp", + 227, 4, "best"); list.add(structure); = - structure =3D new TestChangeStructure("/WebContent/refactoring_test.jsp", + structure =3D new TestChangeStructure(warProject, "/WebContent/test.prop= erties", + 29, 4, "best"); + list.add(structure); + = + structure =3D new TestChangeStructure(earProject, "/EarContent/test.jsp", 227, 4, "best"); list.add(structure); = - structure =3D new TestChangeStructure("/WebContent/test.properties", + structure =3D new TestChangeStructure(earProject, "/EarContent/test.prop= erties", 29, 4, "best"); list.add(structure); = - renameComponent(seamWarProject, "test", "best", list); + /* + structure =3D new TestChangeStructure("/WebContent/login.xhtml", + 1033, 4, "best"); + list.add(structure); + */ + renameComponent(seamEjbProject, "test", "best", list); } = private void renameComponent(ISeamProject seamProject, String componentNa= me, String newName, List changeList) throws CoreExcept= ion{ @@ -99,7 +126,7 @@ assertNotNull(component); assertNull(seamProject.getComponent(newName)); for(TestChangeStructure changeStructure : changeList){ - IFile file =3D seamProject.getProject().getFile(changeStructure.getFile= Name()); + IFile file =3D changeStructure.getProject().getFile(changeStructure.get= FileName()); String content =3D null; content =3D FileUtil.readStream(file.getContents()); assertNotSame(changeStructure.getText(), content.substring(changeStruct= ure.getOffset(), changeStructure.getOffset()+changeStructure.getLength())); @@ -116,26 +143,33 @@ assertNull(seamProject.getComponent(componentName)); assertNotNull(seamProject.getComponent(newName)); for(TestChangeStructure changeStructure : changeList){ - IFile file =3D seamProject.getProject().getFile(changeStructure.getFile= Name()); + IFile file =3D changeStructure.getProject().getFile(changeStructure.get= FileName()); String content =3D null; content =3D FileUtil.readStream(file.getContents()); + System.out.println("File - "+file.getName()+" offset - "+changeStructur= e.getOffset()+" expected - ["+changeStructure.getText()+"] actual - ["+cont= ent.substring(changeStructure.getOffset(), changeStructure.getOffset()+chan= geStructure.getLength())+"]"); assertEquals(changeStructure.getText(), content.substring(changeStructu= re.getOffset(), changeStructure.getOffset()+changeStructure.getLength())); } } = class TestChangeStructure{ + private IProject project; private String fileName; private int offset; private int length; private String text; = - public TestChangeStructure(String fileName, int offset, int length, Stri= ng text){ + public TestChangeStructure(IProject project, String fileName, int offset= , int length, String text){ + this.project =3D project; this.fileName =3D fileName; this.offset =3D offset; this.length =3D length; this.text =3D text; } = + public IProject getProject(){ + return project; + } + = public String getFileName(){ return fileName; } Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/too= ls/seam/core/test/refactoring/SeamRefactoringAllTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/sea= m/core/test/refactoring/SeamRefactoringAllTests.java 2009-05-15 16:38:06 UT= C (rev 15307) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/sea= m/core/test/refactoring/SeamRefactoringAllTests.java 2009-05-15 16:39:14 UT= C (rev 15308) @@ -28,8 +28,8 @@ new String[]{"RefactoringTestProject-war", "RefactoringTestProject-ejb= ", "RefactoringTestProject-test"})); suite.addTest(new ProjectImportTestSetup(new TestSuite(SeamComponentRefa= ctoringTest.class), "org.jboss.tools.seam.core.test", - new String[]{"projects/SeamWebWarTestProject"}, - new String[]{"SeamWebWarTestProject"})); + new String[]{"projects/Test1","projects/Test1-ear","projects/Test1-ejb= "}, + new String[]{"Test1","Test1-ear","Test1-ejb"})); return suite; } } \ No newline at end of file --===============0688941027301061259==--