JBoss Tools SVN: r35301 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-10-03 18:56:48 -0400 (Mon, 03 Oct 2011)
New Revision: 35301
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForELJavaAndJSTCompareTest.java
Log:
It is better to use AssertEquals then AssertTrue in case of comparing
https://issues.jboss.org/browse/JBIDE-9792
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForELJavaAndJSTCompareTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForELJavaAndJSTCompareTest.java 2011-10-03 21:06:36 UTC (rev 35300)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForELJavaAndJSTCompareTest.java 2011-10-03 22:56:48 UTC (rev 35301)
@@ -66,29 +66,28 @@
for (String prefix : PREFIXES) {
ELProposalProcessor.Proposal javaProposals[] = getJavaEditorProposals(prefix);
assertFalse ("No EL Proposals found in Java file: " + JAVA_FILENAME, (javaProposals == null || javaProposals.length == 0));
- assertTrue ("Content Assist in returned more than 1 proposal for Java file: " + JAVA_FILENAME +
- ". Test project and/or data should be verfied/updated.", (javaProposals.length == 1));
+ assertEquals ("Content Assist in returned more than 1 proposal for Java file: " + JAVA_FILENAME +
+ ". Test project and/or data should be verfied/updated.", 1, javaProposals.length);
AutoELContentAssistantProposal jstProposals[] = getJSTProposals(prefix);
assertFalse ("No EL Proposals found in Web page: " + PAGE_NAME, (jstProposals == null || jstProposals.length == 0));
- assertTrue ("Content Assist in returned more than 1 proposal for Web page: " + PAGE_NAME +
- ". Test project and/or data should be verfied/updated.", (jstProposals.length == 1));
+ assertEquals ("Content Assist in returned more than 1 proposal for Web page: " + PAGE_NAME +
+ ". Test project and/or data should be verfied/updated.", 1, jstProposals.length);
compareJavaAndJSTProposals(javaProposals[0], jstProposals[0]);
}
}
private ELProposalProcessor.Proposal[] getJavaEditorProposals(String prefix) {
- assertTrue("Test project \"" + PROJECT_NAME + "\" is not loaded", (project != null));
+ assertNotNull("Test project \"" + PROJECT_NAME + "\" is not loaded", project);
IFolder srcRoot = (IFolder)EclipseResourceUtil.getJavaSourceRoot(project);
IFile javaFile = (srcRoot == null ? null : (IFile)srcRoot.findMember(JAVA_FILENAME));
- assertTrue("The file \"" + JAVA_FILENAME + "\" is not found", (javaFile != null));
+ assertNotNull("The file \"" + JAVA_FILENAME + "\" is not found", javaFile);
assertTrue("The file \"" + JAVA_FILENAME + "\" is not found", (javaFile.exists()));
FileEditorInput editorInput = new FileEditorInput(javaFile);
- Throwable exception = null;
IEditorPart editorPart = null;
try {
@@ -115,26 +114,21 @@
SourceViewerConfiguration config = CATestUtil.getSourceViewerConfiguration(javaEditor);
IContentAssistant contentAssistant = (config == null ? null : config.getContentAssistant(viewer));
- assertTrue("Cannot get the Content Assistant instance for the editor for file \"" + JAVA_FILENAME + "\"", (contentAssistant != null));
+ assertNotNull("Cannot get the Content Assistant instance for the editor for file \"" + JAVA_FILENAME + "\"", contentAssistant);
String documentContent = document.get();
int start = (documentContent == null ? -1 : documentContent.indexOf(prefix));
int offsetToTest = start + prefix.length();
- assertTrue("Cannot find the starting point in the test file \"" + JAVA_FILENAME + "\"", (start != -1));
+ assertNotSame("Cannot find the starting point in the test file \"" + JAVA_FILENAME + "\"", -1, start);
ICompletionProposal[] result= null;
- String errorMessage = null;
IContentAssistProcessor p= CATestUtil.getProcessor(viewer, offsetToTest, contentAssistant);
if (p != null) {
result= p.computeCompletionProposals(viewer, offsetToTest);
}
- // if (errorMessage != null && errorMessage.trim().length() > 0) {
- // System.out.println("#" + offsetToTest + ": ERROR MESSAGE: " + errorMessage);
- // }
-
assertTrue("Content Assistant peturned no proposals", (result != null && result.length > 0));
Set<ELProposalProcessor.Proposal> javaProposals = new HashSet<ELProposalProcessor.Proposal>();
12 years, 6 months
JBoss Tools SVN: r35300 - trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-10-03 17:06:36 -0400 (Mon, 03 Oct 2011)
New Revision: 35300
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/LaunchJUnitTest.java
Log:
JBIDE-9368 Dashboard(s) for easy news aggregation, twitter and easy additional/3rd party plugin installation and project template/creation
Modified: trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/LaunchJUnitTest.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/LaunchJUnitTest.java 2011-10-03 20:23:54 UTC (rev 35299)
+++ trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/LaunchJUnitTest.java 2011-10-03 21:06:36 UTC (rev 35300)
@@ -50,7 +50,7 @@
if (projectNode != null) {
String activeProfiles = projectNode.get(ACTIVE_PROFILES, null);
if (!params[1].equals(activeProfiles)) {
- projectNode.put(ACTIVE_PROFILES, activeProfiles);
+ projectNode.put(ACTIVE_PROFILES, params[1]);
try {
projectNode.flush();
} catch (BackingStoreException e) {
12 years, 6 months
JBoss Tools SVN: r35299 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-10-03 16:23:54 -0400 (Mon, 03 Oct 2011)
New Revision: 35299
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForELJavaAndJSTCompareTest.java
Log:
It is better to use AssertEquals then AssertTrue in case of comparing
https://issues.jboss.org/browse/JBIDE-9792
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForELJavaAndJSTCompareTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForELJavaAndJSTCompareTest.java 2011-10-03 20:00:24 UTC (rev 35298)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForELJavaAndJSTCompareTest.java 2011-10-03 20:23:54 UTC (rev 35299)
@@ -181,11 +181,11 @@
private boolean compareJavaAndJSTProposals(ELProposalProcessor.Proposal javaProposal, AutoELContentAssistantProposal jstProposal) {
assertNotNull ("Display String of Java EL Proposal should not be a null", javaProposal.getDisplayString());
assertNotNull ("Display String of JST EL Proposal should not be a null", jstProposal.getDisplayString());
- assertTrue("Display Strings must be equal (Java: ["+javaProposal.getDisplayString() +"] != JST: [" + jstProposal.getDisplayString() + "])", javaProposal.getDisplayString().equals(jstProposal.getDisplayString()));
+ assertEquals("Display Strings must be equal", jstProposal.getDisplayString(), javaProposal.getDisplayString());
assertNotNull ("Additional Info String of Java EL Proposal should not be a null", javaProposal.getAdditionalProposalInfo());
assertNotNull ("Additional Info String of JST EL Proposal should not be a null", jstProposal.getAdditionalProposalInfo());
- assertTrue("Additional Info Strings must be equal (Java: ["+javaProposal.getAdditionalProposalInfo() +"] != JST: [" + jstProposal.getAdditionalProposalInfo() + "])", javaProposal.getAdditionalProposalInfo().equals(jstProposal.getAdditionalProposalInfo()));
+ assertEquals("Additional Info Strings must be equal", jstProposal.getAdditionalProposalInfo(), javaProposal.getAdditionalProposalInfo());
return true;
}
}
12 years, 6 months
JBoss Tools SVN: r35298 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-03 16:00:24 -0400 (Mon, 03 Oct 2011)
New Revision: 35298
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java
Log:
JBIDE-9815
https://issues.jboss.org/browse/JBIDE-9815
Method isDirty is overloaded to use local 'nestedEditors' field.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java 2011-10-03 19:49:45 UTC (rev 35297)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java 2011-10-03 20:00:24 UTC (rev 35298)
@@ -12,31 +12,17 @@
import java.util.ArrayList;
import java.util.Iterator;
-import java.util.List;
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.util.Assert;
import org.eclipse.jface.util.SafeRunnable;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Item;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
@@ -46,11 +32,8 @@
import org.eclipse.ui.IPropertyListener;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.handlers.IHandlerService;
-import org.eclipse.ui.part.EditorPart;
import org.eclipse.ui.part.MultiPageEditorPart;
import org.eclipse.ui.part.MultiPageEditorSite;
-import org.eclipse.ui.part.PageSwitcher;
import org.eclipse.wst.sse.ui.StructuredTextEditor;
import org.jboss.tools.common.core.resources.XModelObjectEditorInput;
import org.jboss.tools.jst.jsp.selection.bar.SelectionBar;
@@ -60,12 +43,7 @@
*/
public abstract class JSPMultiPageEditorPart extends MultiPageEditorPart {
- private static final String COMMAND_NEXT_SUB_TAB = "org.eclipse.ui.navigate.nextSubTab"; //$NON-NLS-1$
- private static final String COMMAND_PREVIOUS_SUB_TAB = "org.eclipse.ui.navigate.previousSubTab"; //$NON-NLS-1$
-
- private CTabFolder tabFolderContainer;
-
- private ArrayList nestedEditors = new ArrayList(3);
+ private ArrayList<IEditorPart> nestedEditors = new ArrayList<IEditorPart>(3);
private SelectionBar selectionBar;
@@ -144,8 +122,6 @@
return item;
}
- protected abstract void createPages();
-
protected abstract IEditorSite createSite(IEditorPart editor);
public void dispose() {
@@ -154,17 +130,14 @@
}
getSite().setSelectionProvider(null);
for (int i = 0; i < nestedEditors.size(); ++i) {
- IEditorPart editor = (IEditorPart) nestedEditors.get(i);
+ IEditorPart editor = nestedEditors.get(i);
disposePart(editor);
}
nestedEditors.clear();
}
protected IEditorPart getActiveEditor() {
- int index = getActivePage();
- if (index != -1)
- return getEditor(0);
- return null;
+ return super.getActiveEditor();
}
public SelectionBar getSelectionBar() {
@@ -234,4 +207,16 @@
}
}
}
+
+ public boolean isDirty() {
+ // use nestedEditors to avoid SWT requests; see bug 12996
+ for (Iterator<IEditorPart> i = nestedEditors.iterator(); i.hasNext();) {
+ IEditorPart editor = i.next();
+ if (editor.isDirty()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
}
12 years, 6 months
JBoss Tools SVN: r35297 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-03 15:49:45 -0400 (Mon, 03 Oct 2011)
New Revision: 35297
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2219Test.java
Log:
JBIDE-9815
https://issues.jboss.org/browse/JBIDE-9815
Added check for property 'dirty' on editor to existing test that really had to to it. The test checks that editor can be closed without saving, but before that it had to ensure that modification had set property 'dirty' to true.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2219Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2219Test.java 2011-10-03 19:37:40 UTC (rev 35296)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2219Test.java 2011-10-03 19:49:45 UTC (rev 35297)
@@ -57,7 +57,9 @@
//sets caret in the begining of text
styledText.setCaretOffset(0);
assertTrue("Char count should be a 0", styledText.getCharCount()==0); //$NON-NLS-1$
+ assertFalse(part.isDirty());
styledText.insert("Test "); //$NON-NLS-1$
+ assertTrue(part.isDirty());
styledText.setSelection(0, 1);
assertTrue("Char count shouldn't be a 0",styledText.getCharCount()>2); //$NON-NLS-1$
TestUtil.delay();
12 years, 6 months
JBoss Tools SVN: r35296 - in trunk/jsf/tests: org.jboss.tools.jsf.ui.test/META-INF and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-10-03 15:37:40 -0400 (Mon, 03 Oct 2011)
New Revision: 35296
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForELJavaAndJSTCompareTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/JavaSource/demo/User.java
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:
JBIDE-9792
EL Content Assistant for java files should show sources of El elements as it does for jsp files.
JUnit Test is added for the issue
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/JavaSource/demo/User.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/JavaSource/demo/User.java 2011-10-03 19:19:15 UTC (rev 35295)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/JavaSource/demo/User.java 2011-10-03 19:37:40 UTC (rev 35296)
@@ -20,6 +20,7 @@
@SessionScoped
public class User {
private String name;
+ private String testString = "#{user.name}";
public User() {
}
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-10-03 19:19:15 UTC (rev 35295)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2011-10-03 19:37:40 UTC (rev 35296)
@@ -36,6 +36,8 @@
org.eclipse.wst.validation,
org.eclipse.wst.html.core;bundle-version="1.1.500",
org.eclipse.wst.html.ui;bundle-version="1.0.600",
- org.jboss.tools.jst.jsp.base.test;bundle-version="3.3.0"
+ org.jboss.tools.jst.jsp.base.test;bundle-version="3.3.0",
+ org.jboss.tools.common.el.ui;bundle-version="3.3.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0"
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForELJavaAndJSTCompareTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForELJavaAndJSTCompareTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForELJavaAndJSTCompareTest.java 2011-10-03 19:37:40 UTC (rev 35296)
@@ -0,0 +1,191 @@
+/*******************************************************************************
+ * 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.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitEditor;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.text.contentassist.IContentAssistant;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.SourceViewerConfiguration;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.common.base.test.contentassist.CATestUtil;
+import org.jboss.tools.common.el.ui.ca.ELProposalProcessor;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.jst.jsp.contentassist.AutoELContentAssistantProposal;
+import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
+
+/**
+ * The JUnit test case for JBIDE-9792 issue
+ *
+ * @author Victor V. Rubezhny
+ *
+ */
+public class CAForELJavaAndJSTCompareTest extends ContentAssistantTestCase {
+ private static final String PROJECT_NAME = "JSF2KickStartWithoutLibs";
+ private static final String PAGE_NAME = "WebContent/pages/inputname.xhtml";
+ private static final String JAVA_FILENAME = "/demo/User.java";
+ private static final String PREFIXES[] = new String[] {"#{us" , "#{user.na"};
+
+ public void setUp() throws Exception {
+ project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
+ project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+ }
+
+ public static Test suite() {
+ return new TestSuite(CAForELJavaAndJSTCompareTest.class);
+ }
+
+ public void testCAForELJavaAndJSTCompare () {
+ for (String prefix : PREFIXES) {
+ ELProposalProcessor.Proposal javaProposals[] = getJavaEditorProposals(prefix);
+ assertFalse ("No EL Proposals found in Java file: " + JAVA_FILENAME, (javaProposals == null || javaProposals.length == 0));
+ assertTrue ("Content Assist in returned more than 1 proposal for Java file: " + JAVA_FILENAME +
+ ". Test project and/or data should be verfied/updated.", (javaProposals.length == 1));
+
+ AutoELContentAssistantProposal jstProposals[] = getJSTProposals(prefix);
+ assertFalse ("No EL Proposals found in Web page: " + PAGE_NAME, (jstProposals == null || jstProposals.length == 0));
+ assertTrue ("Content Assist in returned more than 1 proposal for Web page: " + PAGE_NAME +
+ ". Test project and/or data should be verfied/updated.", (jstProposals.length == 1));
+
+ compareJavaAndJSTProposals(javaProposals[0], jstProposals[0]);
+ }
+ }
+
+ private ELProposalProcessor.Proposal[] getJavaEditorProposals(String prefix) {
+ assertTrue("Test project \"" + PROJECT_NAME + "\" is not loaded", (project != null));
+
+ IFolder srcRoot = (IFolder)EclipseResourceUtil.getJavaSourceRoot(project);
+ IFile javaFile = (srcRoot == null ? null : (IFile)srcRoot.findMember(JAVA_FILENAME));
+
+ assertTrue("The file \"" + JAVA_FILENAME + "\" is not found", (javaFile != null));
+ assertTrue("The file \"" + JAVA_FILENAME + "\" is not found", (javaFile.exists()));
+
+ FileEditorInput editorInput = new FileEditorInput(javaFile);
+ Throwable exception = null;
+ IEditorPart editorPart = null;
+
+ try {
+ editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().openEditor(editorInput, "org.eclipse.jdt.ui.CompilationUnitEditor");
+ } catch (PartInitException e) {
+ fail("Couldn't obtain Java Editor for " + JAVA_FILENAME + ": " + e.getLocalizedMessage());
+ }
+
+ // clean deffered events
+ while (Display.getCurrent().readAndDispatch());
+
+ try {
+ CompilationUnitEditor javaEditor = null;
+
+ if (editorPart instanceof CompilationUnitEditor)
+ javaEditor = (CompilationUnitEditor)editorPart;
+
+ // Delay for 3 seconds so that
+ // the Favorites view can be seen.
+ JobUtils.waitForIdle();
+
+ ISourceViewer viewer = javaEditor.getViewer();
+ IDocument document = viewer.getDocument();
+ SourceViewerConfiguration config = CATestUtil.getSourceViewerConfiguration(javaEditor);
+ IContentAssistant contentAssistant = (config == null ? null : config.getContentAssistant(viewer));
+
+ assertTrue("Cannot get the Content Assistant instance for the editor for file \"" + JAVA_FILENAME + "\"", (contentAssistant != null));
+
+ String documentContent = document.get();
+ int start = (documentContent == null ? -1 : documentContent.indexOf(prefix));
+ int offsetToTest = start + prefix.length();
+
+ assertTrue("Cannot find the starting point in the test file \"" + JAVA_FILENAME + "\"", (start != -1));
+
+ ICompletionProposal[] result= null;
+ String errorMessage = null;
+
+ IContentAssistProcessor p= CATestUtil.getProcessor(viewer, offsetToTest, contentAssistant);
+ if (p != null) {
+ result= p.computeCompletionProposals(viewer, offsetToTest);
+ }
+
+ // if (errorMessage != null && errorMessage.trim().length() > 0) {
+ // System.out.println("#" + offsetToTest + ": ERROR MESSAGE: " + errorMessage);
+ // }
+
+ assertTrue("Content Assistant peturned no proposals", (result != null && result.length > 0));
+
+ Set<ELProposalProcessor.Proposal> javaProposals = new HashSet<ELProposalProcessor.Proposal>();
+ for (int j = 0; j < result.length; j++) {
+ if (result[j] instanceof ELProposalProcessor.Proposal) {
+ ELProposalProcessor.Proposal proposal = (ELProposalProcessor.Proposal)result[j];
+ javaProposals.add(proposal);
+ }
+ }
+ return javaProposals.toArray(new ELProposalProcessor.Proposal[0]);
+ } finally {
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+ .closeEditor(editorPart, false);
+ }
+ }
+
+ AutoELContentAssistantProposal[] getJSTProposals(String prefix) {
+ openEditor(PAGE_NAME);
+ try {
+ String documentContent = document.get();
+ int start = (documentContent == null ? -1 : documentContent.indexOf(prefix));
+ assertFalse("Required node '" + prefix + "' not found in document", (start == -1));
+ int offsetToTest = start + prefix.length();
+
+ JobUtils.waitForIdle();
+
+ List<ICompletionProposal> res = CATestUtil.collectProposals(contentAssistant, viewer, offsetToTest);
+
+ assertTrue("Content Assistant returned no proposals", (res != null && res.size() > 0));
+
+ Set<AutoELContentAssistantProposal> jstProposals = new HashSet<AutoELContentAssistantProposal>();
+ for (ICompletionProposal p : res) {
+ if (p instanceof AutoELContentAssistantProposal) {
+ jstProposals.add((AutoELContentAssistantProposal)p);
+ }
+ }
+
+ return jstProposals.toArray(new AutoELContentAssistantProposal[0]);
+ } finally {
+ closeEditor();
+ }
+ }
+
+ private boolean compareJavaAndJSTProposals(ELProposalProcessor.Proposal javaProposal, AutoELContentAssistantProposal jstProposal) {
+ assertNotNull ("Display String of Java EL Proposal should not be a null", javaProposal.getDisplayString());
+ assertNotNull ("Display String of JST EL Proposal should not be a null", jstProposal.getDisplayString());
+ assertTrue("Display Strings must be equal (Java: ["+javaProposal.getDisplayString() +"] != JST: [" + jstProposal.getDisplayString() + "])", javaProposal.getDisplayString().equals(jstProposal.getDisplayString()));
+
+ assertNotNull ("Additional Info String of Java EL Proposal should not be a null", javaProposal.getAdditionalProposalInfo());
+ assertNotNull ("Additional Info String of JST EL Proposal should not be a null", jstProposal.getAdditionalProposalInfo());
+ assertTrue("Additional Info Strings must be equal (Java: ["+javaProposal.getAdditionalProposalInfo() +"] != JST: [" + jstProposal.getAdditionalProposalInfo() + "])", javaProposal.getAdditionalProposalInfo().equals(jstProposal.getAdditionalProposalInfo()));
+ return true;
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForELJavaAndJSTCompareTest.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-10-03 19:19:15 UTC (rev 35295)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2011-10-03 19:37:40 UTC (rev 35296)
@@ -19,6 +19,7 @@
import org.jboss.tools.jsf.jsp.ca.test.CADefaultELStartingCharTest;
import org.jboss.tools.jsf.jsp.ca.test.CAELInsideTagBodyInJspFileTest;
import org.jboss.tools.jsf.jsp.ca.test.CAForCompositeComponentTest;
+import org.jboss.tools.jsf.jsp.ca.test.CAForELJavaAndJSTCompareTest;
import org.jboss.tools.jsf.jsp.ca.test.CAForELinStyleTest;
import org.jboss.tools.jsf.jsp.ca.test.CAForIDTest;
import org.jboss.tools.jsf.jsp.ca.test.CAForInputTagSrcAttributeSuggestsFilePathsJBIDE1807Test;
@@ -134,11 +135,15 @@
new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$
suite.addTest(new ProjectImportTestSetup(new TestSuite(
+ CAForELJavaAndJSTCompareTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$
+ new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$
+ new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$
+
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(
CAELInsideTagBodyInJspFileTest.class), "org.jboss.tools.jsf.ui.test", //$NON-NLS-1$
new String[] { "projects/Jbide3845Test", }, //$NON-NLS-1$
new String[] { "Jbide3845Test" })); //$NON-NLS-1$
-
// return new TestWizardsProject(suite);
return suite;
}
12 years, 6 months
JBoss Tools SVN: r35295 - trunk/common/tests/org.jboss.tools.common.ui.test.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-10-03 15:19:15 -0400 (Mon, 03 Oct 2011)
New Revision: 35295
Modified:
trunk/common/tests/org.jboss.tools.common.ui.test/
trunk/common/tests/org.jboss.tools.common.ui.test/pom.xml
Log:
fixed build errors
Property changes on: trunk/common/tests/org.jboss.tools.common.ui.test
___________________________________________________________________
Added: svn:ignore
+ target
Modified: trunk/common/tests/org.jboss.tools.common.ui.test/pom.xml
===================================================================
--- trunk/common/tests/org.jboss.tools.common.ui.test/pom.xml 2011-10-03 18:29:59 UTC (rev 35294)
+++ trunk/common/tests/org.jboss.tools.common.ui.test/pom.xml 2011-10-03 19:19:15 UTC (rev 35295)
@@ -14,4 +14,17 @@
<properties>
<emma.instrument.bundles>org.jboss.tools.common.ui.preferencevalue</emma.instrument.bundles>
</properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <configuration>
+ <useUIThread>false</useUIThread>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
12 years, 6 months
JBoss Tools SVN: r35294 - branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-10-03 14:29:59 -0400 (Mon, 03 Oct 2011)
New Revision: 35294
Modified:
branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/PackageNamesTest.java
Log:
wizard.getDataModel().setStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, ""); ->
wizard.getDataModel().setStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, "default");
https://issues.jboss.org/browse/JBIDE-9812
Modified: branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/PackageNamesTest.java
===================================================================
--- branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/PackageNamesTest.java 2011-10-03 18:01:06 UTC (rev 35293)
+++ branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/PackageNamesTest.java 2011-10-03 18:29:59 UTC (rev 35294)
@@ -43,7 +43,7 @@
@Override
protected void tearDown() {
- wizard.getDataModel().setStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, "");
+ wizard.getDataModel().setStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, "default");
wizard.performCancel();
dialog.close();
}
12 years, 6 months
JBoss Tools SVN: r35293 - trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/src/org/jboss/ide/eclipse/as/openshift/ui/internal/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-03 14:01:06 -0400 (Mon, 03 Oct 2011)
New Revision: 35293
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/src/org/jboss/ide/eclipse/as/openshift/ui/internal/wizard/ServerAdapterWizardModel.java
Log:
[JBIDE-9793] implementing DomainWizardPage
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/src/org/jboss/ide/eclipse/as/openshift/ui/internal/wizard/ServerAdapterWizardModel.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/src/org/jboss/ide/eclipse/as/openshift/ui/internal/wizard/ServerAdapterWizardModel.java 2011-10-03 17:38:16 UTC (rev 35292)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/src/org/jboss/ide/eclipse/as/openshift/ui/internal/wizard/ServerAdapterWizardModel.java 2011-10-03 18:01:06 UTC (rev 35293)
@@ -16,6 +16,7 @@
import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftService;
import org.jboss.ide.eclipse.as.openshift.core.ISSHPublicKey;
import org.jboss.ide.eclipse.as.openshift.core.IUser;
+import org.jboss.ide.eclipse.as.openshift.core.NotFoundOpenshiftException;
import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
import org.jboss.ide.eclipse.as.openshift.core.User;
import org.jboss.ide.eclipse.as.openshift.core.UserConfiguration;
@@ -113,7 +114,10 @@
if (user.isValid()) {
status = Status.OK_STATUS;
}
- } catch (OpenshiftException e) {
+ } catch (NotFoundOpenshiftException e) {
+ // valid user without domain
+ status = Status.OK_STATUS;
+ } catch(OpenshiftException e) {
this.user = null;
}
setCredentialsStatus(status);
12 years, 6 months
JBoss Tools SVN: r35292 - trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/src/org/jboss/ide/eclipse/as/openshift/ui/internal/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-03 13:38:16 -0400 (Mon, 03 Oct 2011)
New Revision: 35292
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/src/org/jboss/ide/eclipse/as/openshift/ui/internal/wizard/NewDomainWizardPage.java
Log:
[JBIDE-9793] implementing DomainWizardPage
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/src/org/jboss/ide/eclipse/as/openshift/ui/internal/wizard/NewDomainWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/src/org/jboss/ide/eclipse/as/openshift/ui/internal/wizard/NewDomainWizardPage.java 2011-10-03 17:25:20 UTC (rev 35291)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/src/org/jboss/ide/eclipse/as/openshift/ui/internal/wizard/NewDomainWizardPage.java 2011-10-03 17:38:16 UTC (rev 35292)
@@ -75,10 +75,10 @@
GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(sshKeyLabel);
Text sshKeyText = new Text(container, SWT.READ_ONLY | SWT.BORDER);
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(sshKeyText);
- DataBindingUtils.bindMandatoryTextField(sshKeyText, "SSH Key", ServerAdapterWizardModel.PROPERTY_SSHKEY, sshKeyText, dbc);
+ DataBindingUtils.bindMandatoryTextField(sshKeyText, "SSH Key", ServerAdapterWizardModel.PROPERTY_SSHKEY, model, dbc);
Button browseSShKeyButton = new Button(container, SWT.PUSH);
browseSShKeyButton.setText("Browse");
- GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).hint(100, 34).applyTo(browseSShKeyButton);
+ GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(browseSShKeyButton);
browseSShKeyButton.addSelectionListener(onBrowseSshKey());
Label spacerLabel = new Label(container, SWT.None);
@@ -103,7 +103,7 @@
dialog.setFilterExtensions(new String[]{FILTEREXPRESSION_PUBLIC_SSH_KEY});
String sshKeyPath = dialog.open();
if (sshKeyPath != null){
- model.setSshKey(dialog.getFileName());
+ model.setSshKey(sshKeyPath);
};
}
};
12 years, 6 months