JBoss Tools SVN: r43566 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-09-10 15:02:15 -0400 (Mon, 10 Sep 2012)
New Revision: 43566
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java
Log:
Added try/catch block to String.replaceAll - dealing with Windows dirnames such as: C:\hudson\workspace\esb.bot.tests.ldimaggi-windows-debug\sources\tests\org.jboss.tools.esb.ui.bot.test\target\work\data\helloworld_file_action
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java 2012-09-10 18:29:15 UTC (rev 43565)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java 2012-09-10 19:02:15 UTC (rev 43566)
@@ -65,6 +65,8 @@
SWTBotTreeItem theProject = bot.tree(0).getTreeItem(projectName).select();
bot.menu("File").menu("Properties").click();
+ bot.sleep(60000l);
+
if (System.getProperty("file.separator").equals("/")) {
baseDir = bot.textWithLabel("Location:").getText() + System.getProperty("file.separator");
}
@@ -73,7 +75,15 @@
//baseDir = bot.textWithLabel("Location:").getText().replaceAll(System.getProperty("file.separator"), System.getProperty("file.separator") + System.getProperty("file.separator")) + System.getProperty("file.separator");
baseDir = bot.textWithLabel("Location:").getText();
System.out.println("DEBUG baseDir = " + bot.textWithLabel("Location:").getText()) ;
- baseDir = bot.textWithLabel("Location:").getText().replaceAll(System.getProperty("file.separator"), "zzz");
+
+ try {
+ baseDir = bot.textWithLabel("Location:").getText().replaceAll(System.getProperty("file.separator"), "zzz");
+ }
+ catch (Exception E) {
+ System.out.println ("replaceAll failing with " + E.getMessage() );
+ }
+
+
}
// if (System.getProperty("file.separator").equals("/")) {
// baseDir = bot.textWithLabel("Location:").getText() + System.getProperty("file.separator");
13 years, 3 months
JBoss Tools SVN: r43565 - trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2012-09-10 14:29:15 -0400 (Mon, 10 Sep 2012)
New Revision: 43565
Modified:
trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/AbstractAsYouTypeValidationTest.java
Log:
JBIDE-12418
Sometimes As-You-Type validation isn't invoked after a Java-String that contains EL is Copy-Pasted in Java editor
JBIDE-12539
In some cases as-you-type validation removes all annotations
JUnit Test Case is fixed
Modified: trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/AbstractAsYouTypeValidationTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/AbstractAsYouTypeValidationTest.java 2012-09-10 18:28:46 UTC (rev 43564)
+++ trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/AbstractAsYouTypeValidationTest.java 2012-09-10 18:29:15 UTC (rev 43565)
@@ -67,6 +67,10 @@
public void openEditor(String fileName) {
this.fileName = fileName;
+ IFile testfile = project.getFile(fileName);
+// System.out.println(testfile.toString() + ": testfile.exists(): " + testfile.exists() + ", testfile.isAccessible(): " + testfile.isAccessible());
+ assertTrue("Test file doesn't exist: " + project.getName() + "/" + fileName,
+ (testfile.exists() && testfile.isAccessible()));
editorPart = WorkbenchUtils.openEditor(project.getName()
+ "/" + fileName); //$NON-NLS-1$
obtainEditor(editorPart);
13 years, 3 months
JBoss Tools SVN: r43564 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-09-10 14:28:46 -0400 (Mon, 10 Sep 2012)
New Revision: 43564
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java
Log:
Workaround for internal error on replaceAll in String on Windows
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java 2012-09-10 17:52:06 UTC (rev 43563)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java 2012-09-10 18:28:46 UTC (rev 43564)
@@ -71,6 +71,8 @@
else {
/* Needed to avoid a syntax error with Windows \ dir path characters */
//baseDir = bot.textWithLabel("Location:").getText().replaceAll(System.getProperty("file.separator"), System.getProperty("file.separator") + System.getProperty("file.separator")) + System.getProperty("file.separator");
+ baseDir = bot.textWithLabel("Location:").getText();
+ System.out.println("DEBUG baseDir = " + bot.textWithLabel("Location:").getText()) ;
baseDir = bot.textWithLabel("Location:").getText().replaceAll(System.getProperty("file.separator"), "zzz");
}
// if (System.getProperty("file.separator").equals("/")) {
13 years, 3 months
JBoss Tools SVN: r43563 - in trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests: examples and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-09-10 13:52:06 -0400 (Mon, 10 Sep 2012)
New Revision: 43563
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java
Log:
Still trying to denug Windows failures - may be due to : https://bugs.eclipse.org/bugs/show_bug.cgi?id=327193
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java 2012-09-10 17:37:54 UTC (rev 43562)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java 2012-09-10 17:52:06 UTC (rev 43563)
@@ -31,18 +31,18 @@
CreateRuntimeFromSOA.class,
NewProjectUsingRuntime.class,
NewProjectUsingBundledInEAP.class,
- Editing.class,
- HelloWorld.class,
- HelloWorldAction.class,
+// Editing.class,
+// HelloWorld.class,
+// HelloWorldAction.class,
HelloWorldFileAction.class,
- SmooksCSV2XML.class,
- SmooksXML2POJO.class,
- SmooksXML2XMLDateManipulation.class,
- SmooksXML2XMLSimple.class,
- WebServiceConsumer1.class,
- WebServiceProducer.class, // http://lists.jboss.org/pipermail/jbosstools-dev/2008-December/002559.html
- WebServiceProducerHttp.class,
- WebServiceProducerSocket.class
+// SmooksCSV2XML.class,
+// SmooksXML2POJO.class,
+// SmooksXML2XMLDateManipulation.class,
+// SmooksXML2XMLSimple.class,
+// WebServiceConsumer1.class,
+// WebServiceProducer.class, // http://lists.jboss.org/pipermail/jbosstools-dev/2008-December/002559.html
+// WebServiceProducerHttp.class,
+// WebServiceProducerSocket.class
//SimpleEAPTest.class
})
@RunWith(RequirementAwareSuite.class)
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java 2012-09-10 17:37:54 UTC (rev 43562)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java 2012-09-10 17:52:06 UTC (rev 43563)
@@ -70,7 +70,8 @@
}
else {
/* Needed to avoid a syntax error with Windows \ dir path characters */
- baseDir = bot.textWithLabel("Location:").getText().replaceAll(System.getProperty("file.separator"), System.getProperty("file.separator") + System.getProperty("file.separator")) + System.getProperty("file.separator");
+ //baseDir = bot.textWithLabel("Location:").getText().replaceAll(System.getProperty("file.separator"), System.getProperty("file.separator") + System.getProperty("file.separator")) + System.getProperty("file.separator");
+ baseDir = bot.textWithLabel("Location:").getText().replaceAll(System.getProperty("file.separator"), "zzz");
}
// if (System.getProperty("file.separator").equals("/")) {
// baseDir = bot.textWithLabel("Location:").getText() + System.getProperty("file.separator");
13 years, 3 months
JBoss Tools SVN: r43562 - trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-09-10 13:37:54 -0400 (Mon, 10 Sep 2012)
New Revision: 43562
Modified:
trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java
Log:
Make CDI Quick Fixes work for As-You-Type validator annotations https://issues.jboss.org/browse/JBIDE-12328
Modified: trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java 2012-09-10 17:14:08 UTC (rev 43561)
+++ trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java 2012-09-10 17:37:54 UTC (rev 43562)
@@ -30,6 +30,7 @@
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.editors.text.EditorsUI;
+import org.eclipse.ui.internal.Workbench;
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.wst.sse.ui.internal.reconcile.ReconcileAnnotationKey;
import org.eclipse.wst.sse.ui.internal.reconcile.TemporaryAnnotation;
@@ -115,7 +116,7 @@
IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().openEditor(input, getEditorId(file.getName()), true);
ISourceViewer viewer = getViewer(editor);
- MarkerResolutionTestUtil.copyFiles(project, new String[]{fileName});
+ //MarkerResolutionTestUtil.copyFiles(project, new String[]{fileName});
try{
// change file
@@ -166,11 +167,12 @@
Assert.fail("Quick fix: "+proposalClass+" not found");
}finally{
- if(editor.isDirty()){
- editor.doSave(new NullProgressMonitor());
- }
+ Workbench.getInstance().getActiveWorkbenchWindow().getActivePage().closeEditor(editor, false);
+// if(editor.isDirty()){
+// editor.doSave(new NullProgressMonitor());
+// }
//editor.dispose();
- MarkerResolutionTestUtil.restoreFiles(project, new String[]{fileName});
+// MarkerResolutionTestUtil.restoreFiles(project, new String[]{fileName});
}
}
13 years, 3 months
JBoss Tools SVN: r43561 - trunk/download.jboss.org/jbosstools/updates/requirements/pmd.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-10 13:14:08 -0400 (Mon, 10 Sep 2012)
New Revision: 43561
Added:
trunk/download.jboss.org/jbosstools/updates/requirements/pmd/.gitignore
trunk/download.jboss.org/jbosstools/updates/requirements/pmd/build-3.2.4.xml
Removed:
trunk/download.jboss.org/jbosstools/updates/requirements/pmd/build-3.2.6.xml
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/pmd/build.xml
Log:
new build script for pmd - exclude all older features/plugins -- only want 3.2.6; refactor old 3.2.4 script to new name
Added: trunk/download.jboss.org/jbosstools/updates/requirements/pmd/.gitignore
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/pmd/.gitignore (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/pmd/.gitignore 2012-09-10 17:14:08 UTC (rev 43561)
@@ -0,0 +1 @@
+3.2*
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/pmd/build-3.2.4.xml (from rev 43560, trunk/download.jboss.org/jbosstools/updates/requirements/pmd/build.xml)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/pmd/build-3.2.4.xml (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/pmd/build-3.2.4.xml 2012-09-10 17:14:08 UTC (rev 43561)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/pmd/build.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/pmd/build.xml -Ddestination=/tmp/pmd-repo
+ -->
+ <target name="mirror">
+
+ <!-- get PMD 3.2.4 from Sourceforge - download the zip and unpack it here, then use p2.publish to regen metadata -->
+
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/pmd/3.2.4/" />
+ <property name="compress" value="true" />
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.2.4/" artifactRepository="file:${destination}/3.2.4/" publishartifacts="true" source="${destination}/3.2.4/" compress="${compress}" />
+ </target>
+</project>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/pmd/build-3.2.6.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/pmd/build-3.2.6.xml 2012-09-10 17:13:41 UTC (rev 43560)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/pmd/build-3.2.6.xml 2012-09-10 17:14:08 UTC (rev 43561)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="mirror">
- <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
-
- -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
- -consoleLog -nosplash -data /tmp
- -application org.eclipse.ant.core.antRunner
- -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/pmd/build.xml"
-
- or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
-
- export JAVA_HOME=/opt/jdk1.6.0; \
- ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
- org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
- -application org.eclipse.ant.core.antRunner \
- -f ~/RHDS/updates/requirements/pmd/build.xml -Ddestination=/tmp/pmd-repo
- -->
- <target name="mirror">
- <property name="URL" value="http://pmd.sourceforge.net/eclipse" />
- <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/pmd/3.2.6/" />
- <property name="compress" value="true" />
-
- <p2.mirror>
- <repository location="file:${destination}/3.2.6/" name="pmd plugins for Eclipse 3.6 - 3.7" />
- <source>
- <repository location="${URL}" />
- </source>
-
- <slicingoptions includefeatures="true" followstrict="true" latestversiononly="true" />
- </p2.mirror>
-
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.2.6/" artifactRepository="file:${destination}/3.2.6/" publishartifacts="true" source="${destination}/3.2.6/" compress="${compress}" />
- </target>
-</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/pmd/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/pmd/build.xml 2012-09-10 17:13:41 UTC (rev 43560)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/pmd/build.xml 2012-09-10 17:14:08 UTC (rev 43561)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project default="mirror">
+<project default="run">
<!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
@@ -15,13 +15,23 @@
-application org.eclipse.ant.core.antRunner \
-f ~/RHDS/updates/requirements/pmd/build.xml -Ddestination=/tmp/pmd-repo
-->
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/pmd/3.2.6/" />
+ <property name="compress" value="true" />
+ <property name="URL1" value="http://pmd.sourceforge.net/eclipse" />
+ <target name="run" depends="mirror,regen"/>
<target name="mirror">
+ <p2.mirror>
+ <repository location="file:${destination}/3.2.6/" name="pmd plugin for Eclipse" />
+ <source>
+ <repository location="${URL1}" />
+ </source>
- <!-- get PMD 3.2.4 from Sourceforge - download the zip and unpack it here, then use p2.publish to regen metadata -->
+ <slicingoptions includefeatures="true" followstrict="true" latestversiononly="true" />
+ <iu id="net.sourceforge.pmd.eclipse.feature.group" />
+ </p2.mirror>
+ </target>
+ <target name="regen">
- <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/pmd/3.2.4/" />
- <property name="compress" value="true" />
-
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.2.4/" artifactRepository="file:${destination}/3.2.4/" publishartifacts="true" source="${destination}/3.2.4/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.2.6/" artifactRepository="file:${destination}/3.2.6/" publishartifacts="true" source="${destination}/3.2.6/" compress="${compress}" />
</target>
</project>
13 years, 3 months
JBoss Tools SVN: r43560 - trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-09-10 13:13:41 -0400 (Mon, 10 Sep 2012)
New Revision: 43560
Modified:
trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java
Log:
Make CDI Quick Fixes work for As-You-Type validator annotations https://issues.jboss.org/browse/JBIDE-12328
Modified: trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java 2012-09-10 17:13:25 UTC (rev 43559)
+++ trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java 2012-09-10 17:13:41 UTC (rev 43560)
@@ -138,28 +138,28 @@
checkForAddSuppressWarnings(file, annotation, proposals);
for(IJavaCompletionProposal proposal : proposals){
if (proposal.getClass().equals(proposalClass)) {
- if(checkResult){
- if(proposal instanceof TestableResolutionWithRefactoringProcessor){
- RefactoringProcessor processor = ((TestableResolutionWithRefactoringProcessor)proposal).getRefactoringProcessor();
-
- RefactoringStatus status = processor.checkInitialConditions(new NullProgressMonitor());
-
- Assert.assertNull("Rename processor returns fatal error", status.getEntryMatchingSeverity(RefactoringStatus.FATAL));
-
- status = processor.checkFinalConditions(new NullProgressMonitor(), null);
-
- Assert.assertNull("Rename processor returns fatal error", status.getEntryMatchingSeverity(RefactoringStatus.FATAL));
-
- CompositeChange rootChange = (CompositeChange)processor.createChange(new NullProgressMonitor());
-
- rootChange.perform(new NullProgressMonitor());
- } else if(proposal instanceof TestableResolutionWithDialog){
- ((TestableResolutionWithDialog) proposal).runForTest(null);
- } else {
- proposal.apply(document);
- }
-
- }
+// if(checkResult){
+// if(proposal instanceof TestableResolutionWithRefactoringProcessor){
+// RefactoringProcessor processor = ((TestableResolutionWithRefactoringProcessor)proposal).getRefactoringProcessor();
+//
+// RefactoringStatus status = processor.checkInitialConditions(new NullProgressMonitor());
+//
+// Assert.assertNull("Rename processor returns fatal error", status.getEntryMatchingSeverity(RefactoringStatus.FATAL));
+//
+// status = processor.checkFinalConditions(new NullProgressMonitor(), null);
+//
+// Assert.assertNull("Rename processor returns fatal error", status.getEntryMatchingSeverity(RefactoringStatus.FATAL));
+//
+// CompositeChange rootChange = (CompositeChange)processor.createChange(new NullProgressMonitor());
+//
+// rootChange.perform(new NullProgressMonitor());
+// } else if(proposal instanceof TestableResolutionWithDialog){
+// ((TestableResolutionWithDialog) proposal).runForTest(null);
+// } else {
+// proposal.apply(document);
+// }
+//
+// }
return;
}
}
13 years, 3 months
JBoss Tools SVN: r43559 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2012-09-10 13:13:25 -0400 (Mon, 10 Sep 2012)
New Revision: 43559
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/Bean_Broken.java
Log:
JBIDE-12418
Sometimes As-You-Type validation isn't invoked after a Java-String that contains EL is Copy-Pasted in Java editor
JBIDE-12539
In some cases as-you-type validation removes all annotations
JUnit Test Case is added due to verify the issues
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/Bean_Broken.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/Bean_Broken.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/Bean_Broken.java 2012-09-10 17:13:25 UTC (rev 43559)
@@ -0,0 +1,18 @@
+package org.jboss.jsr299.tck.tests.jbt.validation;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Named;
+
+public class Bean_Broken {
+
+ public void foo() {
+ String s = "#{string.ss}";
+ String s2 = "#{string.ss}";
+ }
+
+ @Named
+ @Produces
+ public String string() {
+ return "";
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/Bean_Broken.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 3 months
JBoss Tools SVN: r43557 - in trunk/jst: tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-09-10 12:38:10 -0400 (Mon, 10 Sep 2012)
New Revision: 43557
Modified:
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleListener.java
trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/SelectionLosingByPropertySheet_JBIDE4791.java
Log:
https://issues.jboss.org/browse/JBIDE-12318 : Test is failing on Eclipse Juno 4.2: SelectionLosingByPropertySheet_JBIDE4791.testSelectionLosingByPropertySheet
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleListener.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleListener.java 2012-09-10 16:22:48 UTC (rev 43556)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleListener.java 2012-09-10 16:38:10 UTC (rev 43557)
@@ -90,7 +90,13 @@
}
public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-
+ // The following line is a workaround for: JBIDE-12318: Test is failing on Eclipse Juno 4.2: SelectionLosingByPropertySheet_JBIDE4791.testSelectionLosingByPropertySheet
+ // The essence of the issue is that the implementation of org.eclipse.ui.views.properties.PropertySheet imply
+ // that the partActivated event is fired before the selectionChanged event. But it is not guaranteed.
+ // So to workaround this, we call partActivated before any selectionChanged processing.
+ partActivated(part);
+
+ System.out.println(part);
StyleContainer newStyle = CSSStyleManager.recognizeCSSStyle(selection);
if (isImportant(part)
Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/SelectionLosingByPropertySheet_JBIDE4791.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/SelectionLosingByPropertySheet_JBIDE4791.java 2012-09-10 16:22:48 UTC (rev 43556)
+++ trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/SelectionLosingByPropertySheet_JBIDE4791.java 2012-09-10 16:38:10 UTC (rev 43557)
@@ -83,11 +83,15 @@
assertEquals(FIRST_CSS_PROPERTY_VALUE, colorValue);
CSSEditorView view = (CSSEditorView) openView(CSS_EDITOR_VIEW);
- JobUtils.delay(1000);
-
- propertySheetTree = (Tree) propertySheet.getCurrentPage().getControl();
- colorValue = getPropertyValue(propertySheetTree.getItems(), FIRST_CSS_PROPERTY_NAME);
- assertEquals(FIRST_CSS_PROPERTY_VALUE, colorValue);
+ int counter = 10;
+ do {
+ JobUtils.delay(2000);
+ propertySheetTree = (Tree) propertySheet.getCurrentPage().getControl();
+ colorValue = getPropertyValue(propertySheetTree.getItems(), FIRST_CSS_PROPERTY_NAME);
+ counter--;
+ } while (colorValue == null && counter > 0);
+
+ assertEquals(FIRST_CSS_PROPERTY_VALUE, colorValue);// if after 20s it is still null - fail
}
private String getPropertyValue(TreeItem[] treeItems, String propertyName) {
13 years, 3 months