12:19 p.m.
Author: dazarov
Date: 2009-07-01 13:19:09 -0400 (Wed, 01 Jul 2009)
New Revision: 16324
Added:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestContextVariableFactory.java
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestContextVariableOut.java
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/factory.jsp
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/out.jsp
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamContextVariableRefactoringTest.java
Log:
Tests for Rename Seam Context Variable https://jira.jboss.org/jira/browse/JBIDE-1077
Added:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/factory.jsp
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/factory.jsp
(rev 0)
+++
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/factory.jsp 2009-07-01
17:19:09 UTC (rev 16324)
@@ -0,0 +1,13 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<html>
+ <head>
+ <title></title>
+ </head>
+ <body>
+ <f:view>
+ <h:outputText value="Test value is #{abc.value}!" />
+ <h:outputText value="Test value is #{cba.value}!" />
+ </f:view>
+ </body>
+</html>
Property changes on:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/factory.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/out.jsp
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/out.jsp
(rev 0)
+++
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/out.jsp 2009-07-01
17:19:09 UTC (rev 16324)
@@ -0,0 +1,13 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<html>
+ <head>
+ <title></title>
+ </head>
+ <body>
+ <f:view>
+ <h:outputText value="Test value is #{aaa.value}!" />
+ <h:outputText value="Test value is #{ddd.value}!" />
+ </f:view>
+ </body>
+</html>
Property changes on:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/out.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestContextVariableFactory.java
===================================================================
---
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestContextVariableFactory.java
(rev 0)
+++
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestContextVariableFactory.java 2009-07-01
17:19:09 UTC (rev 16324)
@@ -0,0 +1,38 @@
+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;
+
+
+@Name("computer")
+public class TestContextVariableFactory
+{
+ @Logger Log log;
+
+ @In Identity identity;
+
+ @In String main;
+
+ @In("main") boolean flag;
+
+ @Factory("abc")
+ int getVar(){
+ return 2;
+ };
+
+ @Factory
+ String getCba(){
+ return "Test value is #{main.value}!";
+ };
+
+ public boolean calculate()
+ {
+ log.info("authenticating #0", identity.getUsername());
+ identity.addRole("admin");
+ return true;
+ }
+}
Property changes on:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestContextVariableFactory.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestContextVariableOut.java
===================================================================
---
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestContextVariableOut.java
(rev 0)
+++
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestContextVariableOut.java 2009-07-01
17:19:09 UTC (rev 16324)
@@ -0,0 +1,38 @@
+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.Out;
+import org.jboss.seam.log.Log;
+import org.jboss.seam.security.Identity;
+
+
+@Name("computer2")
+public class TestContextVariableFactory
+{
+ @Logger Log log;
+
+ @In Identity identity;
+
+ @In String main2;
+
+ @In("main2") boolean flag;
+
+ @Out("aaa")
+ int getVar(){
+ return 2;
+ };
+
+ @Out
+ String getDdd(){
+ return "Test value is #{main2.value}!";
+ };
+
+ public boolean calculate()
+ {
+ log.info("authenticating #0", identity.getUsername());
+ identity.addRole("admin");
+ return true;
+ }
+}
Property changes on:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestContextVariableOut.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamContextVariableRefactoringTest.java
===================================================================
---
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamContextVariableRefactoringTest.java 2009-07-01
16:21:37 UTC (rev 16323)
+++
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamContextVariableRefactoringTest.java 2009-07-01
17:19:09 UTC (rev 16324)
@@ -10,10 +10,7 @@
import org.eclipse.ltk.core.refactoring.TextFileChange;
import org.eclipse.text.edits.MultiTextEdit;
import org.jboss.tools.common.util.FileUtil;
-import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamProject;
-import
org.jboss.tools.seam.core.test.refactoring.SeamRefactoringTest.TestChangeStructure;
-import org.jboss.tools.seam.core.test.refactoring.SeamRefactoringTest.TestTextChange;
import
org.jboss.tools.seam.internal.core.refactoring.RenameSeamContextVariableProcessor;
import org.jboss.tools.test.util.JobUtils;
@@ -22,13 +19,10 @@
super("Seam Context Variable Refactoring Test");
}
- private void renameContextVariable(ISeamProject seamProject, String fileName, String
variableName, String newName, List<TestChangeStructure> changeList, boolean fromJar)
throws CoreException{
+ private void renameContextVariable(ISeamProject seamProject, String fileName, String
variableName, String newName, List<TestChangeStructure> changeList) throws
CoreException{
JobUtils.waitForIdle(2000);
// Test before renaming
- ISeamComponent component = seamProject.getComponent(variableName);
- assertNotNull("Can't load component " + variableName, component);
- assertNull("There is unexpected component in seam project: " + newName,
seamProject.getComponent(newName));
for(TestChangeStructure changeStructure : changeList){
IFile file = changeStructure.getProject().getFile(changeStructure.getFileName());
String content = null;
@@ -38,11 +32,9 @@
}
}
- assertNotNull("Component " + component.getName() + " does not have java
declaration.", component.getJavaDeclaration());
-
IFile sourceFile = seamProject.getProject().getFile(fileName);
- // Rename Seam Component
+ // Rename Seam Context Variable
RenameSeamContextVariableProcessor processor = new
RenameSeamContextVariableProcessor(sourceFile, variableName);
processor.setNewName(newName);
processor.checkInitialConditions(new NullProgressMonitor());
@@ -67,14 +59,10 @@
// Test results
- if(!fromJar)
- assertNull("There is unexpected component in seam project: " + variableName,
seamProject.getComponent(variableName));
- assertNotNull("Can't load component " + newName,
seamProject.getComponent(newName));
for(TestChangeStructure changeStructure : changeList){
IFile file = changeStructure.getProject().getFile(changeStructure.getFileName());
String content = null;
content = FileUtil.readStream(file.getContents());
- //System.out.println("File - "+file.getName()+" offset -
"+changeStructure.getOffset()+" expected -
["+changeStructure.getText()+"] actual -
["+content.substring(changeStructure.getOffset(),
changeStructure.getOffset()+changeStructure.getLength())+"]");
for(TestTextChange change : changeStructure.getTextChanges()){
assertEquals("There is unexpected change in resource -
"+file.getName(),change.getText(), content.substring(change.getOffset(),
change.getOffset()+change.getLength()));
}
@@ -135,6 +123,74 @@
structure.addTextChange(change);
list.add(structure);
- renameContextVariable(seamEjbProject, "/WebContent/test.jsp",
"test", "best", list, false);
+ renameContextVariable(seamEjbProject, "/WebContent/test.jsp",
"test", "best", list);
}
+
+ public void testSeamContextVariable_Factory1_Rename() throws CoreException {
+ ArrayList<TestChangeStructure> list = new
ArrayList<TestChangeStructure>();
+
+ TestChangeStructure structure = new TestChangeStructure(ejbProject.getProject(),
"/ejbModule/org/domain/"+warProjectName+"/session/TestContextVariableFactory.java");
+ TestTextChange change = new TestTextChange(464, 5, "\"bbc\"");
+ structure.addTextChange(change);
+ list.add(structure);
+
+ structure = new TestChangeStructure(warProject, "/WebContent/factory.jsp");
+ change = new TestTextChange(227, 3, "bbc");
+ structure.addTextChange(change);
+ list.add(structure);
+
+ renameContextVariable(seamEjbProject, "/WebContent/factory.jsp",
"abc", "bbc", list);
+ }
+
+ public void testSeamContextVariable_Factory2_Rename() throws CoreException {
+ ArrayList<TestChangeStructure> list = new
ArrayList<TestChangeStructure>();
+
+ TestChangeStructure structure = new TestChangeStructure(ejbProject.getProject(),
"/ejbModule/org/domain/"+warProjectName+"/session/TestContextVariableFactory.java");
+ TestTextChange change = new TestTextChange(528, 7, "(\"ccc\")");
+ structure.addTextChange(change);
+ list.add(structure);
+
+ structure = new TestChangeStructure(warProject, "/WebContent/factory.jsp");
+ change = new TestTextChange(283, 3, "ccc");
+ structure.addTextChange(change);
+ list.add(structure);
+
+ renameContextVariable(seamEjbProject, "/WebContent/factory.jsp",
"cba", "ccc", list);
+ }
+
+ public void t_estSeamContextVariable_Out1_Rename() throws CoreException {
+ ArrayList<TestChangeStructure> list = new
ArrayList<TestChangeStructure>();
+
+ TestChangeStructure structure = new TestChangeStructure(ejbProject.getProject(),
"/ejbModule/org/domain/"+warProjectName+"/session/TestContextVariableOut.java");
+ TestTextChange change = new TestTextChange(464, 5, "\"bbb\"");
+ structure.addTextChange(change);
+ list.add(structure);
+
+ structure = new TestChangeStructure(warProject, "/WebContent/out.jsp");
+ change = new TestTextChange(227, 3, "bbb");
+ structure.addTextChange(change);
+ list.add(structure);
+
+ renameContextVariable(seamEjbProject, "/WebContent/out.jsp", "aaa",
"bbb", list);
+ }
+
+ public void t_estSeamContextVariable_Out2_Rename() throws CoreException {
+ ArrayList<TestChangeStructure> list = new
ArrayList<TestChangeStructure>();
+
+ TestChangeStructure structure = new TestChangeStructure(ejbProject.getProject(),
"/ejbModule/org/domain/"+warProjectName+"/session/TestContextVariableOut.java");
+ TestTextChange change = new TestTextChange(464, 5, "\"eee\"");
+ structure.addTextChange(change);
+ list.add(structure);
+
+ structure = new TestChangeStructure(warProject, "/WebContent/out.jsp");
+ change = new TestTextChange(227, 3, "eee");
+ structure.addTextChange(change);
+ list.add(structure);
+
+ renameContextVariable(seamEjbProject, "/WebContent/out.jsp", "ddd",
"eee", list);
+ }
+
+ public void testSeamContextVariable_DataModel_Rename() throws CoreException {
+
+ }
}