JBoss Tools SVN: r33935 - in trunk/jsf/tests/org.jboss.tools.jsf.ui.test: src/org/jboss/tools/jsf/ui/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-08-15 16:50:49 -0400 (Mon, 15 Aug 2011)
New Revision: 33935
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
Log:
https://issues.jboss.org/browse/JBIDE-9532
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2011-08-15 19:16:05 UTC (rev 33934)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2011-08-15 20:50:49 UTC (rev 33935)
@@ -33,6 +33,7 @@
org.eclipse.jst.standard.schemas,
org.jboss.tools.vpe.ui.palette,
org.eclipse.gef,
- org.eclipse.pde.ui
+ org.eclipse.pde.ui,
+ org.eclipse.wst.validation
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2011-08-15 19:16:05 UTC (rev 33934)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2011-08-15 20:50:49 UTC (rev 33935)
@@ -14,6 +14,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.eclipse.wst.validation.ValidationFramework;
import org.jboss.tools.jsf.jsp.ca.test.CAForCompositeComponentTest;
import org.jboss.tools.jsf.jsp.ca.test.CAForELinStyleTest;
import org.jboss.tools.jsf.jsp.ca.test.CAForIDTest;
@@ -42,6 +43,8 @@
public static Test suite() {
TestSuite suite = new TestSuite("JSF UI tests"); //$NON-NLS-1$
+ ValidationFramework.getDefault().suspendAllValidation(true);
+
suite.addTestSuite(NewJSFProjectTest.class);
suite.addTestSuite(CAForUnclosedELTest.class);
suite.addTestSuite(CAForCompositeComponentTest.class);
14 years, 8 months
JBoss Tools SVN: r33934 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-08-15 15:16:05 -0400 (Mon, 15 Aug 2011)
New Revision: 33934
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java
Log:
Removed System.out
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java 2011-08-15 19:08:35 UTC (rev 33933)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java 2011-08-15 19:16:05 UTC (rev 33934)
@@ -37,12 +37,8 @@
IFile testBeanImpl = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanImpl2.validation");
testBean.setContents(testBeanImpl.getContents(), IFile.FORCE, new NullProgressMonitor());
-System.out.println("START VALIDATING!!!!");
-
TestUtil.validate(testBean);
-System.out.println("END VALIDATING!!!!");
-
AbstractResourceMarkerTest.assertMarkerIsCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7);
testBeanImpl = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanImpl2.java");
14 years, 8 months
JBoss Tools SVN: r33933 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-15 15:08:35 -0400 (Mon, 15 Aug 2011)
New Revision: 33933
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java
Log:
fix for JBoss AS 6.0 label, which is actually "JBoss 6.x Runtime" not "JBoss 6.0 Runtime"
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java 2011-08-15 19:06:42 UTC (rev 33932)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java 2011-08-15 19:08:35 UTC (rev 33933)
@@ -1569,7 +1569,7 @@
* represents item : JBoss Community->JBoss AS 6.0
*/
public static final IServer LABEL = new IServer() {
- public String getName() { return "JBoss AS 6.0";}
+ public String getName() { return "JBoss AS 6.x";}
public List<String> getGroupPath() {
List<String> l = new Vector<String>();
l.add("JBoss Community");
@@ -10584,7 +10584,7 @@
* represents item : JBoss Community->JBoss 6.0 Runtime
*/
public static final IServerRuntime LABEL = new IServerRuntime() {
- public String getName() { return "JBoss 6.0 Runtime";}
+ public String getName() { return "JBoss 6.x Runtime";}
public List<String> getGroupPath() {
List<String> l = new Vector<String>();
l.add("JBoss Community");
14 years, 8 months
JBoss Tools SVN: r33932 - in trunk: cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-08-15 15:06:42 -0400 (Mon, 15 Aug 2011)
New Revision: 33932
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
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/TCKTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java
trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java
Log:
https://issues.jboss.org/browse/JBIDE-9453
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-08-15 18:32:48 UTC (rev 33931)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-08-15 19:06:42 UTC (rev 33932)
@@ -225,7 +225,6 @@
throws ValidationException {
init(project, validationHelper, context, manager, reporter);
displaySubtask(CDIValidationMessages.SEARCHING_RESOURCES, new String[]{project.getName()});
-
if (cdiProject == null) {
return OK_STATUS;
}
@@ -331,6 +330,7 @@
if (cdiProject == null) {
return OK_STATUS;
}
+
displaySubtask(CDIValidationMessages.VALIDATING_PROJECT, new String[] { projectName });
Set<IFile> filesToValidate = new HashSet<IFile>();
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-08-15 18:32:48 UTC (rev 33931)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-08-15 19:06:42 UTC (rev 33932)
@@ -14,6 +14,7 @@
import junit.framework.TestSuite;
import org.eclipse.jdt.internal.core.JavaModelManager;
+import org.eclipse.wst.validation.ValidationFramework;
import org.jboss.tools.cdi.core.test.ca.BeansXmlCATest;
import org.jboss.tools.cdi.core.test.extension.ExtensionFactoryTest;
import org.jboss.tools.cdi.core.test.extension.ExtensionManagerTest;
@@ -68,6 +69,7 @@
public static Test suite() {
// it could be done here because it is not needed to be enabled back
JavaModelManager.getIndexManager().disable();
+ ValidationFramework.getDefault().suspendAllValidation(true);
ValidationExceptionTest.initLogger();
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2011-08-15 18:32:48 UTC (rev 33931)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2011-08-15 19:06:42 UTC (rev 33932)
@@ -76,9 +76,10 @@
try {
tckProject = findTestProject();
if(tckProject==null || !tckProject.exists()) {
- ValidatorManager.setStatus(CoreValidationTest.VALIDATION_STATUS);
+// ValidatorManager.setStatus(CoreValidationTest.VALIDATION_STATUS);
tckProject = importPreparedProject("/");
- TestUtil.waitForValidation();
+ TestUtil._waitForValidation(tckProject);
+// TestUtil.waitForValidation();
}
} catch (Exception e) {
e.printStackTrace();
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java 2011-08-15 18:32:48 UTC (rev 33931)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java 2011-08-15 19:06:42 UTC (rev 33932)
@@ -36,8 +36,13 @@
IFile testBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanImpl2.java");
IFile testBeanImpl = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanImpl2.validation");
testBean.setContents(testBeanImpl.getContents(), IFile.FORCE, new NullProgressMonitor());
+
+System.out.println("START VALIDATING!!!!");
+
TestUtil.validate(testBean);
+System.out.println("END VALIDATING!!!!");
+
AbstractResourceMarkerTest.assertMarkerIsCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7);
testBeanImpl = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanImpl2.java");
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java 2011-08-15 18:32:48 UTC (rev 33931)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java 2011-08-15 19:06:42 UTC (rev 33932)
@@ -1,5 +1,9 @@
package org.jboss.tools.jst.jsp.test;
+import java.lang.reflect.InvocationTargetException;
+
+import junit.framework.TestCase;
+
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IncrementalProjectBuilder;
@@ -8,6 +12,11 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.wst.validation.ValidationFramework;
+import org.eclipse.wst.validation.internal.ConfigurationManager;
+import org.eclipse.wst.validation.internal.FilterUtil;
+import org.eclipse.wst.validation.internal.InternalValidatorManager;
+import org.eclipse.wst.validation.internal.ProjectConfiguration;
+import org.eclipse.wst.validation.internal.RegistryConstants;
import org.eclipse.wst.validation.internal.ValManager;
import org.eclipse.wst.validation.internal.operations.EnabledValidatorsOperation;
import org.eclipse.wst.validation.internal.operations.ValidatorSubsetOperation;
@@ -39,19 +48,19 @@
IProject project = getProject();
if (ValidationFramework.getDefault().isSuspended(project))return;
if (ValManager.getDefault().isDisabled(project))return;
-
+
if (!areValidatorsEnabled()) {
// save some processing time...
return;
}
-
+
final WorkbenchReporter reporter = new WorkbenchReporter(getProject(), progressMonitor) {
public void addMessage(org.eclipse.wst.validation.internal.provisional.core.IValidator validator, org.eclipse.wst.validation.internal.provisional.core.IMessage message) {
super.addMessage(validator, message);
System.out.println(message);
};
};
-
+
try {
// Periodically check if the user has canceled the operation
checkCanceled(reporter);
@@ -68,21 +77,39 @@
ValidationFramework.getDefault().suspendAllValidation(true);
}
}
-
+
public static void validate(IResource resource) throws CoreException {
validate(resource.getProject(), new IResource[] {resource});
}
-
- public static void validate(IProject project, IResource[] resource) throws CoreException {
+
+ public static void validate(IProject project, IResource[] resources) throws CoreException {
+ ValidationFramework.getDefault().suspendAllValidation(true);
project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
ValidationFramework.getDefault().suspendAllValidation(false);
try {
- new ValidatorSubsetOperation(project,"java",resource,false).run(new NullProgressMonitor());
+ new IncrimantalValidatorOperation(project, resources).run(new NullProgressMonitor());
+// new EnabledIncrementalValidatorsOperation(project, resources).run(new NullProgressMonitor());
+// new ValidatorSubsetOperation(project,"java",resource,false).run(new NullProgressMonitor());
+ } catch (OperationCanceledException e) {
+ e.printStackTrace();
+ TestCase.fail(e.getMessage());
+ } catch (InvocationTargetException e) {
+ e.printStackTrace();
+ TestCase.fail(e.getMessage());
} finally {
ValidationFramework.getDefault().suspendAllValidation(true);
}
}
-
+
+ private static class IncrimantalValidatorOperation extends ValidatorSubsetOperation {
+ public IncrimantalValidatorOperation(IProject project, Object[] changedResources) throws InvocationTargetException {
+ super(project, shouldForce(changedResources), RegistryConstants.ATT_RULE_GROUP_DEFAULT, false);
+ ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+ setEnabledValidators(InternalValidatorManager.wrapInSet(prjp.getEnabledIncrementalValidators(true)));
+ setFileDeltas(FilterUtil.getFileDeltas(getEnabledValidators(), changedResources, false));
+ }
+ }
+
public static boolean waitForValidation() throws CoreException{
for (int i = 0; i < 50; i++) {
if(ValidatorManager.getStatus().equals(ValidatorManager.SLEEPING)) {
14 years, 8 months
JBoss Tools SVN: r33931 - in trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean: model and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-15 14:32:48 -0400 (Mon, 15 Aug 2011)
New Revision: 33931
Added:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/impl/FacesConfigDefinition.java
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/build/JSF2ProjectBuilder.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/IJSF2Project.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/impl/AbstractMemberDefinition.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/impl/DefinitionContext.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/impl/JSF2Project.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/scanner/FileSet.java
Log:
JBIDE-8280
https://issues.jboss.org/browse/JBIDE-8280
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/build/JSF2ProjectBuilder.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/build/JSF2ProjectBuilder.java 2011-08-15 17:07:45 UTC (rev 33930)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/build/JSF2ProjectBuilder.java 2011-08-15 18:32:48 UTC (rev 33931)
@@ -42,10 +42,12 @@
import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.plugin.ModelPlugin;
+import org.jboss.tools.common.model.project.ProjectHome;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.jsf.JSFModelPlugin;
import org.jboss.tools.jsf.jsf2.bean.model.JSF2ProjectFactory;
import org.jboss.tools.jsf.jsf2.bean.model.impl.DefinitionContext;
+import org.jboss.tools.jsf.jsf2.bean.model.impl.FacesConfigDefinition;
import org.jboss.tools.jsf.jsf2.bean.model.impl.JSF2Project;
import org.jboss.tools.jsf.jsf2.bean.model.impl.TypeDefinition;
import org.jboss.tools.jsf.jsf2.bean.scanner.FileSet;
@@ -216,6 +218,16 @@
context.addType(f, type.getFullyQualifiedName(), def);
}
}
+ IFile facesConfig = fs.getFacesConfig();
+ if(facesConfig != null) {
+ FacesConfigDefinition def = new FacesConfigDefinition();
+ def.setPath(facesConfig.getFullPath());
+ XModelObject o = EclipseResourceUtil.createObjectForResource(facesConfig);
+ if(o != null) {
+ def.setObject(o);
+ context.setFacesConfig(def);
+ }
+ }
}
class SampleDeltaVisitor implements IResourceDeltaVisitor {
@@ -246,10 +258,12 @@
FileSet fileSet = new FileSet();
IPath[] outs = new IPath[0];
IPath[] srcs = new IPath[0];
+ IPath[] webinfs = new IPath[0];
Set<IPath> visited = new HashSet<IPath>();
public JSF2ResourceVisitor() {
getJavaSourceRoots(getProject());
+ webinfs = ProjectHome.getWebInfPaths(getProject());
}
void getJavaSourceRoots(IProject project) {
@@ -323,6 +337,12 @@
return false;
}
}
+ for (int i = 0; i < webinfs.length; i++) {
+ if(webinfs[i].isPrefixOf(path) && f.getName().equals("faces-config.xml")
+ && path.removeLastSegments(1).equals(webinfs[i])) {
+ fileSet.setFacesConfig(f);
+ }
+ }
Set<IFile> ds = getDependentFiles(path, visited);
if(ds != null) for (IFile d: ds) visit(d);
}
@@ -341,6 +361,11 @@
if(resource == resource.getProject()) {
return true;
}
+ for (IPath webinf: webinfs) {
+ if(webinf.isPrefixOf(path) || path.isPrefixOf(webinf)) {
+ return true;
+ }
+ }
return false;
}
//return true to continue visiting children.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/IJSF2Project.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/IJSF2Project.java 2011-08-15 17:07:45 UTC (rev 33930)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/IJSF2Project.java 2011-08-15 18:32:48 UTC (rev 33931)
@@ -17,14 +17,51 @@
public interface IJSF2Project {
+ /**
+ * Returns all managed beans declared in Java classes with @ManagedBeans annotation
+ *
+ * @return
+ */
public Set<IJSF2ManagedBean> getManagedBeans();
+ /**
+ * Returns JSF2 managed beans declared in resource at given path.
+ *
+ * @param path
+ * @return
+ */
public Set<IJSF2ManagedBean> getManagedBeans(IPath path);
+ /**
+ * Returns JSF2 managed beans with given name.
+ *
+ * @param name
+ * @return
+ */
public Set<IJSF2ManagedBean> getManagedBeans(String name);
+ /**
+ * Returns true, if file /WEB-INF/faces-config.xml exist and declares
+ * metadata-complete="true", otherwise returns false.
+ *
+ * When metadata is complete, all managed beans loaded from annotations are disabled.
+ *
+ * @return
+ */
+ public boolean isMetadataComplete();
+
+ /**
+ * Returns current project.
+ *
+ * @return
+ */
public IProject getProject();
+ /**
+ * Returns set of existing JSF2 projects declared in class path of current project.
+ *
+ * @return
+ */
public Set<? extends IJSF2Project> getUsedProjects();
public void addUsedProject(IJSF2Project project);
@@ -33,10 +70,27 @@
public void removeUsedProject(IJSF2Project project);
+ /**
+ * Cleans from model objects loaded at given path.
+ * @param path
+ */
public void pathRemoved(IPath path);
+ /**
+ * Returns true, if model is fully loaded.
+ *
+ * @return
+ */
public boolean isStorageResolved();
+
+ /**
+ * Fully loads model if was not loaded yet.
+ */
public void resolve();
+
+ /**
+ * Updates model by loaded definitions.
+ */
public void update();
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/impl/AbstractMemberDefinition.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/impl/AbstractMemberDefinition.java 2011-08-15 17:07:45 UTC (rev 33930)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/impl/AbstractMemberDefinition.java 2011-08-15 18:32:48 UTC (rev 33931)
@@ -44,8 +44,6 @@
protected Map<String, AnnotationDeclaration> annotationsByType = new HashMap<String, AnnotationDeclaration>();
protected IResource resource;
- protected ITextSourceReference originalDefinition = null;
-
public AbstractMemberDefinition() {}
protected void setAnnotatable(IAnnotatable member, IType contextType, DefinitionContext context, int flags) {
@@ -57,10 +55,6 @@
}
}
- public void setOriginalDefinition(ITextSourceReference def) {
- originalDefinition = def;
- }
-
public IAnnotatable getMember() {
return member;
}
@@ -126,7 +120,4 @@
return resource;
}
- public ITextSourceReference getOriginalDefinition() {
- return originalDefinition;
- }
}
\ No newline at end of file
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/impl/DefinitionContext.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/impl/DefinitionContext.java 2011-08-15 17:07:45 UTC (rev 33930)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/impl/DefinitionContext.java 2011-08-15 18:32:48 UTC (rev 33931)
@@ -37,6 +37,8 @@
private Map<IPath, Set<String>> resources = new HashMap<IPath, Set<String>>();
private Map<String, TypeDefinition> typeDefinitions = new HashMap<String, TypeDefinition>();
+ FacesConfigDefinition facesConfig = null;
+
private DefinitionContext workingCopy;
private DefinitionContext original;
@@ -49,6 +51,7 @@
if(!clean) {
copy.types.addAll(types);
copy.typeDefinitions.putAll(typeDefinitions);
+ copy.facesConfig = facesConfig;
for (IPath p: resources.keySet()) {
Set<String> set = resources.get(p);
@@ -93,6 +96,13 @@
}
}
+ public void setFacesConfig(FacesConfigDefinition def) {
+ facesConfig = def;
+ if(def != null) {
+ addToParents(def.getPath());
+ }
+ }
+
public void addType(IPath file, String typeName) {
if(file != null) {
Set<String> ts = resources.get(file);
@@ -124,6 +134,7 @@
childPaths.clear();
resources.clear();
types.clear();
+ facesConfig = null;
synchronized (typeDefinitions) {
typeDefinitions.clear();
}
@@ -135,6 +146,9 @@
if(ts != null) for (String t: ts) {
clean(t);
}
+ if(facesConfig != null && path.equals(facesConfig.getPath())) {
+ facesConfig = null;
+ }
Set<IPath> cs = childPaths.get(path);
if(cs != null) {
@@ -227,6 +241,7 @@
resources = workingCopy.resources;
childPaths = workingCopy.childPaths;
typeDefinitions = workingCopy.typeDefinitions;
+ facesConfig = workingCopy.facesConfig;
project.update();
@@ -253,5 +268,8 @@
return typeDefinitions.get(fullyQualifiedName);
}
+ public FacesConfigDefinition getFacesConfig() {
+ return facesConfig;
+ }
}
Added: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/impl/FacesConfigDefinition.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/impl/FacesConfigDefinition.java (rev 0)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/impl/FacesConfigDefinition.java 2011-08-15 18:32:48 UTC (rev 33931)
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.jsf2.bean.model.impl;
+
+import org.eclipse.core.runtime.IPath;
+import org.jboss.tools.common.model.XModelObject;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class FacesConfigDefinition {
+ IPath path;
+ XModelObject facesConfig;
+
+ boolean isMetadataComplete;
+
+ public void setPath(IPath path) {
+ this.path = path;
+ }
+
+ public void setObject(XModelObject facesConfig) {
+ this.facesConfig = facesConfig;
+ isMetadataComplete = "true".equals(facesConfig.getAttributeValue("metadata-complete"));
+ }
+
+ public IPath getPath() {
+ return path;
+ }
+
+ public boolean isMetadataComplete() {
+ return isMetadataComplete;
+ }
+}
Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/impl/FacesConfigDefinition.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/impl/JSF2Project.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/impl/JSF2Project.java 2011-08-15 17:07:45 UTC (rev 33930)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/impl/JSF2Project.java 2011-08-15 18:32:48 UTC (rev 33931)
@@ -65,6 +65,8 @@
private Map<String, Set<IJSF2ManagedBean>> beansByName = new HashMap<String, Set<IJSF2ManagedBean>>();
private Set<IJSF2ManagedBean> namedBeans = new HashSet<IJSF2ManagedBean>();
+ private boolean isMetadataComplete = false;
+
public JSF2Project() {
definitions.setProject(this);
}
@@ -96,6 +98,10 @@
return result;
}
+ public boolean isMetadataComplete() {
+ return isMetadataComplete;
+ }
+
@Override
public IProject getProject() {
return project;
@@ -304,6 +310,10 @@
for (IJSF2ManagedBean bean: beans) {
addBean(bean);
}
+
+ FacesConfigDefinition fc = definitions.getFacesConfig();
+ isMetadataComplete = fc != null && fc.isMetadataComplete();
+
}
public void addBean(IJSF2ManagedBean bean) {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/scanner/FileSet.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/scanner/FileSet.java 2011-08-15 17:07:45 UTC (rev 33930)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/scanner/FileSet.java 2011-08-15 18:32:48 UTC (rev 33931)
@@ -15,6 +15,7 @@
import java.util.Map;
import java.util.Set;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.Flags;
@@ -30,6 +31,8 @@
private Map<IPath, Set<IType>> classes = new HashMap<IPath, Set<IType>>();
private Map<IPath, IPackageDeclaration> packages = new HashMap<IPath, IPackageDeclaration>();
+ private IFile facesConfig = null;
+
public FileSet() {}
public void add(IPath path, IType[] types) throws CoreException {
@@ -98,6 +101,10 @@
packages.put(path, pkg);
}
+ public void setFacesConfig(IFile facesConfig) {
+ this.facesConfig = facesConfig;
+ }
+
public Set<IPath> getAllPaths() {
return allpaths;
}
@@ -122,4 +129,8 @@
return packages;
}
+ public IFile getFacesConfig() {
+ return facesConfig;
+ }
+
}
14 years, 8 months
JBoss Tools SVN: r33930 - trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-15 13:07:45 -0400 (Mon, 15 Aug 2011)
New Revision: 33930
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF
Log:
JBIDE-9510 - if project is unlinked from a repo, it no longer is a recognied module.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF 2011-08-15 16:43:52 UTC (rev 33929)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF 2011-08-15 17:07:45 UTC (rev 33930)
@@ -9,7 +9,8 @@
org.eclipse.core.resources;bundle-version="3.7.100",
org.eclipse.egit;bundle-version="1.1.0",
org.eclipse.egit.core;bundle-version="1.1.0",
- org.eclipse.egit.ui;bundle-version="1.1.0"
+ org.eclipse.egit.ui;bundle-version="1.1.0",
+ org.eclipse.team.core;bundle-version="3.6.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: JBoss by Red Hat
14 years, 8 months
JBoss Tools SVN: r33929 - trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-15 12:43:52 -0400 (Mon, 15 Aug 2011)
New Revision: 33929
Modified:
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-9460 test failures in org.jboss.tools.smooks.ui.bot.test
fixed pom.xml, which results to have 7 errors out of 10 in tests
Modified: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml 2011-08-15 16:35:36 UTC (rev 33928)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml 2011-08-15 16:43:52 UTC (rev 33929)
@@ -23,9 +23,7 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
- <includes>
- <include>org/jboss/tools/smooks/launch/serialize/ObjectSerializerTest.class</include>
- </includes>
+ <useUIThread>false</useUIThread>
</configuration>
</plugin>
</plugins>
14 years, 8 months
JBoss Tools SVN: r33928 - trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/module.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-15 12:35:36 -0400 (Mon, 15 Aug 2011)
New Revision: 33928
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/module/GitProjectModuleFactoryDelegate.java
Log:
JBIDE-9510 - if project is unlinked from a repo, it no longer is a recognied module.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/module/GitProjectModuleFactoryDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/module/GitProjectModuleFactoryDelegate.java 2011-08-15 16:18:55 UTC (rev 33927)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/module/GitProjectModuleFactoryDelegate.java 2011-08-15 16:35:36 UTC (rev 33928)
@@ -14,6 +14,9 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.egit.core.project.RepositoryMapping;
+import org.eclipse.team.core.RepositoryProvider;
+import org.eclipse.team.internal.core.IRepositoryProviderListener;
+import org.eclipse.team.internal.core.RepositoryProviderManager;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.model.IModuleResource;
import org.eclipse.wst.server.core.model.ModuleDelegate;
@@ -50,6 +53,20 @@
}
};
ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceListener, IResourceChangeEvent.POST_CHANGE | IResourceChangeEvent.PRE_DELETE);
+ RepositoryProviderManager.getInstance().addListener(new IRepositoryProviderListener() {
+ public void providerUnmapped(IProject project) {
+ if( moduleIdToModule != null ) {
+ IModule mod = moduleIdToModule.get(project.getName());
+ if( mod != null ) {
+ moduleIdToModule.remove(project.getName());
+ moduleToDelegate.remove(mod);
+ }
+ }
+ }
+ public void providerMapped(RepositoryProvider provider) {
+ clearCache(provider.getProject());
+ }
+ });
}
protected void incrementChanged(IProject p) {
IModule mod = moduleIdToModule.get(p.getName());
14 years, 8 months
JBoss Tools SVN: r33927 - in trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core: src/org/jboss/ide/eclipse/as/egit/core/module and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-15 12:18:55 -0400 (Mon, 15 Aug 2011)
New Revision: 33927
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/module/GitProjectModuleFactoryDelegate.java
Log:
Initial attempt at trying to get as.egit.core to resolve. JBIDE-9510
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF 2011-08-15 15:01:59 UTC (rev 33926)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF 2011-08-15 16:18:55 UTC (rev 33927)
@@ -9,16 +9,7 @@
org.eclipse.core.resources;bundle-version="3.7.100",
org.eclipse.egit;bundle-version="1.1.0",
org.eclipse.egit.core;bundle-version="1.1.0",
- org.eclipse.egit.core.source;bundle-version="1.0.0",
- org.eclipse.egit.doc;bundle-version="1.1.0",
- org.eclipse.egit.fetchfactory;bundle-version="0.12.0",
- org.eclipse.egit.github.core;bundle-version="1.1.0",
- org.eclipse.egit.github.core.tests;bundle-version="1.1.0",
- org.eclipse.egit.mylyn.ui;bundle-version="1.1.0",
- org.eclipse.egit.mylyn.ui.source;bundle-version="1.0.0",
- org.eclipse.egit.ui;bundle-version="1.1.0",
- org.eclipse.egit.ui.source;bundle-version="1.0.0",
- org.jboss.tools.as.egit.integration;bundle-version="1.0.0"
+ org.eclipse.egit.ui;bundle-version="1.1.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: JBoss by Red Hat
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/module/GitProjectModuleFactoryDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/module/GitProjectModuleFactoryDelegate.java 2011-08-15 15:01:59 UTC (rev 33926)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/module/GitProjectModuleFactoryDelegate.java 2011-08-15 16:18:55 UTC (rev 33927)
@@ -1,28 +1,104 @@
package org.jboss.ide.eclipse.as.egit.core.module;
+import java.util.HashMap;
+
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
import org.eclipse.egit.core.project.RepositoryMapping;
import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.model.IModuleResource;
import org.eclipse.wst.server.core.model.ModuleDelegate;
+import org.eclipse.wst.server.core.util.ModuleFile;
import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate;
public class GitProjectModuleFactoryDelegate extends ProjectModuleFactoryDelegate {
-
+ public static final String FACTORY_ID = "org.jboss.ide.eclipse.as.egit.core.module.gitProjectModuleFactory"; //$NON-NLS-1$
+ public static final String MODULE_TYPE = "jbt.egit"; //$NON-NLS-1$
+ public static final String VERSION = "1.0"; //$NON-NLS-1$
+ private HashMap<String, IModule> moduleIdToModule;
+ private HashMap<IModule, GitProjectModuleDelegate> moduleToDelegate;
+ private IResourceChangeListener resourceListener;
public GitProjectModuleFactoryDelegate() {
- // TODO Auto-generated constructor stub
- System.out.println("blah");
}
+ public void initialize() {
+ moduleIdToModule = new HashMap<String, IModule>();
+ moduleToDelegate = new HashMap<IModule, GitProjectModuleDelegate>();
+ resourceListener = new IResourceChangeListener() {
+ public void resourceChanged(IResourceChangeEvent event) {
+ try {
+ event.getDelta().accept(new IResourceDeltaVisitor() {
+ public boolean visit(IResourceDelta delta) throws CoreException {
+ IResource r = delta.getResource();
+ if( r instanceof IProject ) {
+ incrementChanged((IProject)r);
+ }
+ return !(r instanceof IProject);
+ }
+ });
+ } catch( CoreException ce) {
+ // Um, in what circumstances does this happen? TODO
+ }
+ }
+ };
+ ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceListener, IResourceChangeEvent.POST_CHANGE | IResourceChangeEvent.PRE_DELETE);
+ }
+ protected void incrementChanged(IProject p) {
+ IModule mod = moduleIdToModule.get(p.getName());
+ if( mod != null ) {
+ GitProjectModuleDelegate del = moduleToDelegate.get(mod);
+ del.updateTimestamp();
+ }
+ }
protected IModule createModule(IProject project) {
RepositoryMapping mapping = RepositoryMapping.getMapping(project);
- System.out.println(mapping);
+ if( mapping != null ) {
+ IModule module = createModule(project.getName(), project.getName(), MODULE_TYPE, VERSION, project);
+ moduleIdToModule.put(project.getName(), module);
+ moduleToDelegate.put(module, new GitProjectModuleDelegate(project));
+ return module;
+ }
return null;
}
@Override
public ModuleDelegate getModuleDelegate(IModule module) {
- // TODO Auto-generated method stub
- return null;
+ return moduleToDelegate.get(module);
}
+ public class GitProjectModuleDelegate extends ModuleDelegate {
+ private IProject project;
+ private long lastUpdated = System.currentTimeMillis();
+ public GitProjectModuleDelegate(IProject project) {
+ this.project = project;
+ }
+ public IModuleResource[] members() throws CoreException {
+ return new IModuleResource[]{
+ // This resource will be ignored, but, we need *SOMETHING* to sit here
+ new ModuleFile(project.getName(), new Path("/"), lastUpdated)
+ };
+ }
+
+ protected void updateTimestamp() {
+ lastUpdated = System.currentTimeMillis();
+ }
+ @Override
+ public IStatus validate() {
+ return Status.OK_STATUS;
+ }
+
+ @Override
+ public IModule[] getChildModules() {
+ return new IModule[0];
+ }
+ }
}
14 years, 8 months
JBoss Tools SVN: r33926 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test: fix and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2011-08-15 11:01:59 -0400 (Mon, 15 Aug 2011)
New Revision: 33926
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/fix/CDIQuickFixTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIUtil.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java
Log:
Added new cdi bot test and util methods
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-08-15 14:59:11 UTC (rev 33925)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-08-15 15:01:59 UTC (rev 33926)
@@ -36,6 +36,7 @@
* Suite duration: aprox. 3min
*
* @author Lukas Jungmann
+ * @author Jaroslav Jankovic
*/
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/fix/CDIQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/fix/CDIQuickFixTest.java 2011-08-15 14:59:11 UTC (rev 33925)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/fix/CDIQuickFixTest.java 2011-08-15 15:01:59 UTC (rev 33926)
@@ -1,12 +1,9 @@
package org.jboss.tools.cdi.bot.test.fix;
-import java.io.InputStream;
-import java.util.Scanner;
import java.util.logging.Logger;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
-import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
@@ -22,6 +19,8 @@
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.jboss.tools.ui.bot.ext.types.ViewType;
+import org.jboss.tools.ui.bot.ext.view.ProblemsView;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
@@ -37,47 +36,62 @@
@SuiteClasses({ CDIAllBotTests.class })
public class CDIQuickFixTest extends SWTTestExt {
- private static final Logger LOGGER = Logger.getLogger(CDIQuickFixTest.class
- .getName());
+ private static final Logger LOGGER = Logger.getLogger(CDIQuickFixTest.class.getName());
private static final String PROJECT_NAME = "CDIProject";
private static final String PACKAGE_NAME = "org.cdi.test";
private static final String BEAN_NAME = "B1";
+ @Before
+ public void setUp() {
+ eclipse.showView(ViewType.PROJECT_EXPLORER);
+ }
+
@Test
- public void testSerializableQF() {
+ public void testSerializableQF() {
new NewFileWizardAction().run()
.selectTemplate("Web", "Dynamic Web Project").next();
new DynamicWebProjectWizard().setProjectName(PROJECT_NAME).finish();
- util.waitForNonIgnoredJobs();
- SWTBot v = eclipse.showView(ViewType.PROJECT_EXPLORER);
- SWTBotTree tree = v.tree();
+ util.waitForNonIgnoredJobs();
+ SWTBotTree tree = bot.tree();
tree.setFocus();
+
assertTrue("Project " + PROJECT_NAME + " was not created properly.",
SWTEclipseExt.treeContainsItemWithLabel(tree, PROJECT_NAME));
SWTBotTreeItem item = tree.getTreeItem(PROJECT_NAME);
item.expand();
- new CDIUtil().nodeContextMenu(tree, item, "Configure",
- "Add CDI (Context and Dependency Injection) support...")
- .click();
- bot.activeShell().bot().button("OK").click();
- util.waitForNonIgnoredJobs();
+
+ CDIUtil.addCDISupport(tree, item, bot, util);
+
new NewCDIFileWizard(CDIWizardType.BEAN).run().setPackage(PACKAGE_NAME)
.setName(BEAN_NAME).finish();
util.waitForNonIgnoredJobs();
SWTBotEditor ed = bot.editorByTitle(BEAN_NAME + ".java");
- SWTBotEclipseEditor st = ed.toTextEditor();
- st.selectRange(0, 0, st.getText().length());
- InputStream javasrc = CDIQuickFixTest.class
- .getResourceAsStream("/resources/cdi/" + BEAN_NAME + ".java.cdi");
- String code = readStream(javasrc);
- st.setText(code);
- ed.save();
+ assertNotNull("Bean: " + BEAN_NAME + " was not created properly.", ed);
+
+ CDIUtil.copyResourceToClass(ed, CDIQuickFixTest.class
+ .getResourceAsStream("/resources/cdi/" + BEAN_NAME + ".java.cdi"), false);
assertContains("@SessionScoped",ed.toTextEditor().getText());
- }
-
- private String readStream(InputStream is) {
- return new Scanner(is).useDelimiter("\\A").next();
- }
+
+ SWTEclipseExt.showView(bot, ViewType.PROBLEMS);
+ bot.sleep(3 * TIME_1S);
+
+
+ SWTBotTreeItem[] warningTrees = ProblemsView.getFilteredWarningsTreeItems(bot, "Managed bean B1 which",
+ "/" + PROJECT_NAME , BEAN_NAME + ".java", "CDI Problem");
+
+ assertNotNull("Warnings node should contain the expected problem.", warningTrees);
+ assertTrue("Warnings node should contain only one record instead of " + warningTrees.length + " records.",
+ warningTrees.length == 1);
+
+ CDIUtil.resolveQuickFix(bot.tree(), warningTrees[0], bot, util);
+
+ SWTBotEclipseEditor eclEditor = ed.toTextEditor();
+ assertTrue("Quick fix does not resolve issue properly.",
+ eclEditor.getText().contains("import java.io.Serializable;"));
+ warningTrees = ProblemsView.getFilteredWarningsTreeItems(bot, "Managed bean B1 which",
+ "/" + PROJECT_NAME , BEAN_NAME + ".java", "CDI Problem");
+ assertTrue("Warnings should not contain resolved problem.", warningTrees.length == 0);
+ }
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIUtil.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIUtil.java 2011-08-15 14:59:11 UTC (rev 33925)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIUtil.java 2011-08-15 15:01:59 UTC (rev 33926)
@@ -1,15 +1,50 @@
package org.jboss.tools.cdi.bot.test.uiutils.actions;
+import java.io.InputStream;
+import java.util.Scanner;
+
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
import org.eclipse.swtbot.swt.finder.results.Result;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.ui.bot.ext.SWTBotExt;
+import org.jboss.tools.ui.bot.ext.SWTUtilExt;
import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
public class CDIUtil {
+
- public SWTBotMenu nodeContextMenu(final SWTBotTree tree,
+ public static void addCDISupport(final SWTBotTree tree, SWTBotTreeItem item, SWTBotExt bot, SWTUtilExt util) {
+ nodeContextMenu(tree, item, "Configure",
+ "Add CDI (Context and Dependency Injection) support...")
+ .click();
+ bot.activeShell().bot().button("OK").click();
+ bot.sleep(2000);
+ util.waitForNonIgnoredJobs();
+ }
+
+ public static void resolveQuickFix(final SWTBotTree tree, SWTBotTreeItem item, SWTBotExt bot, SWTUtilExt util) {
+ nodeContextMenu(bot.tree(), item, "Quick Fix")
+ .click();
+ bot.activeShell().bot().button("Finish").click();
+ bot.sleep(2000);
+ util.waitForNonIgnoredJobs();
+ }
+
+ public static void copyResourceToClass(SWTBotEditor classEdit,
+ InputStream resource, boolean closeEdit) {
+ SWTBotEclipseEditor st = classEdit.toTextEditor();
+ st.selectRange(0, 0, st.getText().length());
+ String code = readStream(resource);
+ st.setText(code);
+ classEdit.save();
+ if (closeEdit) classEdit.close();
+ }
+
+ public static SWTBotMenu nodeContextMenu(final SWTBotTree tree,
SWTBotTreeItem item, final String... menu) {
assert menu.length > 0;
ContextMenuHelper.prepareTreeItemForContextMenu(tree, item);
@@ -25,5 +60,11 @@
}
});
}
+
+ private static String readStream(InputStream is) {
+ // we don't care about performance in tests too much, so this should be
+ // OK
+ return new Scanner(is).useDelimiter("\\A").next();
+ }
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java 2011-08-15 14:59:11 UTC (rev 33925)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java 2011-08-15 15:01:59 UTC (rev 33926)
@@ -15,9 +15,6 @@
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.eclipse.swtbot.swt.finder.SWTBot;
-import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
-import org.eclipse.swtbot.swt.finder.results.Result;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.cdi.bot.test.uiutils.actions.CDIUtil;
@@ -32,7 +29,6 @@
import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires;
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
import org.jboss.tools.ui.bot.ext.types.ViewType;
import org.junit.After;
import org.junit.Test;
@@ -65,13 +61,7 @@
SWTEclipseExt.treeContainsItemWithLabel(tree, PROJECT_NAME));
SWTBotTreeItem t = tree.getTreeItem(PROJECT_NAME);
t.expand();
-
- // Configure Add CDI Support...
-
- new CDIUtil().nodeContextMenu(tree, t, "Configure",
- "Add CDI (Context and Dependency Injection) support...").click();
- bot.activeShell().bot().button("OK").click();
- util.waitForNonIgnoredJobs();
+ CDIUtil.addCDISupport(tree, t, bot, util);
}
@Test
14 years, 8 months