JBoss Tools SVN: r31822 - trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-06-03 14:18:13 -0400 (Fri, 03 Jun 2011)
New Revision: 31822
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventAndObserverMethodHyperlinkDetectorTest.java
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/HyperlinkDetectorTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9058
Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventAndObserverMethodHyperlinkDetectorTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventAndObserverMethodHyperlinkDetectorTest.java 2011-06-03 18:17:33 UTC (rev 31821)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventAndObserverMethodHyperlinkDetectorTest.java 2011-06-03 18:18:13 UTC (rev 31822)
@@ -10,32 +10,60 @@
public class EventAndObserverMethodHyperlinkDetectorTest extends HyperlinkDetectorTest {
public void testEventHyperlinkDetector() throws Exception {
+ String[] elementPaths = new String[]{
+ "/tck/JavaSource/org/jboss/jsr299/tck/tests/event/bindingTypes/DiscerningObserver.java",
+ "/tck/JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TibetanTerrier_Broken.java",
+ "/tck/JavaSource/org/jboss/jsr299/tck/tests/event/observer/checkedException/TeaCupPomeranian.java",
+ "/tck/JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/interceptors/ObserverMethodInInterceptorBroken.java",
+ "/tck/JavaSource/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/GoldenRetriever.java",
+ "/tck/JavaSource/org/jboss/jsr299/tck/tests/event/observer/runtimeException/TeaCupPomeranian.java",
+ "/tck/JavaSource/org/jboss/jsr299/tck/tests/event/bindingTypes/DiscerningObserver.java",
+ "/tck/JavaSource/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/TibetanTerrier_Broken.java",
+ "/tck/JavaSource/org/jboss/jsr299/tck/tests/event/broken/observer8/Terrier.java",
+ "/tck/JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/decorators/ObserverMethodInDecoratorBroken.java",
+ "/tck/JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/observers/ClassFragmentLogger.java",
+ "/tck/JavaSource/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Fox.java",
+ "/tck/JavaSource/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/AbstractBean.java",
+ "/tck/JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TibetanTerrier_BrokenNoInterface.java",
+ "/tck/JavaSource/org/jboss/jsr299/tck/tests/event/StringObserver.java",
+ "/tck/JavaSource/org/jboss/jsr299/tck/tests/event/observer/transactional/Pomeranian.java",
+ "/tck/JavaSource/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypeFamilyObserver.java"
+ };
+
ArrayList<TestRegion> regionList = new ArrayList<TestRegion>();
- regionList.add(new TestRegion(959, 6, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS)}));
- regionList.add(new TestRegion(967, 16, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS)}));
- regionList.add(new TestRegion(985, 11, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS)}));
- regionList.add(new TestRegion(1006, 6, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS)}));
- regionList.add(new TestRegion(1014, 3, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS)}));
- regionList.add(new TestRegion(1019, 34, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS)}));
- regionList.add(new TestRegion(1055, 42, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS)}));
- regionList.add(new TestRegion(1107, 6, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS)}));
- regionList.add(new TestRegion(1115, 34, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS)}));
- regionList.add(new TestRegion(1151, 36, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS)}));
- regionList.add(new TestRegion(1188, 3, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS)}));
- regionList.add(new TestRegion(1235, 11, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS)}));
- regionList.add(new TestRegion(1334, 42, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS)}));
+ regionList.add(new TestRegion(959, 6, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)}));
+ regionList.add(new TestRegion(967, 16, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)}));
+ regionList.add(new TestRegion(985, 11, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)}));
+ regionList.add(new TestRegion(1006, 6, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)}));
+ regionList.add(new TestRegion(1014, 3, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)}));
+ regionList.add(new TestRegion(1019, 34, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)}));
+ regionList.add(new TestRegion(1055, 42, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)}));
+ regionList.add(new TestRegion(1107, 6, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)}));
+ regionList.add(new TestRegion(1115, 34, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)}));
+ regionList.add(new TestRegion(1151, 36, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)}));
+ regionList.add(new TestRegion(1188, 3, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)}));
+ regionList.add(new TestRegion(1235, 11, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)}));
+ regionList.add(new TestRegion(1334, 42, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)}));
checkRegions("JavaSource/org/jboss/jsr299/tck/tests/event/bindingTypes/EventEmitter.java", regionList, new EventAndObserverMethodHyperlinkDetector());
}
public void testObserverMethodHyperlinkDetector() throws Exception {
+ String[] elementPaths = new String[]{
+ "/tck/JavaSource/org/jboss/jsr299/tck/tests/event/bindingTypes/EventEmitter.java",
+ "/tck/JavaSource/org/jboss/jsr299/tck/tests/event/bindingTypes/EventEmitter.java",
+ "/tck/JavaSource/org/jboss/jsr299/tck/tests/event/bindingTypes/EventEmitter.java",
+ "/tck/JavaSource/org/jboss/jsr299/tck/tests/event/fires/nonbinding/OwlFinch_Broken.java"
+ };
+
ArrayList<TestRegion> regionList = new ArrayList<TestRegion>();
- regionList.add(new TestRegion(1196, 4, new TestHyperlink[]{new TestHyperlink(EventListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS)}));
- regionList.add(new TestRegion(1201, 13, new TestHyperlink[]{new TestHyperlink(EventListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS)}));
- regionList.add(new TestRegion(1216, 15, new TestHyperlink[]{new TestHyperlink(EventListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS)}));
- regionList.add(new TestRegion(1232, 9, new TestHyperlink[]{new TestHyperlink(EventListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS)}));
- regionList.add(new TestRegion(1264, 18, new TestHyperlink[]{new TestHyperlink(EventListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS)}));
+
+ regionList.add(new TestRegion(1196, 4, new TestHyperlink[]{new TestHyperlink(EventListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS, elementPaths)}));
+ regionList.add(new TestRegion(1201, 13, new TestHyperlink[]{new TestHyperlink(EventListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS, elementPaths)}));
+ regionList.add(new TestRegion(1216, 15, new TestHyperlink[]{new TestHyperlink(EventListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS, elementPaths)}));
+ regionList.add(new TestRegion(1232, 9, new TestHyperlink[]{new TestHyperlink(EventListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS, elementPaths)}));
+ regionList.add(new TestRegion(1264, 18, new TestHyperlink[]{new TestHyperlink(EventListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS, elementPaths)}));
checkRegions("JavaSource/org/jboss/jsr299/tck/tests/event/observer/checkedException/TeaCupPomeranian.java", regionList, new EventAndObserverMethodHyperlinkDetector());
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/HyperlinkDetectorTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/HyperlinkDetectorTest.java 2011-06-03 18:17:33 UTC (rev 31821)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/HyperlinkDetectorTest.java 2011-06-03 18:18:13 UTC (rev 31822)
@@ -2,6 +2,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
@@ -322,6 +323,7 @@
public class TestHyperlink{
Class<? extends IHyperlink> hyperlink;
ICDIElement element = null;
+ String[] elementPaths = null;
String name;
public TestHyperlink(Class<? extends IHyperlink> hyperlink, String name){
@@ -333,12 +335,44 @@
this(hyperlink, name);
this.element = element;
}
+
+ public TestHyperlink(Class<? extends IHyperlink> hyperlink, String name, String[] elementPaths){
+ this(hyperlink, name);
+ this.elementPaths = elementPaths;
+ }
public boolean validateHyperlink(IHyperlink hyperlink){
- if(hyperlink instanceof ITestableCDIHyperlink && element != null){
+ if(hyperlink instanceof ITestableCDIHyperlink && ((ITestableCDIHyperlink)hyperlink).getCDIElement() != null && element != null){
assertEquals(element, ((ITestableCDIHyperlink)hyperlink).getCDIElement());
+ }else if(hyperlink instanceof ITestableCDIHyperlink && ((ITestableCDIHyperlink)hyperlink).getCDIElements() != null && elementPaths != null){
+ for(ICDIElement element : ((ITestableCDIHyperlink)hyperlink).getCDIElements()){
+ String elementPath = findElementPath(elementPaths, element);
+ assertNotNull("Unexpected CDI element - "+element.getSourcePath().toString(), elementPath);
+ }
+
+ for(String elementPath : elementPaths){
+ ICDIElement element = findCDIElement(((ITestableCDIHyperlink)hyperlink).getCDIElements(), elementPath);
+ assertNotNull("CDI element - "+elementPath+" not found", element);
+ }
}
return true;
}
+
+ protected String findElementPath(String[] elementPaths, ICDIElement element){
+ for(String elementPath : elementPaths){
+ if(elementPath.equals(element.getSourcePath().toString()))
+ return elementPath;
+ }
+ return null;
+ }
+
+ protected ICDIElement findCDIElement(Set<? extends ICDIElement> elements, String elementPath){
+ for(ICDIElement element : elements){
+ if(elementPath.equals(element.getSourcePath().toString()))
+ return element;
+ }
+ return null;
+ }
+
}
}
\ No newline at end of file
13 years, 9 months
JBoss Tools SVN: r31821 - trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-03 14:17:33 -0400 (Fri, 03 Jun 2011)
New Revision: 31821
Modified:
trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/contentassist/CATestUtil.java
Log:
JBIDE-9066
https://issues.jboss.org/browse/JBIDE-9066
Modified: trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/contentassist/CATestUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/contentassist/CATestUtil.java 2011-06-03 17:55:48 UTC (rev 31820)
+++ trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/contentassist/CATestUtil.java 2011-06-03 18:17:33 UTC (rev 31821)
@@ -31,6 +31,7 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.texteditor.ITextEditor;
import org.jboss.tools.common.text.xml.contentassist.ProposalSorter;
+import org.jboss.tools.test.util.JobUtils;
public class CATestUtil {
@@ -64,38 +65,14 @@
* the number of milliseconds
*/
public static void delay(long waitTimeMillis) {
- Display display = Display.getCurrent();
-
- // If this is the UI thread,
- // then process input.
- if (display != null) {
- long endTimeMillis = System.currentTimeMillis() + waitTimeMillis;
- while (System.currentTimeMillis() < endTimeMillis) {
- if (!display.readAndDispatch())
- display.sleep();
- }
- display.update();
- }
- // Otherwise, perform a simple sleep.
- else {
- try {
- Thread.sleep(waitTimeMillis);
- } catch (InterruptedException e) {
- // Ignored.
- }
- }
+ JobUtils.delay(waitTimeMillis);
}
/**
* Wait for idle.
*/
public static void waitForIdle(long maxIdle) {
- long start = System.currentTimeMillis();
- while (!Job.getJobManager().isIdle()) {
- delay(500);
- if ( (System.currentTimeMillis()-start) > maxIdle )
- throw new RuntimeException("A long running task detected"); //$NON-NLS-1$
- }
+ JobUtils.waitForIdle(500, maxIdle);
}
public static SourceViewerConfiguration getSourceViewerConfiguration(ITextEditor editor) {
13 years, 9 months
JBoss Tools SVN: r31820 - trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-03 13:55:48 -0400 (Fri, 03 Jun 2011)
New Revision: 31820
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java
Log:
JBIDE-9066
https://issues.jboss.org/browse/JBIDE-9066
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java 2011-06-03 17:51:49 UTC (rev 31819)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java 2011-06-03 17:55:48 UTC (rev 31820)
@@ -20,8 +20,6 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IEditorInput;
@@ -30,6 +28,7 @@
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.vpe.editor.VpeController;
import org.jboss.tools.vpe.editor.VpeEditorPart;
import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor;
@@ -47,10 +46,6 @@
*/
public class TestUtil {
- /**
- *
- */
-
/** The Constant COMPONENTS_PATH. */
public static final String COMPONENTS_PATH = "WebContent/pages/"; //$NON-NLS-1$
@@ -103,9 +98,7 @@
}
return null;
}
-
-
-
+
public static IResource getResource(String path,
String projectName) throws CoreException, IOException {
IProject project = ProjectsLoader.getInstance().getProject(projectName);
@@ -130,14 +123,9 @@
public static IResource getWebContentPath(String componentPage,
String projectName) throws CoreException, IOException {
IProject project = ProjectsLoader.getInstance().getProject(projectName);
- if (project != null) {
- return project.getFolder(WEBCONTENT_PATH).findMember(componentPage);
- }
-
- return null;
+ return project.getFolder(WEBCONTENT_PATH).findMember(componentPage);
}
-
-
+
/**
* @param xmlScheme
* @param xmlSchemesRoot
@@ -153,30 +141,14 @@
public static void delay() {
delay(STANDARD_DELAY);
}
-
+
/**
* Process UI input but do not return for the specified time interval.
*
* @param waitTimeMillis the number of milliseconds
*/
public static void delay(long waitTimeMillis) {
- Display display = Display.getCurrent();
- if (display != null) {
- long endTimeMillis = System.currentTimeMillis() + waitTimeMillis;
- while (System.currentTimeMillis() < endTimeMillis) {
- if (!display.readAndDispatch())
- display.sleep();
- }
- display.update();
- }
- // Otherwise, perform a simple sleep.
- else {
- try {
- Thread.sleep(waitTimeMillis);
- } catch (InterruptedException e) {
- // Ignored.
- }
- }
+ JobUtils.delay(waitTimeMillis);
}
/**
@@ -191,24 +163,12 @@
// delay(100);
waitForIdle();
}
-
+
/**
* Wait for idle.
*/
public static void waitForIdle(long maxIdle) {
- long start = System.currentTimeMillis();
- while (!Job.getJobManager().isIdle()) {
- delay();
- if ( (System.currentTimeMillis()-start) > maxIdle ) {
- Job[] jobs = Job.getJobManager().find(null);
- StringBuffer jobsList = new StringBuffer("A long running task detected\n");
-
- for (Job job : jobs) {
- jobsList.append(job.getName()).append("\n");
- }
- throw new RuntimeException(jobsList.toString()); //$NON-NLS-1$
- }
- }
+ JobUtils.waitForIdle(STANDARD_DELAY, maxIdle);
}
public static void waitForIdle() {
@@ -242,7 +202,6 @@
findElementsByName(child, elements, name);
}
}
-
}
/**
@@ -297,13 +256,11 @@
* @return offcet in document
*
* @throws IllegalArgumentException */
- public static final int getLinePositionOffcet(ITextViewer textViewer, int lineIndex, int linePosition) {
-
+ public static final int getLinePositionOffcet(ITextViewer textViewer, int lineIndex, int linePosition) {
int resultOffcet = 0;
- if(textViewer==null) {
-
- throw new IllegalArgumentException("Text viewer shouldn't be a null"); //$NON-NLS-1$
+ if(textViewer == null) {
+ throw new IllegalArgumentException("Text viewer shouldn't be a null"); //$NON-NLS-1$
}
//lineIndex-1 becose calculating of line begibns in eclipse from one, but should be form zero
resultOffcet=textViewer.getTextWidget().getOffsetAtLine(lineIndex-1);
@@ -324,9 +281,8 @@
}
}
resultOffcet+=characterOffset;
- if(textViewer.getTextWidget().getLineAtOffset(resultOffcet)!=(lineIndex-1)) {
-
- throw new IllegalArgumentException("Incorrect character position in line"); //$NON-NLS-1$
+ if(textViewer.getTextWidget().getLineAtOffset(resultOffcet)!=(lineIndex-1)) {
+ throw new IllegalArgumentException("Incorrect character position in line"); //$NON-NLS-1$
}
return resultOffcet;
}
@@ -339,12 +295,11 @@
* @return {@link VpeController}
*/
public static VpeController getVpeController(JSPMultiPageEditor part) {
-
VpeEditorPart visualEditor = (VpeEditorPart) part.getVisualEditor();
while(visualEditor.getController()==null) {
if (!Display.getCurrent().readAndDispatch()) {
Display.getCurrent().sleep();
- }
+ }
}
return visualEditor.getController();
}
@@ -357,16 +312,11 @@
* @return nsIDOMDocument
*/
public static nsIDOMDocument getVpeVisualDocument(JSPMultiPageEditor part) {
-
-
VpeController vpeController = TestUtil.getVpeController(part);
-
// get xulRunner editor
XulRunnerEditor xulRunnerEditor = vpeController.getXulRunnerEditor();
-
// get dom document
nsIDOMDocument document = xulRunnerEditor.getDOMDocument();
-
return document;
}
13 years, 9 months
JBoss Tools SVN: r31819 - trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-03 13:51:49 -0400 (Fri, 03 Jun 2011)
New Revision: 31819
Modified:
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/JobUtils.java
Log:
JBIDE-9066
https://issues.jboss.org/browse/JBIDE-9066
Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/JobUtils.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/JobUtils.java 2011-06-03 16:39:34 UTC (rev 31818)
+++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/JobUtils.java 2011-06-03 17:51:49 UTC (rev 31819)
@@ -28,6 +28,10 @@
}
public static void waitForIdle(long delay) {
+ waitForIdle(delay, MAX_IDLE);
+ }
+
+ public static void waitForIdle(long delay, long maxIdle) {
long start = System.currentTimeMillis();
// Job.getJobManager().isIdle() is more efficient than
// EditorTestHelper.allJobsQuiet()
@@ -36,19 +40,17 @@
// while (!EditorTestHelper.allJobsQuiet()) {
while (!Job.getJobManager().isIdle()) {
delay(delay);
- if ((System.currentTimeMillis() - start) > MAX_IDLE) {
+ if ((System.currentTimeMillis() - start) > maxIdle) {
Job[] jobs = Job.getJobManager().find(null);
- if (jobs != null) {
- StringBuffer str = new StringBuffer();
- for (Job job : jobs) {
- if (job.getThread() != null) {
- str.append("\n").append(job.getName()).append(" (")
- .append(job.getClass()).append(")");
- }
+ StringBuffer str = new StringBuffer();
+ for (Job job : jobs) {
+ if (job.getThread() != null) {
+ str.append("\n").append(job.getName()).append(" (")
+ .append(job.getClass()).append(")");
}
- throw new RuntimeException(
- "Long running tasks detected:" + str.toString()); //$NON-NLS-1$
}
+ throw new RuntimeException(
+ "Long running tasks detected:" + str.toString()); //$NON-NLS-1$
}
}
}
13 years, 9 months
JBoss Tools SVN: r31818 - in trunk: jsf/tests/org.jboss.tools.jsf.ui.test/projects and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-06-03 12:39:34 -0400 (Fri, 03 Jun 2011)
New Revision: 31818
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.classpath
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.project
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/.jsdtscope
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.jdt.core.prefs
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.wst.common.component
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.wst.jsdt.ui.superType.container
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.wst.jsdt.ui.superType.name
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/JavaSource/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/JavaSource/demo/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/JavaSource/demo/Messages.properties
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/WebContent/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/WebContent/WEB-INF/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/WebContent/WEB-INF/faces-config.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/WebContent/pages/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/WebContent/pages/jsp_page.jsp
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/WebContent/pages/xhtml_page.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJBide3845Test.java
Modified:
trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/contentassist/AbstractContentAssistantTestCase.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
Log:
JBIDE-3845
Code assist for #{messages['...']} should suggest properties when user types "[".
JUnit Test Case is added for JSF project
Modified: trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/contentassist/AbstractContentAssistantTestCase.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/contentassist/AbstractContentAssistantTestCase.java 2011-06-03 15:44:18 UTC (rev 31817)
+++ trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/contentassist/AbstractContentAssistantTestCase.java 2011-06-03 16:39:34 UTC (rev 31818)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Copyright (c) 2007-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,
@@ -89,9 +89,9 @@
assertTrue("Content Assistant returned no proposals", (res != null && res.size() > 0)); //$NON-NLS-1$
- // for (int i = 0; i < result.length; i++) {
- // System.out.println("proposal - "+result[i].getDisplayString());
- // }
+// for (ICompletionProposal p : res) {
+// System.out.println("proposal - "+p.getDisplayString());
+// }
ICompletionProposal[] result = res.toArray(new ICompletionProposal[res.size()]);
int foundCounter = 0;
@@ -152,10 +152,10 @@
}
// for an Unclosed EL the closing character is appended to the proposal string (i.e. person} )
- // perform case sensitive compare operation
+ // perform case insensitive compare operation
replacementStringParts = replacementString.split("}"); //$NON-NLS-1$
if (replacementStringParts != null && replacementStringParts.length > 0) {
- if (replacementStringParts[0].equals(proposalName)) return true;
+ if (replacementStringParts[0].equalsIgnoreCase(proposalName)) return true;
}
// For an attribute value proposal there will be the quote characters
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.classpath
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.classpath (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.classpath 2011-06-03 16:39:34 UTC (rev 31818)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="JavaSource"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
+</classpath>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.project
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.project (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.project 2011-06-03 16:39:34 UTC (rev 31818)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>Jbide3845Test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.jboss.tools.jsf.jsfnature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/.jsdtscope
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/.jsdtscope (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/.jsdtscope 2011-06-03 16:39:34 UTC (rev 31818)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="WebContent"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+ <attributes>
+ <attribute name="hide" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.jdt.core.prefs 2011-06-03 16:39:34 UTC (rev 31818)
@@ -0,0 +1,8 @@
+#Thu Jun 02 21:29:17 MSD 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.wst.common.component 2011-06-03 16:39:34 UTC (rev 31818)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="Jbide3845Test">
+ <wb-resource deploy-path="/" source-path="/WebContent"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/>
+ <property name="context-root" value="Jbide3845Test"/>
+ <property name="java-output-path" value="/Jbide3845Test/WebContent/WEB-INF/classes"/>
+ </wb-module>
+</project-modules>
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml 2011-06-03 16:39:34 UTC (rev 31818)
@@ -0,0 +1,7 @@
+<root>
+ <facet id="jst.jsf">
+ <node name="libprov">
+ <attribute name="provider-id" value="jsf-user-library-provider"/>
+ </node>
+ </facet>
+</root>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-06-03 16:39:34 UTC (rev 31818)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="JBoss 5.1 Runtime"/>
+ <fixed facet="java"/>
+ <fixed facet="jst.jsf"/>
+ <fixed facet="jst.web"/>
+ <fixed facet="wst.jsdt.web"/>
+ <installed facet="java" version="1.6"/>
+ <installed facet="jst.web" version="2.5"/>
+ <installed facet="jst.jsf" version="1.2"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.wst.common.project.facet.core.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-06-03 16:39:34 UTC (rev 31818)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-06-03 16:39:34 UTC (rev 31818)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/JavaSource/demo/Messages.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/JavaSource/demo/Messages.properties (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/JavaSource/demo/Messages.properties 2011-06-03 16:39:34 UTC (rev 31818)
@@ -0,0 +1,4 @@
+header=Hello Demo Application
+prompt_message=Name:
+hello_message=Hello
+org.jboss.tools.long.property.Name=A Long Named Property
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/JavaSource/demo/Messages.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/WebContent/WEB-INF/faces-config.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/WebContent/WEB-INF/faces-config.xml 2011-06-03 16:39:34 UTC (rev 31818)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+ <managed-bean>
+ <description>User Name Bean</description>
+ <managed-bean-name>user</managed-bean-name>
+ <managed-bean-class>demo.User</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ <managed-property>
+ <property-name>name</property-name>
+ <property-class>java.lang.String</property-class>
+ <value/>
+ </managed-property>
+ </managed-bean>
+ <navigation-rule>
+ <from-view-id>/pages/inputUserName.jsp</from-view-id>
+ <navigation-case>
+ <from-outcome>hello</from-outcome>
+ <to-view-id>/pages/jsp_page.jsp</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+</faces-config>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/WebContent/WEB-INF/faces-config.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/WebContent/pages/jsp_page.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/WebContent/pages/jsp_page.jsp (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/WebContent/pages/jsp_page.jsp 2011-06-03 16:39:34 UTC (rev 31818)
@@ -0,0 +1,21 @@
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+
+<f:loadBundle var="Message" basename="demo.Messages" />
+
+<html>
+ <head>
+ <title>Hello!</title>
+ </head>
+
+ <body>
+ <f:view>
+ <h3>
+ <h:outputText value="#{Message[" />,
+ <h:outputText value="#{Message.hello_message}" />,
+ <h:outputText value="#{user.name}" />!
+ </h3>
+ </f:view>
+ </body>
+
+</html>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/WebContent/pages/jsp_page.jsp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/WebContent/pages/xhtml_page.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/WebContent/pages/xhtml_page.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/WebContent/pages/xhtml_page.xhtml 2011-06-03 16:39:34 UTC (rev 31818)
@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+<f:loadBundle var="Message" basename="demo.Messages" />
+<body>
+ #{Message[}
+</body>
+</html>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/Jbide3845Test/WebContent/pages/xhtml_page.xhtml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJBide3845Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJBide3845Test.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJBide3845Test.java 2011-06-03 16:39:34 UTC (rev 31818)
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.jsp.ca.test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.FindReplaceDocumentAdapter;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.jboss.tools.common.base.test.contentassist.CATestUtil;
+import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
+import org.jboss.tools.test.util.TestProjectProvider;
+
+/**
+ * Test cast testing http://jira.jboss.com/jira/browse/JBIDE-3845 issue.
+ *
+ * @author Victor V. Rubezhny
+ *
+ */
+public class JsfJBide3845Test extends ContentAssistantTestCase {
+ private static final String PROJECT_NAME = "Jbide3845Test"; //$NON-NLS-1$
+ private static final String JSP_PAGE_NAME = "/WebContent/pages/jsp_page.jsp"; //$NON-NLS-1$
+ private static final String XHTML_PAGE_NAME = "/WebContent/pages/xhtml_page.xhtml"; //$NON-NLS-1$
+ private static final String[] PROPOSALS = new String[] {"Message['org.jboss.tools.long.property.Name']"}; //$NON-NLS-1$
+
+ private TestProjectProvider provider = null;
+
+
+ private static final String STRING_TO_FIND = "#{Message[";
+
+ public static Test suite() {
+ return new TestSuite(JsfJBide3845Test.class);
+ }
+
+ public void setUp() throws Exception {
+ provider = new TestProjectProvider("org.jboss.tools.jsf.ui.test", null, PROJECT_NAME,false); //$NON-NLS-1$
+ project = provider.getProject();
+ }
+
+ protected void tearDown() throws Exception {
+ if(provider != null) {
+ provider.dispose();
+ }
+ }
+
+ public void testJbide3845OnJspPage(){
+ doTheResourceBundleCAForALongPropertyNameTest(JSP_PAGE_NAME, STRING_TO_FIND, PROPOSALS);
+ }
+
+ public void testJbide6061OnXhtmlPage(){
+ doTheResourceBundleCAForALongPropertyNameTest(XHTML_PAGE_NAME, STRING_TO_FIND, PROPOSALS);
+ }
+
+ protected void doTheResourceBundleCAForALongPropertyNameTest(String pageName, String textToFind, String[] proposals) {
+ openEditor(pageName);
+ IRegion reg=null;
+ try {
+ reg = new FindReplaceDocumentAdapter(this.document).find(0, textToFind, true, false, false, false); //$NON-NLS-1$
+ } catch (BadLocationException e) {
+ fail(e.getMessage());
+ }
+
+ assertNotNull("Cannot find a text region to test", reg);
+
+ final ICompletionProposal[] rst = checkProposals(pageName,reg.getOffset() + textToFind.length(), proposals, false);
+
+ closeEditor();
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJBide3845Test.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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-06-03 15:44:18 UTC (rev 31817)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2011-06-03 16:39:34 UTC (rev 31818)
@@ -23,6 +23,7 @@
import org.jboss.tools.jsf.jsp.ca.test.CASuggestsNotOnlyELProposalsJBIDE2437Test;
import org.jboss.tools.jsf.jsp.ca.test.CAUnnecessaryElementsForDirAttributeInXHTMLPageJBIDE1813Test;
import org.jboss.tools.jsf.jsp.ca.test.CAVarAttributeForDataTableTagJBIDE2016;
+import org.jboss.tools.jsf.jsp.ca.test.JsfJBide3845Test;
import org.jboss.tools.jsf.jsp.ca.test.JavaClassContentAssistProviderTest;
import org.jboss.tools.jsf.jsp.ca.test.JsfJspJbide1704Test;
import org.jboss.tools.jsf.jsp.ca.test.JsfJspJbide1717Test;
@@ -54,6 +55,8 @@
suite.addTestSuite(JsfJspJbide6259Test.class);
suite.addTestSuite(JsfJspJbide1704Test.class);
suite.addTestSuite(JsfJspJbide1717Test.class);
+ suite.addTestSuite(JsfJBide3845Test.class);
+
suite.addTest(
new ProjectImportTestSetup(WebContentAssistProviderTest.suite(),
"org.jboss.tools.jsf.ui.test",
13 years, 9 months
JBoss Tools SVN: r31817 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-06-03 11:44:18 -0400 (Fri, 03 Jun 2011)
New Revision: 31817
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java
Log:
Deleted duplicated line:
public static DirectoryScannerExtension createDirectoryScanner(IArchiveStandardFileSet fs, boolean scan) {
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java 2011-06-03 14:49:16 UTC (rev 31816)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java 2011-06-03 15:44:18 UTC (rev 31817)
@@ -38,7 +38,6 @@
};
public static DirectoryScannerExtension createDirectoryScanner(IArchiveStandardFileSet fs, boolean scan) {
- public static DirectoryScannerExtension createDirectoryScanner(IArchiveStandardFileSet fs, boolean scan) {
String excludes = fs.getExcludesPattern();
if( fs.getRootArchive().isDestinationInWorkspace() ) {
excludes += "," + fs.getRootArchive().getRawDestinationPath(); //$NON-NLS-1$
13 years, 9 months
JBoss Tools SVN: r31816 - trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2011-06-03 10:49:16 -0400 (Fri, 03 Jun 2011)
New Revision: 31816
Modified:
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/QueryImpl.java
Log:
https://issues.jboss.org/browse/JBIDE-8905
Modified: trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/QueryImpl.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/QueryImpl.java 2011-06-03 14:40:56 UTC (rev 31815)
+++ trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/QueryImpl.java 2011-06-03 14:49:16 UTC (rev 31816)
@@ -15,6 +15,7 @@
package org.eclipse.bpel.model.messageproperties.impl;
//Bugzilla 340654 - renamed to avoid confusion with WSDL's ExtensibilityElement
+import org.eclipse.bpel.model.Expression;
import org.eclipse.bpel.model.impl.BPELExtensibilityElementImpl;
import java.util.Collection;
@@ -55,7 +56,7 @@
*
* @customized
*/
-public class QueryImpl extends BPELExtensibilityElementImpl implements Query {
+public class QueryImpl extends BPELExtensibilityElementImpl implements Query, Expression {
/**
* The default value of the '{@link #getQueryLanguage() <em>Query Language</em>}' attribute.
* <!-- begin-user-doc -->
13 years, 9 months
JBoss Tools SVN: r31815 - branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2011-06-03 10:40:56 -0400 (Fri, 03 Jun 2011)
New Revision: 31815
Modified:
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/QueryImpl.java
Log:
https://issues.jboss.org/browse/JBIDE-8905
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/QueryImpl.java
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/QueryImpl.java 2011-06-03 14:33:39 UTC (rev 31814)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/QueryImpl.java 2011-06-03 14:40:56 UTC (rev 31815)
@@ -15,6 +15,7 @@
package org.eclipse.bpel.model.messageproperties.impl;
//Bugzilla 340654 - renamed to avoid confusion with WSDL's ExtensibilityElement
+import org.eclipse.bpel.model.Expression;
import org.eclipse.bpel.model.impl.BPELExtensibilityElementImpl;
import java.util.Collection;
@@ -55,7 +56,7 @@
*
* @customized
*/
-public class QueryImpl extends BPELExtensibilityElementImpl implements Query {
+public class QueryImpl extends BPELExtensibilityElementImpl implements Query, Expression {
/**
* The default value of the '{@link #getQueryLanguage() <em>Query Language</em>}' attribute.
* <!-- begin-user-doc -->
13 years, 9 months
JBoss Tools SVN: r31814 - trunk/jbpm/plugins/org.jboss.tools.jbpm.convert.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2011-06-03 10:33:39 -0400 (Fri, 03 Jun 2011)
New Revision: 31814
Modified:
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/pom.xml
Log:
JBIDE-8288 - Fix for BPMN/jBPM Export NPE - updating version for plugin in 3.3 stream to 1.3.0 - updating pom.xml too
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/pom.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/pom.xml 2011-06-03 14:31:59 UTC (rev 31813)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/pom.xml 2011-06-03 14:33:39 UTC (rev 31814)
@@ -9,6 +9,6 @@
</parent>
<groupId>org.jboss.tools.jbpm.plugins</groupId>
<artifactId>org.jboss.tools.jbpm.convert</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
13 years, 9 months
JBoss Tools SVN: r31813 - in branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert: .settings and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2011-06-03 10:31:59 -0400 (Fri, 03 Jun 2011)
New Revision: 31813
Added:
branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/.settings/attachedFile.properties
Modified:
branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/pom.xml
Log:
JBIDE-8288 - Fix for BPMN/jBPM Export NPE - updating version for plugin in 3.2 stream to 1.2.1
Added: branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/.settings/attachedFile.properties
===================================================================
--- branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/.settings/attachedFile.properties (rev 0)
+++ branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/.settings/attachedFile.properties 2011-06-03 14:31:59 UTC (rev 31813)
@@ -0,0 +1,2 @@
+# index of importer -> set(imports)
+
Property changes on: branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/.settings/attachedFile.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF 2011-06-03 14:29:55 UTC (rev 31812)
+++ branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF 2011-06-03 14:31:59 UTC (rev 31813)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.jboss.tools.jbpm.convert;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.1.qualifier
Bundle-Localization: plugin
Bundle-Activator: org.jboss.tools.jbpm.convert.bpmnto.BpmnToPlugin
Require-Bundle: org.eclipse.ui,
Modified: branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/pom.xml 2011-06-03 14:29:55 UTC (rev 31812)
+++ branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.convert/pom.xml 2011-06-03 14:31:59 UTC (rev 31813)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.jbpm.plugins</groupId>
<artifactId>org.jboss.tools.jbpm.convert</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
13 years, 9 months