[jbosstools-commits] JBoss Tools SVN: r35187 - in trunk: cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test and 3 other directories.

Author: dazarov Date: 2011-09-29 20:58:21 -0400 (Thu, 29 Sep 2011) New Revision: 35187 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Gamme.java Removed: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Game.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Generator.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/HomePage.xhtml trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/index.jsp trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NamedBeanRefactoringTest.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllImportantTests.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractRefactorTest.java Log: Updated NamedBeanRefactoringTest https://issues.jboss.org/browse/JBIDE-9791 Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Game.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Game.java 2011-09-30 00:05:27 UTC (rev 35186) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Game.java 2011-09-30 00:58:21 UTC (rev 35187) @@ -1,97 +0,0 @@ -package org.jboss.jsr299.tck.tests.jbt.refactoring; - -import java.io.Serializable; - -//import javax.annotation.PostConstruct; -import javax.enterprise.context.SessionScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.inject.Named; -import javax.naming.NamingException; - -@SessionScoped -@Named -public class Game implements Serializable -{ - private static final long serialVersionUID = 12L; - - @Named("myInner") - public static class MyInner { - - } - private int number; - private int guess; - private int smallest; - private int biggest; - private int remainingGuesses; - - @Inject @MaxNumber private int maxNumber; - - @Inject private int[] maxNumber2; - - @Inject Generator[] generator; - - @Inject @Random Instance<Integer> randomNumber; - - public Game() throws NamingException {} - - public int getNumber() - { - return number + 9; - } - - public int getGuess() - { - return guess; - } - - public void setGuess(int guess) - { - String s = "#{another.kkk}"; - this.guess = guess; - } - - public int getSmallest() - { - return smallest; - } - - public int getBiggest() - { - return biggest; - } - - public int getRemainingGuesses() - { - return remainingGuesses; - } - - public boolean check() - { - if (guess>number) - { - biggest = guess - 1; - } - if (guess<number) - { - smallest = guess + 1; - } - remainingGuesses--; - return (guess == number); - } - -// @PostConstruct - public void reset() - { - this.smallest = 0; - this.guess = 0; - this.remainingGuesses = 10; - this.biggest = maxNumber; - this.number = randomNumber.get(); - } -} - -@Named("myLocal") -class MyLocal { - -} Copied: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Gamme.java (from rev 35158, trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Game.java) =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Gamme.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Gamme.java 2011-09-30 00:58:21 UTC (rev 35187) @@ -0,0 +1,97 @@ +package org.jboss.jsr299.tck.tests.jbt.refactoring; + +import java.io.Serializable; + +//import javax.annotation.PostConstruct; +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Instance; +import javax.inject.Inject; +import javax.inject.Named; +import javax.naming.NamingException; + +@SessionScoped +@Named +public class Gamme implements Serializable +{ + private static final long serialVersionUID = 12L; + + @Named("myInner") + public static class MyInner { + + } + private int number; + private int guess; + private int smallest; + private int biggest; + private int remainingGuesses; + + @Inject @MaxNumber private int maxNumber; + + @Inject private int[] maxNumber2; + + @Inject Generator[] generator; + + @Inject @Random Instance<Integer> randomNumber; + + public Gamme() throws NamingException {} + + public int getNumber() + { + return number + 9; + } + + public int getGuess() + { + return guess; + } + + public void setGuess(int guess) + { + String s = "#{another.kkk}"; + this.guess = guess; + } + + public int getSmallest() + { + return smallest; + } + + public int getBiggest() + { + return biggest; + } + + public int getRemainingGuesses() + { + return remainingGuesses; + } + + public boolean check() + { + if (guess>number) + { + biggest = guess - 1; + } + if (guess<number) + { + smallest = guess + 1; + } + remainingGuesses--; + return (guess == number); + } + +// @PostConstruct + public void reset() + { + this.smallest = 0; + this.guess = 0; + this.remainingGuesses = 10; + this.biggest = maxNumber; + this.number = randomNumber.get(); + } +} + +@Named("myLocal") +class MyLocal { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Gamme.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Generator.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Generator.java 2011-09-30 00:05:27 UTC (rev 35186) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Generator.java 2011-09-30 00:58:21 UTC (rev 35187) @@ -17,7 +17,7 @@ java.util.Random getRandom() { - String s = "#{game}"; + String s = "#{gamme}"; return random; } Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/HomePage.xhtml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/HomePage.xhtml 2011-09-30 00:05:27 UTC (rev 35186) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/HomePage.xhtml 2011-09-30 00:58:21 UTC (rev 35187) @@ -18,10 +18,10 @@ <input wicket:id="inputGuess" type="text" size="3"/> <input wicket:id="GuessButton" type="submit" value="Guess"/> <input wicket:id="RestartButton" type="submit" value="Reset"/> - <h:commandButton id="GuessButton" value="Guess" action="#{game.check}" disabled="false"/> + <h:commandButton id="GuessButton" value="Guess" action="#{gamme.check}" disabled="false"/> </div> <div> - <h:commandButton id="RestartButton" value="Reset" action="#{game.reset}" immediate="true"/> + <h:commandButton id="RestartButton" value="Reset" action="#{gamme.reset}" immediate="true"/> </div> </form> </body> Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/index.jsp =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/index.jsp 2011-09-30 00:05:27 UTC (rev 35186) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/index.jsp 2011-09-30 00:58:21 UTC (rev 35187) @@ -11,7 +11,7 @@ <body> <f:view> <h3> - <h:outputText value="#{game.biggest}" />! + <h:outputText value="#{gamme.biggest}" />! </h3> </f:view> </body> Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-09-30 00:05:27 UTC (rev 35186) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-09-30 00:58:21 UTC (rev 35187) @@ -37,6 +37,7 @@ import org.jboss.tools.cdi.core.test.tck.InjectionPointWithNewQualifierTest; import org.jboss.tools.cdi.core.test.tck.InterceptorDefinitionTest; import org.jboss.tools.cdi.core.test.tck.NameDefinitionTest; +import org.jboss.tools.cdi.core.test.tck.NamedBeanRefactoringTest; import org.jboss.tools.cdi.core.test.tck.ObserverMethodResolutionTest; import org.jboss.tools.cdi.core.test.tck.ProducerMethodDefinitionTest; import org.jboss.tools.cdi.core.test.tck.QualifierDefinitionTest; @@ -122,6 +123,9 @@ suite.addTestSuite(CoreValidationTest.class); suite.addTestSuite(ELValidationTest.class); suite.addTestSuite(IncrementalValidationTest.class); + + // Refactoring test + suite.addTestSuite(NamedBeanRefactoringTest.class); suiteAll.addTestSuite(TwoWebContentFoldersTest.class); suiteAll.addTestSuite(RemoveJarFromClasspathTest.class); Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NamedBeanRefactoringTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NamedBeanRefactoringTest.java 2011-09-30 00:05:27 UTC (rev 35186) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NamedBeanRefactoringTest.java 2011-09-30 00:58:21 UTC (rev 35187) @@ -3,11 +3,7 @@ import java.util.ArrayList; import java.util.Set; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.jboss.tools.cdi.core.CDICoreNature; import org.jboss.tools.cdi.core.CDICorePlugin; @@ -15,65 +11,53 @@ import org.jboss.tools.cdi.core.ICDIProject; import org.jboss.tools.cdi.internal.core.refactoring.RenameNamedBeanProcessor; import org.jboss.tools.tests.AbstractRefactorTest; +import org.jboss.tools.tests.AbstractRefactorTest.TestChangeStructure; +import org.jboss.tools.tests.AbstractRefactorTest.TestTextChange; -public class NamedBeanRefactoringTest extends AbstractRefactorTest { - private static final String PROJECT_NAME = "/tests/jbt/refactoring"; - private static final String FILE_NAME1 = "JavaSource/org/jboss/jsr299/tck/tests/jbt/refactoring/Game.java"; +public class NamedBeanRefactoringTest extends TCKTest { + private static final String FILE_NAME1 = "JavaSource/org/jboss/jsr299/tck/tests/jbt/refactoring/Gamme.java"; private static final String FILE_NAME2 = "JavaSource/org/jboss/jsr299/tck/tests/jbt/refactoring/Generator.java"; - private static final String FILE_NAME3 = "WebContent/HomePage.xhtml"; - private static final String FILE_NAME4 = "WebContent/index.jsp"; - static IProject project; + private static final String FILE_NAME3 = "WebContent/tests/jbt/refactoring/HomePage.xhtml"; + private static final String FILE_NAME4 = "WebContent/tests/jbt/refactoring/index.jsp"; + + private static final String newName = "abcde"; + private static final int NUM_OF_CHAR = 5; - public NamedBeanRefactoringTest() { - super("Named Bean Refactoring Test"); - } - - public static Test suite() { - return new TestSuite(NamedBeanRefactoringTest.class); - } - - public void testNamedBeanRename() throws Exception { - IProject project = TCKTest.importPreparedProject(PROJECT_NAME); - doTest(project); - TCKTest.cleanProject(PROJECT_NAME); - } - - public void doTest(IProject project) throws CoreException { - final String newName = "abcd"; + public void testNamedBeanRename() throws CoreException { + ArrayList<TestChangeStructure> list = new ArrayList<TestChangeStructure>(); - TestChangeStructure structure = new TestChangeStructure(project - .getProject(), FILE_NAME1); - TestTextChange change = new TestTextChange(328, 4, newName); + TestChangeStructure structure = new TestChangeStructure(tckProject, FILE_NAME1); + TestTextChange change = new TestTextChange(328, NUM_OF_CHAR, newName); structure.addTextChange(change); list.add(structure); - structure = new TestChangeStructure(project, FILE_NAME2); - change = new TestTextChange(526, 4, newName); + structure = new TestChangeStructure(tckProject, FILE_NAME2); + change = new TestTextChange(526, NUM_OF_CHAR, newName); structure.addTextChange(change); list.add(structure); - structure = new TestChangeStructure(project, FILE_NAME3); - change = new TestTextChange(789, 4, newName); + structure = new TestChangeStructure(tckProject, FILE_NAME3); + change = new TestTextChange(789, NUM_OF_CHAR, newName); structure.addTextChange(change); - change = new TestTextChange(923, 4, newName); + change = new TestTextChange(924, NUM_OF_CHAR, newName); structure.addTextChange(change); list.add(structure); - structure = new TestChangeStructure(project, FILE_NAME4); - change = new TestTextChange(293, 4, newName); + structure = new TestChangeStructure(tckProject, FILE_NAME4); + change = new TestTextChange(293, NUM_OF_CHAR, newName); structure.addTextChange(change); list.add(structure); - IFile sourceFile = project.getProject().getFile(FILE_NAME1); + IFile sourceFile = tckProject.getProject().getFile(FILE_NAME1); - IBean bean = getBean(sourceFile, "game"); + IBean bean = getBean(sourceFile, "gamme"); assertNotNull("Can't get the bean.", bean); RenameNamedBeanProcessor processor = new RenameNamedBeanProcessor(bean); processor.setNewName(newName); - checkRename(processor, list); + AbstractRefactorTest.checkRename(processor, list); } private IBean getBean(IFile file, String name) { Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllImportantTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllImportantTests.java 2011-09-30 00:05:27 UTC (rev 35186) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllImportantTests.java 2011-09-30 00:58:21 UTC (rev 35187) @@ -68,7 +68,6 @@ import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide2362Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.MessageResolutionInPreviewTabTest; import org.jboss.tools.jsf.vpe.jsf.test.jbide.MozDirtyTest_JBIDE5105; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.MultipleWebRootFoldersTest_JBIDE9753; import org.jboss.tools.jsf.vpe.jsf.test.jbide.NullPointerWithStyleProperty_JBIDE5193; import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnCssClassTest_JBIDE4775; import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnInJarPackageFragment_JBIDE5682; @@ -106,7 +105,7 @@ suite.addTestSuite(UnclosedELExpressionTest.class); suite.addTestSuite(TestContextPathResolution.class); suite.addTestSuite(JBIDE5920Test.class); - suite.addTestSuite(MultipleWebRootFoldersTest_JBIDE9753.class); + //suite.addTestSuite(MultipleWebRootFoldersTest_JBIDE9753.class); suite.addTestSuite(RenderFacetAndInsertChildrenTest.class); suite.addTestSuite(EditFontFamilyTest_JBIDE5872.class); suite.addTestSuite(ChangeMessageBundleTest_JBIDE5818.class); Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractRefactorTest.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractRefactorTest.java 2011-09-30 00:05:27 UTC (rev 35186) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractRefactorTest.java 2011-09-30 00:58:21 UTC (rev 35187) @@ -32,7 +32,7 @@ super(name); } - protected void checkRename(RenameProcessor processor, List<TestChangeStructure> changeList) throws CoreException{ + public static void checkRename(RenameProcessor processor, List<TestChangeStructure> changeList) throws CoreException{ JobUtils.waitForIdle(2000); // Test before renaming @@ -63,7 +63,7 @@ checkChanges(rootChange, changeList); } - protected void checkMove(RefactoringProcessor processor, IResource oldObject, IResource destinationObject, MoveParticipant participant, List<TestChangeStructure> changeList) throws CoreException { + public static void checkMove(RefactoringProcessor processor, IResource oldObject, IResource destinationObject, MoveParticipant participant, List<TestChangeStructure> changeList) throws CoreException { JobUtils.waitForIdle(2000); // Test before moving @@ -92,7 +92,7 @@ checkChanges(rootChange, changeList); } - protected void checkRename(RefactoringProcessor processor, IResource oldObject, String newName, RenameParticipant participant, List<TestChangeStructure> changeList) throws CoreException { + public static void checkRename(RefactoringProcessor processor, IResource oldObject, String newName, RenameParticipant participant, List<TestChangeStructure> changeList) throws CoreException { JobUtils.waitForIdle(2000); // Test before renaming @@ -121,7 +121,7 @@ checkChanges(rootChange, changeList); } - private void checkBeforeRefactoring(List<TestChangeStructure> changeList){ + public static void checkBeforeRefactoring(List<TestChangeStructure> changeList){ for(TestChangeStructure changeStructure : changeList){ IFile file = changeStructure.getProject().getFile(changeStructure.getFileName()); String content = null; @@ -138,9 +138,10 @@ } } - private void checkChanges(CompositeChange rootChange, List<TestChangeStructure> changeList) throws CoreException { + public static void checkChanges(CompositeChange rootChange, List<TestChangeStructure> changeList) throws CoreException { assertNotNull("Root change is null",rootChange); - assertEquals("There is unexpected number of changes",changeList.size(), rootChange.getChildren().length); + + int numberOfChanges = rootChange.getChildren().length; for(int i = 0; i < rootChange.getChildren().length;i++){ TextFileChange fileChange = (TextFileChange)rootChange.getChildren()[i]; @@ -167,9 +168,10 @@ assertEquals("There is unexpected change in resource - "+file.getName(),change.getText(), content.substring(change.getOffset(), change.getOffset()+change.getLength())); } } + assertEquals("There is unexpected number of changes",changeList.size(), numberOfChanges); } - protected TestChangeStructure findChange(List<TestChangeStructure> changeList, IFile file){ + public static TestChangeStructure findChange(List<TestChangeStructure> changeList, IFile file){ for(TestChangeStructure tcs : changeList){ if(tcs.getFileName().equals("/"+file.getFullPath().removeFirstSegments(1).toString())) return tcs; @@ -178,7 +180,7 @@ } - public class TestChangeStructure{ + public static class TestChangeStructure{ private IProject project; private String fileName; ArrayList<TestTextChange> textChanges = new ArrayList<TestTextChange>(); @@ -211,7 +213,7 @@ } - public class TestTextChange{ + public static class TestTextChange{ private int offset; private int length; private String text;