JBoss Tools SVN: r34958 - trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-09-22 11:11:59 -0400 (Thu, 22 Sep 2011)
New Revision: 34958
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationTest.java
Log:
[JBIDE-9591] added application unmarshalling test
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationTest.java 2011-09-22 14:38:14 UTC (rev 34957)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationTest.java 2011-09-22 15:11:59 UTC (rev 34958)
@@ -26,6 +26,7 @@
import org.jboss.ide.eclipse.as.openshift.core.internal.request.ApplicationRequest;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.OpenshiftEnvelopeFactory;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.marshalling.ApplicationRequestJsonMarshaller;
+import org.jboss.ide.eclipse.as.openshift.core.internal.response.ApplicationResponseUnmarshaller;
import org.jboss.ide.eclipse.as.openshift.core.internal.response.ApplicationStatusResponseUnmarshaller;
import org.jboss.ide.eclipse.as.openshift.core.internal.response.JsonSanitizer;
import org.jboss.ide.eclipse.as.openshift.core.internal.response.OpenshiftResponse;
@@ -43,6 +44,35 @@
private static final String APPLICATION_NAME = "1316010645406";
private static final Cartridge APPLICATION_CARTRIDGE = Cartridge.JBOSSAS_7;
+ private static final String appResponse =
+ "{"
+ + " \"messages\":\"\","
+ + " \"debug\":\"Validating application limit toolsjboss(a)gmail.com: num of apps(0) must be < app limit(5)\n\","
+ + " \"data\":{"
+ + " \"health_check_path\":\"health\""
+ + " },"
+ + " \"api\":\"1.1.1\","
+ + " \"api_c\":[\"placeholder\"],"
+ + " \"result\":\"Successfully created application: "
+
+ + APPLICATION_NAME
+
+ + "\","
+ + " \"broker\":\"1.1.1\","
+ + " \"broker_c\":[\"namespace\","
+ + " \"rhlogin\","
+ + " \"ssh\","
+ + " \"app_uuid\","
+ + " \"debug\","
+ + " \"alter\","
+ + " \"cartridge\","
+ + " \"cart_type\","
+ + " \"action\","
+ + " \"app_name\","
+ + " \"api\"],"
+ + " \"exit_code\":0"
+ + "}";
+
private static final String log =
"10:30:38,700 INFO [org.apache.catalina.core.AprLifecycleListener] (MSC service thread 1-1) "
+ "The Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path:"
@@ -133,6 +163,18 @@
}
@Test
+ public void canUnmarshallApplicationResponse() throws OpenshiftException {
+ String response = JsonSanitizer.sanitize(statusResponse);
+ OpenshiftResponse<Application> openshiftResponse =
+ new ApplicationResponseUnmarshaller(APPLICATION_NAME, APPLICATION_CARTRIDGE, new NoopOpenshiftServiceFake())
+ .unmarshall(response);
+ Application application = openshiftResponse.getOpenshiftObject();
+ assertNotNull(application);
+ assertEquals(APPLICATION_NAME, application.getName());
+ assertEquals(APPLICATION_CARTRIDGE, application.getCartridge());
+ }
+
+ @Test
public void canUnmarshallApplicationStatus() throws OpenshiftException {
String response = JsonSanitizer.sanitize(statusResponse);
OpenshiftResponse<String> openshiftResponse =
14 years, 6 months
JBoss Tools SVN: r34957 - in trunk/jst/tests/org.jboss.tools.jst.text.ext.test: src/org/jboss/tools/jst/text/ext/test and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: vrubezhny
Date: 2011-09-22 10:38:14 -0400 (Thu, 22 Sep 2011)
New Revision: 34957
Added:
trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/WebContent/indexWithMediaRules.html
trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/WebContent/styleWithMediaRules.css
Modified:
trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/CSSStylesheetOpenOnTest.java
Log:
JBIDE-9740
Class cast exception in CA on CSS style classes
CSS Hyperlink JUnit Test is updated due to test the ClassCastException issue on @Media rules
Added: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/WebContent/indexWithMediaRules.html
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/WebContent/indexWithMediaRules.html (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/WebContent/indexWithMediaRules.html 2011-09-22 14:38:14 UTC (rev 34957)
@@ -0,0 +1,24 @@
+<html>
+<head>
+<style>
+p.inpageCommon {font-family:verdana,sans-serif;font-size:14px;}
+@media screen
+ {
+ p.inpageDisplay {font-family:verdana,sans-serif;font-size:14px;}
+ }
+@media print
+ {
+ p.inpagePrinter {font-family:times,serif;font-size:10px;}
+ }
+@media screen,print
+ {
+ p.inpageDisplayAndPrinter {font-weight:bold;}
+ }
+</style>
+<link rel="stylesheet" href="styleWithMediaRules.css" />
+</head>
+
+<body>
+<p class="common display printer displayAndPrinter inpageCommon inpageDisplay inpagePrinter inpageDisplayAndPrinter">p</p>
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/WebContent/indexWithMediaRules.html
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/WebContent/styleWithMediaRules.css
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/WebContent/styleWithMediaRules.css (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/WebContent/styleWithMediaRules.css 2011-09-22 14:38:14 UTC (rev 34957)
@@ -0,0 +1,13 @@
+p.common {font-family:verdana,sans-serif;font-size:14px;}
+@media screen
+ {
+ p.display {font-family:verdana,sans-serif;font-size:14px;}
+ }
+@media print
+ {
+ p.printer {font-family:times,serif;font-size:10px;}
+ }
+@media screen,print
+ {
+ p.displayAndPrinter {font-weight:bold;}
+ }
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/WebContent/styleWithMediaRules.css
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/CSSStylesheetOpenOnTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/CSSStylesheetOpenOnTest.java 2011-09-22 14:32:30 UTC (rev 34956)
+++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/CSSStylesheetOpenOnTest.java 2011-09-22 14:38:14 UTC (rev 34957)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.jst.text.ext.test;
+import java.util.HashSet;
+
import junit.framework.TestCase;
import org.eclipse.core.resources.IProject;
@@ -18,19 +20,22 @@
import org.eclipse.jface.text.FindReplaceDocumentAdapter;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.TextSelection;
import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.viewers.ISelection;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
+import org.eclipse.wst.sse.ui.StructuredTextEditor;
import org.jboss.tools.common.text.ext.hyperlink.HyperlinkDetector;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
-import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.WorkbenchUtils;
public class CSSStylesheetOpenOnTest extends TestCase {
private static final String PROJECT_NAME = "OpenOnTest";
private static final String PAGE_NAME = PROJECT_NAME+"/WebContent/index.html";
+ private static final String MEDIA_PAGE_NAME = PROJECT_NAME+"/WebContent/indexWithMediaRules.html";
public IProject project = null;
@@ -51,78 +56,169 @@
public void testCSSStylesheetOpenOn() throws PartInitException, BadLocationException {
final String editorName = "style.css";
final String tagName = "link";
- final String valueToFind = "style.css";
+ final String valueToFind = "style.css";
+ HashSet<IEditorPart> openedEditors = new HashSet<IEditorPart>();
+
IEditorPart editor = WorkbenchUtils.openEditor(PAGE_NAME);
+ if (editor != null) openedEditors.add(editor);
assertTrue(editor instanceof JSPMultiPageEditor);
- JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
- ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
+ try {
+ JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
+ ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
+
+ IDocument document = viewer.getDocument();
+ IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
+ tagName, true, true, false, false);
+ assertNotNull("Tag:"+tagName+" not found",reg);
- IDocument document = viewer.getDocument();
- IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
- tagName, true, true, false, false);
- assertNotNull("Tag:"+tagName+" not found",reg);
-
- reg = new FindReplaceDocumentAdapter(document).find(reg.getOffset(),
- valueToFind, true, true, false, false);
- assertNotNull("Value to find:"+valueToFind+" not found",reg);
-
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, true); // new Region(reg.getOffset() + reg.getLength(), 0)
-
- assertNotNull("Hyperlinks for value:"+valueToFind+" are not found",links);
-
- assertTrue("Hyperlinks for value:"+valueToFind+" are not found",links.length!=0);
-
- boolean found = false;
- for(IHyperlink link : links){
- assertNotNull(link.toString());
+ reg = new FindReplaceDocumentAdapter(document).find(reg.getOffset(),
+ valueToFind, true, true, false, false);
+ assertNotNull("Value to find:"+valueToFind+" not found",reg);
- link.open();
+ IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, true); // new Region(reg.getOffset() + reg.getLength(), 0)
- IEditorPart resultEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- if(editorName.equals(resultEditor.getTitle())){
- found = true;
- return;
+ assertTrue("Hyperlinks for value '"+valueToFind+"' are not found",(links != null && links.length > 0));
+
+ boolean found = false;
+ for(IHyperlink link : links){
+ assertNotNull(link.toString());
+
+ link.open();
+
+ IEditorPart resultEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ if (resultEditor != null) openedEditors.add(resultEditor);
+ if(editorName.equals(resultEditor.getTitle())){
+ found = true;
+ return;
+ }
}
+ assertTrue("OpenOn have not opened "+editorName+" editor",found);
+ } finally {
+ closeEditors(openedEditors);
}
- assertTrue("OpenOn have not opened "+editorName+" editor",found);
}
public void testCSSClassOpenOn() throws PartInitException, BadLocationException {
final String editorName = "style.css";
final String tagName = "div";
final String valueToFind = "red";
+ HashSet<IEditorPart> openedEditors = new HashSet<IEditorPart>();
+
IEditorPart editor = WorkbenchUtils.openEditor(PAGE_NAME);
- assertTrue(editor instanceof JSPMultiPageEditor);
- JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
- ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
+ if (editor != null) openedEditors.add(editor);
+ try {
+ assertTrue(editor instanceof JSPMultiPageEditor);
+ JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
+ ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
+
+ IDocument document = viewer.getDocument();
+ IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
+ tagName, true, true, false, false);
+ assertNotNull("Tag:"+tagName+" not found",reg);
- IDocument document = viewer.getDocument();
- IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
- tagName, true, true, false, false);
- assertNotNull("Tag:"+tagName+" not found",reg);
-
- reg = new FindReplaceDocumentAdapter(document).find(reg.getOffset(),
- valueToFind, true, true, false, false);
- assertNotNull("Value to find:"+valueToFind+" not found",reg);
-
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, true); // new Region(reg.getOffset() + reg.getLength(), 0)
-
- assertNotNull("Hyperlinks for value:"+valueToFind+" are not found",links);
-
- assertTrue("Hyperlinks for value:"+valueToFind+" are not found",links.length!=0);
-
- boolean found = false;
- for(IHyperlink link : links){
- assertNotNull(link.toString());
+ reg = new FindReplaceDocumentAdapter(document).find(reg.getOffset(),
+ valueToFind, true, true, false, false);
+ assertNotNull("Value to find:"+valueToFind+" not found",reg);
- link.open();
+ IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, true); // new Region(reg.getOffset() + reg.getLength(), 0)
- IEditorPart resultEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- if(editorName.equals(resultEditor.getTitle())){
- found = true;
- return;
+ assertTrue("Hyperlinks for value '"+valueToFind+"' are not found",(links != null && links.length > 0));
+
+ boolean found = false;
+ for(IHyperlink link : links){
+ assertNotNull(link.toString());
+
+ link.open();
+
+ IEditorPart resultEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ if (resultEditor != null) openedEditors.add(resultEditor);
+ if(editorName.equals(resultEditor.getTitle())){
+ found = true;
+ return;
+ }
}
+ assertTrue("OpenOn have not opened "+editorName+" editor",found);
+ } finally {
+ closeEditors(openedEditors);
}
- assertTrue("OpenOn have not opened "+editorName+" editor",found);
}
+
+ public void testCSSClassOpenOnWithMediaRules() throws PartInitException, BadLocationException {
+ HashSet<IEditorPart> openedEditors = new HashSet<IEditorPart>();
+ final String tagName = "<p class=";
+ final String[] valuesToFind = {
+ "common", "display", "printer", "displayAndPrinter",
+ "inpageCommon", "inpageDisplay", "inpagePrinter", "inpageDisplayAndPrinter"};
+ final String[] editorNames = {
+ "styleWithMediaRules.css", "styleWithMediaRules.css", "styleWithMediaRules.css", "styleWithMediaRules.css",
+ "indexWithMediaRules.html", "indexWithMediaRules.html", "indexWithMediaRules.html", "indexWithMediaRules.html"};
+ final int[] editorSelectionOffsets = {
+ 0, 81, 167, 253, 22, 106, 194, 282};
+ final int[] editorSelectionLengths = {
+ 57, 58, 51, 39, 63, 64, 57, 45};
+
+ IEditorPart editor = WorkbenchUtils.openEditor(MEDIA_PAGE_NAME);
+ if (editor != null) openedEditors.add(editor);
+ try {
+ assertTrue(editor instanceof JSPMultiPageEditor);
+ JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
+ ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
+
+ IDocument document = viewer.getDocument();
+ for (int i = 0; i < valuesToFind.length; i++) {
+ IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
+ tagName, true, true, false, false);
+ assertNotNull("Tag:"+tagName+" not found",reg);
+
+ reg = new FindReplaceDocumentAdapter(document).find(reg.getOffset(),
+ valuesToFind[i], true, true, false, false);
+ assertNotNull("Value to find '"+valuesToFind[i]+"' not found",reg);
+
+ IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, true); // new Region(reg.getOffset() + reg.getLength(), 0)
+
+ assertTrue("Hyperlinks for value '"+valuesToFind[i]+"' are not found",(links != null && links.length > 0));
+
+ boolean found = false;
+ for(IHyperlink link : links){
+ assertNotNull(link.toString());
+
+ link.open();
+
+ IEditorPart resultEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ if (resultEditor != null) openedEditors.add(resultEditor);
+ if(editorNames[i].equals(resultEditor.getTitle())){
+ StructuredTextEditor stEditor = null;
+ if (resultEditor instanceof StructuredTextEditor) {
+ stEditor = (StructuredTextEditor)resultEditor;
+ } else if (resultEditor instanceof JSPMultiPageEditor) {
+ stEditor = ((JSPMultiPageEditor)resultEditor).getSourceEditor();
+ }
+ assertNotNull("Unexpected Editor is openned: " + resultEditor.getTitle() + " [" + resultEditor.getClass().getName() + "]", stEditor);
+ ISelection selection = stEditor.getSelectionProvider().getSelection();
+ assertFalse("Required CSS Rule is not selected", selection.isEmpty());
+ if (selection instanceof TextSelection) {
+ TextSelection textSelection = (TextSelection)selection;
+ assertTrue("Required CSS Rule is not selected",
+ (textSelection.getOffset() == editorSelectionOffsets[i] && textSelection.getLength() == editorSelectionLengths[i]));
+ found = true;
+ break;
+ }
+ }
+ }
+ assertTrue("OpenOn have not opened "+editorNames[i]+" editor",found);
+ }
+ } finally {
+ closeEditors(openedEditors);
+ }
+ }
+
+ protected void closeEditors (HashSet<IEditorPart> editors) {
+ if (editors == null || editors.isEmpty())
+ return;
+ for (IEditorPart editor : editors) {
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow()
+ .getActivePage().closeEditor(editor, false);
+ }
+ }
+
}
14 years, 6 months
JBoss Tools SVN: r34956 - trunk/build/aggregate/webtools-site.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-09-22 10:32:30 -0400 (Thu, 22 Sep 2011)
New Revision: 34956
Modified:
trunk/build/aggregate/webtools-site/pom.xml
Log:
comment out var declarations to see if they pass thru from Hudson directly
Modified: trunk/build/aggregate/webtools-site/pom.xml
===================================================================
--- trunk/build/aggregate/webtools-site/pom.xml 2011-09-22 11:29:06 UTC (rev 34955)
+++ trunk/build/aggregate/webtools-site/pom.xml 2011-09-22 14:32:30 UTC (rev 34956)
@@ -31,8 +31,8 @@
<quiet>true</quiet>
<tasks>
<!-- called AFTER generating update site + zip to add in extra content -->
- <property name="JBT_VERSION" value="${JBT_VERSION}"/>
- <property name="BUILD_ALIAS" value="${BUILD_ALIAS}"/>
+ <!-- <property name="JBT_VERSION" value="${JBT_VERSION}"/>
+ <property name="BUILD_ALIAS" value="${BUILD_ALIAS}"/> -->
<ant antfile="build.xml"/>
</tasks>
</configuration>
14 years, 6 months
JBoss Tools SVN: r34955 - trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink.
by jbosstools-commits@lists.jboss.org
Author: vrubezhny
Date: 2011-09-22 07:29:06 -0400 (Thu, 22 Sep 2011)
New Revision: 34955
Modified:
trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/CSSClassHyperlink.java
Log:
JBIDE-9740
Class cast exception in CA on CSS style classes
ClassCastException in CSS Hyperlink is fixed.
Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/CSSClassHyperlink.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/CSSClassHyperlink.java 2011-09-22 11:04:22 UTC (rev 34954)
+++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/CSSClassHyperlink.java 2011-09-22 11:29:06 UTC (rev 34955)
@@ -17,8 +17,12 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.Region;
@@ -26,11 +30,7 @@
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.ide.IDE;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
import org.jboss.tools.common.el.core.resolver.ELContext;
import org.jboss.tools.common.text.ext.ExtensionsPlugin;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
@@ -45,8 +45,10 @@
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
+import org.w3c.dom.css.CSSMediaRule;
import org.w3c.dom.css.CSSRule;
import org.w3c.dom.css.CSSRuleList;
+import org.w3c.dom.css.CSSStyleRule;
/**
* @author Jeremy
@@ -75,8 +77,8 @@
CSSStyleSheetDescriptor descr = descrs.get(i);
CSSRuleList rules = descr.sheet.getCssRules();
for (int r = 0; rules != null && r < rules.getLength(); r++) {
- if (isRuleMatch(rules.item(r), getStyleName(region))) {
- CSSRule rule = rules.item(r);
+ CSSRule rule = getMatchedRule(rules.item(r), getStyleName(region));
+ if (rule != null) {
IFile file = findFileForCSSStyleSheet(descr.getFilePath());
if (file != null) {
int startOffset = 0;
@@ -114,9 +116,29 @@
.getFileForLocation(
ResourcesPlugin.getWorkspace().getRoot().
getLocation().append(filePath));
+ if (file != null)
+ return file;
- return file != null ? file : PageContextFactory.getFileFromProject(filePath, getFile());
+ // Thought if project is imported as a link from some out-of-workspace location and the first segment of path is a project
+ IPath path = new Path(filePath);
+
+ if (path.isAbsolute()) {
+ IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(IContainer.INCLUDE_HIDDEN);
+ for (int i = 0; i < projects.length; i++) {
+ IProject project = projects[i];
+ IPath projectLocation = project.getLocation();
+ if (projectLocation != null && projectLocation.lastSegment().equals(path.segment(0))) {
+ IPath projectRelatedPath = projectLocation.append(path.removeFirstSegments(1));
+ file = ResourcesPlugin.getWorkspace().getRoot()
+ .getFileForLocation(projectRelatedPath);
+ if (file != null)
+ return file;
+ }
+ }
+ }
+ return PageContextFactory.getFileFromProject(filePath, getFile());
+
}
/**
@@ -125,10 +147,25 @@
* @param styleName
* @return
*/
- protected boolean isRuleMatch(CSSRule cssRule, String styleName) {
+ protected CSSRule getMatchedRule(CSSRule cssRule, String styleName) {
+ if (cssRule instanceof CSSMediaRule) {
+ CSSMediaRule cssMediaRule = (CSSMediaRule)cssRule;
+ CSSRuleList rules = cssMediaRule.getCssRules();
+ for (int i = 0; rules != null && i < rules.getLength(); i++) {
+ CSSRule rule = rules.item(i);
+ CSSRule match = getMatchedRule(rule, styleName);
+ if (match != null)
+ return match;
+ }
+ return null;
+ }
+
+ if (!(cssRule instanceof CSSStyleRule))
+ return null;
+
// get selector text
- String selectorText = ((ICSSStyleRule) cssRule).getSelectorText();
+ String selectorText = ((CSSStyleRule) cssRule).getSelectorText();
if (selectorText != null) {
String styles[] = selectorText.trim().split(","); //$NON-NLS-1$
@@ -148,42 +185,15 @@
});
if (searchIndex >= 0)
- return true;
+ return cssRule;
}
}
}
- return false;
+ return null;
}
/**
*
- * @param cssRule
- * @return
- */
- protected Region getRegion(CSSRule cssRule) {
-
- int offset = ((IndexedRegion) cssRule).getStartOffset();
-
- // if css rule is contained in style tag so it is require to take into
- // account offset of this tag
- ICSSStyleSheet document = (ICSSStyleSheet) ((ICSSStyleRule) cssRule)
- .getOwnerDocument();
-
- ICSSModel model = document.getModel();
-
- // get style tag
- Node node = model.getOwnerDOMNode();
-
- // increase offset
- if (node instanceof IDOMElement)
- offset += ((IDOMElement) node).getStartEndOffset();
-
- return new Region(offset, 0);
-
- }
-
- /**
- *
* @param styleRegion
*/
protected void showRegion(IFile file, IRegion region) {
@@ -258,7 +268,7 @@
String attrText = getDocument().get(start, end - start);
StringBuffer sb = new StringBuffer(attrText);
- // find start of bean property
+ // find start of css class
int bStart = offset - start;
while (bStart >= 0) {
if (!Character.isJavaIdentifierPart(sb.charAt(bStart))
@@ -272,7 +282,7 @@
break;
bStart--;
}
- // find end of bean property
+ // find end of css class
int bEnd = offset - start;
while (bEnd < sb.length()) {
if (!Character.isJavaIdentifierPart(sb.charAt(bEnd))
14 years, 6 months
JBoss Tools SVN: r34954 - in trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test: resource and 10 other directories.
by jbosstools-commits@lists.jboss.org
Author: jpeterka
Date: 2011-09-22 07:04:22 -0400 (Thu, 22 Sep 2011)
New Revision: 34954
Added:
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/launcher/SmooksAllTests37.launch
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/.classpath
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/.project
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/.settings/
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/.settings/org.eclipse.jdt.core.prefs
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/bin/
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/bin/csv2java.xml
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/csv/
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/csv/input-message.csv
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/src/
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/src/csv2java.xml
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/src/example/
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/src/example/Customer.java
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/src/example/Gender.java
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/xml/
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/xml/customer.xml
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/testcase/SmooksCSV2Java2XML.java
Modified:
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/launcher/SmooksAllTests.launch
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/testcase/SmooksProject.java
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/tests/Project.java
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/tests/SmooksAllTests.java
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/tests/SmooksTest.java
Log:
[smooks-bot] added automated test for csv2java2xml
Modified: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/launcher/SmooksAllTests.launch
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/launcher/SmooksAllTests.launch 2011-09-22 10:38:32 UTC (rev 34953)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/launcher/SmooksAllTests.launch 2011-09-22 11:04:22 UTC (rev 34954)
@@ -30,7 +30,7 @@
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.smooks.ui.bot.test"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx384m -XX:MaxPermSize=256M -Dosgi.bundles=reference:file:org.eclipse.equinox.simpleconfigurator_1.0.200.v20100503.jar@1:start,org.eclipse.equinox.transforms.xslt@1:start,org.jboss.tools.equinox.transforms.xslt@1:start"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx384m -XX:MaxPermSize=256M -Dosgi.bundles=reference:file:org.eclipse.equinox.simpleconfigurator_1.0.200.v20100503.jar@1:start,org.eclipse.equinox.transforms.xslt@1:start,org.jboss.tools.equinox.transforms.xslt@1:start -Dusage_reporting_enabled=false -Dtest.configurations.dir=/home/jpeterka/etc/smooks"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
<booleanAttribute key="show_selected_only" value="false"/>
Added: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/launcher/SmooksAllTests37.launch
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/launcher/SmooksAllTests37.launch (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/launcher/SmooksAllTests37.launch 2011-09-22 11:04:22 UTC (rev 34954)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/tests/SmooksAllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="DISPLAY" value=":1"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.smooks.ui.bot.tests.SmooksAllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.smooks.ui.bot.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx384m -XX:PermSize=128M -XX:MaxPermSize=256M -Dusage_reporting_enabled=false -Dtest.configurations.dir=/home/jpeterka/etc/smooks/"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/launcher/SmooksAllTests37.launch
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/.classpath
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/.classpath (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/.classpath 2011-09-22 11:04:22 UTC (rev 34954)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/smooks"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/.project
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/.project (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/.project 2011-09-22 11:04:22 UTC (rev 34954)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>smooks-csv2java2xml</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/.settings/org.eclipse.jdt.core.prefs 2011-09-22 11:04:22 UTC (rev 34954)
@@ -0,0 +1,12 @@
+#Wed Oct 13 11:17:05 CEST 2010
+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.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+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/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/bin/csv2java.xml
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/bin/csv2java.xml (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/bin/csv2java.xml 2011-09-22 11:04:22 UTC (rev 34954)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?><smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.2.xsd" xmlns:ftl="http://www.milyn.org/xsd/smooks/freemarker-1.1.xsd" xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.2.xsd">
+ <params>
+ <param name="stream.filter.type">SAX</param>
+ <param name="inputType">input.csv</param>
+ <param name="input.csv" type="input.type.actived">Workspace://smooks-csv2java/csv/input-message.csv</param>
+ </params>
+ <csv:reader fields="firstname,surname,gender,age,nationality"/>
+ <jb:bean beanId="customer" class="example.Customer" createOnElement="/csv-set/csv-record">
+ <jb:value data="/csv-set/csv-record/age" property="age"/>
+ <jb:value data="/csv-set/csv-record/nationality" property="country"/>
+ <jb:value data="/csv-set/csv-record/firstname" property="firstName"/>
+ <jb:value data="/csv-set/csv-record/gender" decoder="Enum" property="gender">
+ <jb:decodeParam name="enumType">example.Gender</jb:decodeParam>
+ <jb:decodeParam name="Male">Male</jb:decodeParam>
+ <jb:decodeParam name="Female">Female</jb:decodeParam>
+ </jb:value>
+ <jb:value data="/csv-set/csv-record/surname" property="lastName"/>
+ </jb:bean>
+ <ftl:freemarker applyOnElement="#document">
+ <ftl:template><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<customer>
+ <firstname>${customer.firstName!?string}</firstname>
+ <surname>${customer.lastName!?string}</surname>
+ <age>${customer.age!?c}</age>
+ <countery>${customer.country!?string}</countery>
+ <gender>${customer.gender!?string}</gender>
+</customer>]]></ftl:template>
+ <param name="modelSrc">Workspace://smooks-csv2java-xml/xml/customer.xml</param>
+ <param name="modelSrcType">XML</param>
+ <param name="messageType">XML</param>
+ <param name="templateDataProvider">java_mapping</param>
+ </ftl:freemarker>
+</smooks-resource-list>
Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/bin/csv2java.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/csv/input-message.csv
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/csv/input-message.csv (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/csv/input-message.csv 2011-09-22 11:04:22 UTC (rev 34954)
@@ -0,0 +1,3 @@
+charles,moulliard,Male,43,belgium
+maxence,dewil,Male,30,belgium
+eleonor,moulliard,Female,12,belgium
\ No newline at end of file
Added: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/src/csv2java.xml
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/src/csv2java.xml (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/src/csv2java.xml 2011-09-22 11:04:22 UTC (rev 34954)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?><smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.2.xsd" xmlns:ftl="http://www.milyn.org/xsd/smooks/freemarker-1.1.xsd" xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.2.xsd">
+ <params>
+ <param name="stream.filter.type">SAX</param>
+ <param name="inputType">input.csv</param>
+ <param name="input.csv" type="input.type.actived">Workspace://smooks-csv2java2xml/csv/input-message.csv</param>
+ </params>
+ <csv:reader fields="firstname,surname,gender,age,nationality"/>
+ <jb:bean beanId="customer" class="example.Customer" createOnElement="/csv-set/csv-record">
+ <jb:value data="/csv-set/csv-record/age" property="age"/>
+ <jb:value data="/csv-set/csv-record/nationality" property="country"/>
+ <jb:value data="/csv-set/csv-record/firstname" property="firstName"/>
+ <jb:value data="/csv-set/csv-record/gender" decoder="Enum" property="gender">
+ <jb:decodeParam name="enumType">example.Gender</jb:decodeParam>
+ <jb:decodeParam name="Male">Male</jb:decodeParam>
+ <jb:decodeParam name="Female">Female</jb:decodeParam>
+ </jb:value>
+ <jb:value data="/csv-set/csv-record/surname" property="lastName"/>
+ </jb:bean>
+ <ftl:freemarker applyOnElement="#document">
+ <ftl:template><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<customer>
+ <firstname>${customer.firstName!?string}</firstname>
+ <surname>${customer.lastName!?string}</surname>
+ <age>${customer.age!?c}</age>
+ <countery>${customer.country!?string}</countery>
+ <gender>${customer.gender!?string}</gender>
+</customer>]]></ftl:template>
+ <param name="modelSrc">Workspace://smooks-csv2java-xml/xml/customer.xml</param>
+ <param name="modelSrcType">XML</param>
+ <param name="messageType">XML</param>
+ <param name="templateDataProvider">java_mapping</param>
+ </ftl:freemarker>
+</smooks-resource-list>
Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/src/csv2java.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/src/example/Customer.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/src/example/Customer.java (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/src/example/Customer.java 2011-09-22 11:04:22 UTC (rev 34954)
@@ -0,0 +1,46 @@
+package example;
+
+public class Customer {
+
+ private String FirstName;
+ private String LastName;
+ private Gender Gender;
+ private int Age;
+ private String Country;
+
+ public String getCountry() {
+ return Country;
+ }
+ public void setCountry(String country) {
+ Country = country;
+ }
+ public String getFirstName() {
+ return FirstName;
+ }
+ public void setFirstName(String firstName) {
+ FirstName = firstName;
+ }
+ public String getLastName() {
+ return LastName;
+ }
+ public void setLastName(String lastName) {
+ LastName = lastName;
+ }
+ public Gender getGender() {
+ return Gender;
+ }
+ public void setGender(Gender gender) {
+ Gender = gender;
+ }
+ public int getAge() {
+ return Age;
+ }
+ public void setAge(int age) {
+ Age = age;
+ }
+
+ public String toString() {
+ return "[" + FirstName + ", " + LastName + ", " + Gender + ", " + Age + ", " + Country + "]";
+ }
+}
+
Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/src/example/Customer.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/src/example/Gender.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/src/example/Gender.java (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/src/example/Gender.java 2011-09-22 11:04:22 UTC (rev 34954)
@@ -0,0 +1,8 @@
+package example;
+
+public enum Gender {
+
+ Male,
+ Female
+
+}
Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/src/example/Gender.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/xml/customer.xml
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/xml/customer.xml (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/xml/customer.xml 2011-09-22 11:04:22 UTC (rev 34954)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<customer>
+ <firstname></firstname>
+ <surname></surname>
+ <age></age>
+ <countery></countery>
+ <gender></gender>
+</customer>
\ No newline at end of file
Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/resource/prj/smooks-csv2java2xml/xml/customer.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/testcase/SmooksCSV2Java2XML.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/testcase/SmooksCSV2Java2XML.java (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/testcase/SmooksCSV2Java2XML.java 2011-09-22 11:04:22 UTC (rev 34954)
@@ -0,0 +1,103 @@
+package org.jboss.tools.smooks.ui.bot.testcase;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
+import org.jboss.tools.smooks.ui.bot.test.Activator;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
+import org.jboss.tools.ui.bot.ext.helper.FileHelper;
+import org.jboss.tools.ui.bot.ext.helper.ImportHelper;
+import org.jboss.tools.ui.bot.ext.helper.ResourceHelper;
+import org.jboss.tools.ui.bot.ext.view.ProjectExplorer;
+import org.jboss.tools.ui.bot.ext.zest.SWTBotZestGraph;
+import org.jboss.tools.ui.bot.ext.zest.SWTBotZestNode;
+import org.jboss.tools.ui.bot.ext.zest.SWTZestBot;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+(a)RunWith(SWTBotJunit4ClassRunner.class)
+@Require(clearWorkspace = true, perspective = "Java")
+public class SmooksCSV2Java2XML extends SWTTestExt {
+ class MyFileFilter implements FileFilter {
+
+ @Override
+ public boolean accept(File pathname) {
+ return true;
+ }
+ }
+
+ String config1 = "csv2java.xml";
+ String prj1 = "smooks-csv2java2xml";
+
+ @Test
+ public void openConfiguration() {
+ // copy smooks-csv2java2xml
+
+ String rpath = ResourceHelper.getResourceAbsolutePath(
+ Activator.PLUGIN_ID, "resource/prj");
+ String wpath = ResourceHelper.getWorkspaceAbsolutePath();
+
+ try {
+ FileHelper.copyFilesBinaryRecursively(new File(rpath), new File(
+ wpath), new MyFileFilter());
+ } catch (IOException e) {
+ e.printStackTrace();
+ throw new RuntimeException("Unable to copy resource files");
+ }
+
+ System.out.println("Copied");
+
+ ImportHelper.importAllProjects(wpath);
+ System.out.println("Imported");
+
+ // open smooks configuration
+ ProjectExplorer pe = new ProjectExplorer();
+ pe.openFile(prj1, "src", config1);
+ }
+
+ @Test
+ public void checkEditor() {
+
+ SWTZestBot zestBot = new SWTZestBot();
+ SWTBotZestGraph graph = zestBot.getZestGraph(0);
+
+ SWTBotZestNode node = graph.node("Input Task");
+ node.click();
+ bot.sleep(TIME_1S);
+
+ node = graph.node("Java Mapping");
+ node.click();
+ bot.sleep(TIME_1S);
+
+ node = graph.node("Apply Template (XML)");
+ node.click();
+ bot.sleep(TIME_1S);
+ }
+
+ @Test
+ public void executeConfiguration() {
+ ProjectExplorer pe = new ProjectExplorer();
+
+ // execute
+ console.clearConsole();
+ pe.selectTreeItem(config1, new String[] { prj1, "src" });
+ ContextMenuHelper.clickContextMenu(pe.bot().tree(), "Run As",
+ "2 Smooks Run Configuration");
+
+ // check the console
+ console.show();
+ String s = console.getConsoleText();
+ String e = "error";
+ assertNotNull("No output in console", s);
+ int index = s.indexOf(e);
+ assertTrue("Error while processing csv2java2xml conf", index == -1);
+
+ SWTBot bot = new SWTBot();
+ bot.sleep(1000);
+ }
+}
Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/testcase/SmooksCSV2Java2XML.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/testcase/SmooksProject.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/testcase/SmooksProject.java 2011-09-22 10:38:32 UTC (rev 34953)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/testcase/SmooksProject.java 2011-09-22 11:04:22 UTC (rev 34954)
@@ -8,7 +8,6 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
import org.eclipse.swtbot.eclipse.gef.finder.SWTGefBot;
import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditor;
@@ -16,11 +15,12 @@
import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
import org.jboss.tools.smooks.ui.bot.test.Activator;
import org.jboss.tools.smooks.ui.bot.tests.Project;
-import org.jboss.tools.smooks.ui.bot.tests.SmooksTest;
+import org.jboss.tools.ui.bot.ext.SWTEclipseExt;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
import org.jboss.tools.ui.bot.ext.entity.JavaProjectEntity;
import org.jboss.tools.ui.bot.ext.gen.ActionItem;
import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
-import org.jboss.tools.ui.bot.ext.helper.UserLibraryHelper;
import org.jboss.tools.ui.bot.ext.types.EntityType;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.ui.bot.ext.zest.SWTBotZestContextMenu;
@@ -31,7 +31,8 @@
import org.junit.runner.RunWith;
@RunWith(SWTBotJunit4ClassRunner.class)
-public class SmooksProject extends SmooksTest {
+@Require(clearWorkspace = true, perspective = "Java")
+public class SmooksProject extends SWTTestExt {
boolean projectCreated = false;
@@ -56,19 +57,6 @@
}
/**
- * Defines smooks user library inside
- */
- @Test
- public void defineSmooksUserLibrary() {
-
- String[] jarList = UserLibraryHelper.getJarList(Project.SMOOKS_PATH
- + "/lib");
- UserLibraryHelper.addUserLibrary("smooks-1.2.4", jarList);
-
- // Check if library is defined TODO
- }
-
- /**
* Add Smooks User Library to Smooks project classpath
*/
@Test
@@ -150,7 +138,7 @@
SWTBotView view = open
.viewOpen(ActionItem.View.JavaPackageExplorer.LABEL);
- eclipse.selectTreeLocation(view.bot(), Project.PROJECT_NAME, "src");
+ SWTEclipseExt.selectTreeLocation(view.bot(), Project.PROJECT_NAME, "src");
eclipse.createNew(EntityType.SMOOKS_CONFIG);
open.finish(bot.activeShell().bot());
@@ -182,7 +170,7 @@
bot.clickButton("Add");
bot.clickButton("Browse WorkSpace");
SWTBot shellBot = bot.shell("Select Files").bot();
- eclipse.selectTreeLocation(shellBot, Project.PROJECT_NAME, "xml", "order.xml");
+ SWTEclipseExt.selectTreeLocation(shellBot, Project.PROJECT_NAME, "xml", "order.xml");
bot.clickButton(IDELabel.Button.OK);
bot.clickButton(IDELabel.Button.FINISH);
bot.activeEditor().save();
@@ -202,8 +190,6 @@
bot.sleep(2000, "Check java mapping");
bot.sleep(1000, "check widgets");
-
- SWTWorkbenchBot bot;
}
@Test
Modified: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/tests/Project.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/tests/Project.java 2011-09-22 10:38:32 UTC (rev 34953)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/tests/Project.java 2011-09-22 11:04:22 UTC (rev 34954)
@@ -1,18 +1,8 @@
package org.jboss.tools.smooks.ui.bot.tests;
-import org.eclipse.swt.widgets.MessageBox;
public class Project {
// Smooks project
public static final String PROJECT_NAME = "smookstest1";
- public static final String SMOOKS_PATH_VAR_NAME = "jbosstools.test.smooks.1.2.4";
- public static final String SMOOKS_PATH;
- public static final String SMOOKS_LIBNAME = "smooks-1.2.4";
-
- static {
- SMOOKS_PATH = System.getProperty(SMOOKS_PATH_VAR_NAME);
- if(SMOOKS_PATH==null) {
- throw new IllegalStateException(java.text.MessageFormat.format("System property {''0''} is not defined", SMOOKS_PATH_VAR_NAME));
- }
- }
+ public static final String SMOOKS_LIBNAME = "smooks";
}
Modified: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/tests/SmooksAllTests.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/tests/SmooksAllTests.java 2011-09-22 10:38:32 UTC (rev 34953)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/tests/SmooksAllTests.java 2011-09-22 11:04:22 UTC (rev 34954)
@@ -1,14 +1,16 @@
package org.jboss.tools.smooks.ui.bot.tests;
+import org.jboss.tools.smooks.ui.bot.testcase.SmooksCSV2Java2XML;
import org.jboss.tools.smooks.ui.bot.testcase.SmooksProject;
+import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
-(a)RunWith(Suite.class)
-@SuiteClasses( {SmooksProject.class})
+(a)RunWith(RequirementAwareSuite.class)
+@SuiteClasses( {SmooksProject.class, SmooksCSV2Java2XML.class})
+
public class SmooksAllTests extends SmooksTest {
@BeforeClass
Modified: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/tests/SmooksTest.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/tests/SmooksTest.java 2011-09-22 10:38:32 UTC (rev 34953)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/tests/SmooksTest.java 2011-09-22 11:04:22 UTC (rev 34954)
@@ -1,6 +1,8 @@
package org.jboss.tools.smooks.ui.bot.tests;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.config.TestConfigurator;
+import org.jboss.tools.ui.bot.ext.helper.UserLibraryHelper;
public class SmooksTest extends SWTTestExt {
@@ -8,11 +10,14 @@
public static void prepare() {
eclipse.maximizeActiveShell();
- jbt.closeReportUsageWindowIfOpened(false);
- bot.viewByTitle("Welcome").close();
+
+ // prepare smooks user library
+ String libPath = TestConfigurator.currentConfig.getProperty("LIB.SMOOKS");
+ String[] jarList = UserLibraryHelper.getJarList(libPath);
+ UserLibraryHelper.addUserLibrary("smooks", jarList );
}
public static void clean() {
- bot.sleep(10000, "All Finished");
+ bot.sleep(1000, "All Finished");
}
}
14 years, 6 months
JBoss Tools SVN: r34953 - in trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext: types and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: jpeterka
Date: 2011-09-22 06:38:32 -0400 (Thu, 22 Sep 2011)
New Revision: 34953
Added:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ImportHelper.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ResourceHelper.java
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/UserLibraryHelper.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/JobLists.java
Log:
[bot-ext] resource and import helpers added
Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ImportHelper.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ImportHelper.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ImportHelper.java 2011-09-22 10:38:32 UTC (rev 34953)
@@ -0,0 +1,30 @@
+package org.jboss.tools.ui.bot.ext.helper;
+
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.jboss.tools.ui.bot.ext.SWTBotExt;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+
+/**
+ * Heper class for project imports
+ */
+public class ImportHelper {
+
+ /**
+ * Import all projects from from given path to current workspace
+ */
+ public static void importAllProjects(String path) {
+ SWTBotExt bot = new SWTBotExt();
+ bot.menu("File").menu("Import...").click();
+
+ SWTBot dlgBot = bot.shell("Import").activate().bot();
+ dlgBot.tree().expandNode("General").expandNode("Existing Projects into Workspace").select();
+ dlgBot.button(IDELabel.Button.NEXT).click();
+
+ dlgBot.radio(0).click();
+ dlgBot.text().setText(path);
+ dlgBot.radio(1).click();
+ dlgBot.radio(0).click();
+ dlgBot.button("Select All").click();
+ dlgBot.button(IDELabel.Button.FINISH).click();
+ }
+}
Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ImportHelper.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ResourceHelper.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ResourceHelper.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ResourceHelper.java 2011-09-22 10:38:32 UTC (rev 34953)
@@ -0,0 +1,62 @@
+package org.jboss.tools.ui.bot.ext.helper;
+
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Platform;
+
+
+/**
+ * Class provides resource related static methods
+ */
+public class ResourceHelper {
+
+ /**
+ * Provide bundle resource absolute path
+ * @param pluginId - plugin id
+ * @param path - resource relative path
+ * @return resource absolute path
+ */
+ public static String getResourceAbsolutePath(String pluginId, String... path) {
+
+ // Construct path
+ StringBuilder builder = new StringBuilder();
+ for (String fragment : path) {
+ builder.append("/" + fragment);
+ }
+
+ String filePath = "";
+ try {
+ filePath = FileLocator.toFileURL(
+ Platform.getBundle(pluginId).getEntry("/")).getFile()
+ + "resources" + builder.toString();
+ File file = new File(filePath);
+ if (!file.isFile()) {
+ filePath = FileLocator.toFileURL(
+ Platform.getBundle(pluginId).getEntry("/")).getFile()
+ + builder.toString();
+ }
+ } catch (IOException ex) {
+ String message = filePath + " resource file not found";
+ //log.error(message);
+ fail(message);
+ }
+
+ return filePath;
+ }
+
+ /**
+ * Gets workspace absolute path
+ * @return current workspace absolute path
+ */
+ public static String getWorkspaceAbsolutePath() {
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ String path = workspace.getRoot().getLocation().toFile().getAbsolutePath();
+ return path;
+ }
+}
Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ResourceHelper.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/UserLibraryHelper.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/UserLibraryHelper.java 2011-09-22 08:26:11 UTC (rev 34952)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/UserLibraryHelper.java 2011-09-22 10:38:32 UTC (rev 34953)
@@ -66,6 +66,7 @@
/**
* Creates user library with given identifiers and given jar list
+ * You can receive jar list via #getJarList
*
* @param libName
* @param jarPaths
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/JobLists.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/JobLists.java 2011-09-22 08:26:11 UTC (rev 34952)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/JobLists.java 2011-09-22 10:38:32 UTC (rev 34953)
@@ -16,5 +16,5 @@
public class JobLists {
public static String[] ignoredJobs = { "Process Console Input Job", "Usage Data Event consumer",
- "Updating indexes" };
+ "Updating indexes","Reporting JBoss Developer Studio usage" };
}
14 years, 6 months
JBoss Tools SVN: r34952 - in trunk/build/aggregate: site and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-09-22 04:26:11 -0400 (Thu, 22 Sep 2011)
New Revision: 34952
Modified:
trunk/build/aggregate/bottests-site/site/pom.xml
trunk/build/aggregate/site/pom.xml
trunk/build/aggregate/soa-site/pom.xml
trunk/build/aggregate/webtools-site/pom.xml
Log:
JBIDE-9743 pass in BUILD_ALIAS from maven to ant
Modified: trunk/build/aggregate/bottests-site/site/pom.xml
===================================================================
--- trunk/build/aggregate/bottests-site/site/pom.xml 2011-09-22 01:06:50 UTC (rev 34951)
+++ trunk/build/aggregate/bottests-site/site/pom.xml 2011-09-22 08:26:11 UTC (rev 34952)
@@ -32,6 +32,7 @@
<tasks>
<!-- called AFTER generating update site + zip to add in extra content -->
<property name="JBT_VERSION" value="${JBT_VERSION}"/>
+ <property name="BUILD_ALIAS" value="${BUILD_ALIAS}"/>
<ant antfile="build.xml"/>
</tasks>
</configuration>
Modified: trunk/build/aggregate/site/pom.xml
===================================================================
--- trunk/build/aggregate/site/pom.xml 2011-09-22 01:06:50 UTC (rev 34951)
+++ trunk/build/aggregate/site/pom.xml 2011-09-22 08:26:11 UTC (rev 34952)
@@ -37,6 +37,7 @@
<property name="inputRepo1" value="${inputRepo1}"/>
<property name="inputRepos" value="${inputRepos}"/>
<property name="JBT_VERSION" value="${JBT_VERSION}"/>
+ <property name="BUILD_ALIAS" value="${BUILD_ALIAS}"/>
<ant antfile="build.xml"/>
</tasks>
</configuration>
Modified: trunk/build/aggregate/soa-site/pom.xml
===================================================================
--- trunk/build/aggregate/soa-site/pom.xml 2011-09-22 01:06:50 UTC (rev 34951)
+++ trunk/build/aggregate/soa-site/pom.xml 2011-09-22 08:26:11 UTC (rev 34952)
@@ -42,6 +42,7 @@
<property name="inputRepo1" value="${inputRepo1}"/>
<property name="inputRepos" value="${inputRepos}"/>
<property name="JBT_VERSION" value="${JBT_VERSION}"/>
+ <property name="BUILD_ALIAS" value="${BUILD_ALIAS}"/>
<ant antfile="build.xml"/>
</tasks>
</configuration>
Modified: trunk/build/aggregate/webtools-site/pom.xml
===================================================================
--- trunk/build/aggregate/webtools-site/pom.xml 2011-09-22 01:06:50 UTC (rev 34951)
+++ trunk/build/aggregate/webtools-site/pom.xml 2011-09-22 08:26:11 UTC (rev 34952)
@@ -32,6 +32,7 @@
<tasks>
<!-- called AFTER generating update site + zip to add in extra content -->
<property name="JBT_VERSION" value="${JBT_VERSION}"/>
+ <property name="BUILD_ALIAS" value="${BUILD_ALIAS}"/>
<ant antfile="build.xml"/>
</tasks>
</configuration>
14 years, 6 months
JBoss Tools SVN: r34951 - in trunk/build/aggregate: site and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-09-21 21:06:50 -0400 (Wed, 21 Sep 2011)
New Revision: 34951
Modified:
trunk/build/aggregate/bottests-site/site/build.xml
trunk/build/aggregate/site/build.xml
trunk/build/aggregate/soa-site/build.xml
trunk/build/aggregate/webtools-site/build.xml
Log:
better formatting of version string -- want x.y.z.vYYYYMMDD-hhmm-Hxxx-Mx.typeOfBuild instead of x.y_trunkOrstable_branch.typeOfBuild.YYYY-MM-DD_hh_mm_ss-Hxxx
Modified: trunk/build/aggregate/bottests-site/site/build.xml
===================================================================
--- trunk/build/aggregate/bottests-site/site/build.xml 2011-09-22 01:01:47 UTC (rev 34950)
+++ trunk/build/aggregate/bottests-site/site/build.xml 2011-09-22 01:06:50 UTC (rev 34951)
@@ -445,16 +445,18 @@
<isset property="BUILD_NUMBER" />
</and>
<then>
+ <!-- from 2011-09-21_01-11-04 to 20110921-0111 -->
+ <propertyregex override="true" property="BUILD_TS" defaultvalue="${BUILD_ID}" input="${BUILD_ID}" regexp="([0-9]+)-([0-9]+)-([0-9]+)_([0-9]+)-([0-9]+)-([0-9]+)" replace="v\1\2\3-\4\5" />
<if>
<and>
<isset property="JBT_VERSION" />
<isset property="BUILD_ALIAS" />
</and>
<then>
- <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": ${JBT_VERSION}.${BUILD_ALIAS}\3.${BUILD_ID}-H${BUILD_NUMBER}" />
+ <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": ${JBT_VERSION}.${BUILD_TS}-H${BUILD_NUMBER}-${BUILD_ALIAS}\3" />
</then>
<else>
- <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+.*).aggregate" replace=": \1.${BUILD_ID}-H${BUILD_NUMBER}" />
+ <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": \1.${BUILD_TS}-H${BUILD_NUMBER}\2\3" />
</else>
</if>
</then>
Modified: trunk/build/aggregate/site/build.xml
===================================================================
--- trunk/build/aggregate/site/build.xml 2011-09-22 01:01:47 UTC (rev 34950)
+++ trunk/build/aggregate/site/build.xml 2011-09-22 01:06:50 UTC (rev 34951)
@@ -444,7 +444,20 @@
<isset property="BUILD_NUMBER" />
</and>
<then>
- <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+.*).aggregate" replace=": \1.${BUILD_ID}-H${BUILD_NUMBER}" />
+ <!-- from 2011-09-21_01-11-04 to 20110921-0111 -->
+ <propertyregex override="true" property="BUILD_TS" defaultvalue="${BUILD_ID}" input="${BUILD_ID}" regexp="([0-9]+)-([0-9]+)-([0-9]+)_([0-9]+)-([0-9]+)-([0-9]+)" replace="v\1\2\3-\4\5" />
+ <if>
+ <and>
+ <isset property="JBT_VERSION" />
+ <isset property="BUILD_ALIAS" />
+ </and>
+ <then>
+ <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": ${JBT_VERSION}.${BUILD_TS}-H${BUILD_NUMBER}-${BUILD_ALIAS}\3" />
+ </then>
+ <else>
+ <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": \1.${BUILD_TS}-H${BUILD_NUMBER}\2\3" />
+ </else>
+ </if>
</then>
<else>
<property name="update.site.version" value="" />
@@ -479,7 +492,7 @@
<delete file="${update.site.source.dir}/site.html" quiet="true" />
</target>
- <!-- look for http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2.0.M2.c...;
+ <!-- look for http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.*/logs/z...;
if found, load file and use ${ALL_ZIPS} to get list of relative path zips to fetch -->
<target name="collect.zips" description="collect zips from the sites we aggregated">
<property name="aggregate.zips.dir" value="${output.dir}/zips" />
Modified: trunk/build/aggregate/soa-site/build.xml
===================================================================
--- trunk/build/aggregate/soa-site/build.xml 2011-09-22 01:01:47 UTC (rev 34950)
+++ trunk/build/aggregate/soa-site/build.xml 2011-09-22 01:06:50 UTC (rev 34951)
@@ -444,7 +444,20 @@
<isset property="BUILD_NUMBER" />
</and>
<then>
- <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+.*).aggregate" replace=": \1.${BUILD_ID}-H${BUILD_NUMBER}" />
+ <!-- from 2011-09-21_01-11-04 to 20110921-0111 -->
+ <propertyregex override="true" property="BUILD_TS" defaultvalue="${BUILD_ID}" input="${BUILD_ID}" regexp="([0-9]+)-([0-9]+)-([0-9]+)_([0-9]+)-([0-9]+)-([0-9]+)" replace="v\1\2\3-\4\5" />
+ <if>
+ <and>
+ <isset property="JBT_VERSION" />
+ <isset property="BUILD_ALIAS" />
+ </and>
+ <then>
+ <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": ${JBT_VERSION}.${BUILD_TS}-H${BUILD_NUMBER}-${BUILD_ALIAS}\3" />
+ </then>
+ <else>
+ <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": \1.${BUILD_TS}-H${BUILD_NUMBER}\2\3" />
+ </else>
+ </if>
</then>
<else>
<property name="update.site.version" value="" />
@@ -479,7 +492,7 @@
<delete file="${update.site.source.dir}/site.html" quiet="true" />
</target>
- <!-- look for http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2.0.M2.c...;
+ <!-- look for http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.*/logs/z...;
if found, load file and use ${ALL_ZIPS} to get list of relative path zips to fetch -->
<target name="collect.zips" description="collect zips from the sites we aggregated">
<property name="aggregate.zips.dir" value="${output.dir}/zips" />
Modified: trunk/build/aggregate/webtools-site/build.xml
===================================================================
--- trunk/build/aggregate/webtools-site/build.xml 2011-09-22 01:01:47 UTC (rev 34950)
+++ trunk/build/aggregate/webtools-site/build.xml 2011-09-22 01:06:50 UTC (rev 34951)
@@ -445,16 +445,18 @@
<isset property="BUILD_NUMBER" />
</and>
<then>
+ <!-- from 2011-09-21_01-11-04 to 20110921-0111 -->
+ <propertyregex override="true" property="BUILD_TS" defaultvalue="${BUILD_ID}" input="${BUILD_ID}" regexp="([0-9]+)-([0-9]+)-([0-9]+)_([0-9]+)-([0-9]+)-([0-9]+)" replace="v\1\2\3-\4\5" />
<if>
<and>
<isset property="JBT_VERSION" />
<isset property="BUILD_ALIAS" />
</and>
<then>
- <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": ${JBT_VERSION}.${BUILD_ALIAS}\3.${BUILD_ID}-H${BUILD_NUMBER}" />
+ <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": ${JBT_VERSION}.${BUILD_TS}-H${BUILD_NUMBER}-${BUILD_ALIAS}\3" />
</then>
<else>
- <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+.*).aggregate" replace=": \1.${BUILD_ID}-H${BUILD_NUMBER}" />
+ <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": \1.${BUILD_TS}-H${BUILD_NUMBER}\2\3" />
</else>
</if>
</then>
14 years, 6 months
JBoss Tools SVN: r34950 - branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-09-21 21:01:47 -0400 (Wed, 21 Sep 2011)
New Revision: 34950
Modified:
branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
Log:
updated for brew
Modified: branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2011-09-22 00:56:24 UTC (rev 34949)
+++ branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2011-09-22 01:01:47 UTC (rev 34950)
@@ -8,7 +8,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.1</edition>
- <pubsnumber>20</pubsnumber>
+ <pubsnumber>21</pubsnumber>
<abstract>
<para>
These release notes contain important information related to the JBoss Developer Studio. New features, known issues, resources, and other current issues are addressed here.
14 years, 6 months
JBoss Tools SVN: r34949 - in trunk/jst/plugins/org.jboss.tools.jst.css: src/org/jboss/tools/jst/css and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2011-09-21 20:56:24 -0400 (Wed, 21 Sep 2011)
New Revision: 34949
Modified:
trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/CSSPerspective.java
Log:
Fix for perspective factory exceptions:
1. org.eclipse.ui.PartInitException: View descriptor not found: org.jboss.tools.jst.web.ui.navigator.WebProjectsView
at org.eclipse.ui.internal.FolderLayout.addView(FolderLayout.java:75)
at org.jboss.tools.jst.css.CSSPerspective.createInitialLayout(CSSPerspective.java:42)
2. org.eclipse.ui.PartInitException: View descriptor not found: org.jboss.tools.seam.ui.views.SeamComponentsNavigator
at org.eclipse.ui.internal.FolderLayout.addView(FolderLayout.java:75)
at org.jboss.tools.jst.css.CSSPerspective.createInitialLayout(CSSPerspective.java:44)
Seam components navigator view removed and org.jboss.tools.jst.web.ui bundle added to dependencies.
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF 2011-09-22 00:53:37 UTC (rev 34948)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF 2011-09-22 00:56:24 UTC (rev 34949)
@@ -25,7 +25,8 @@
org.jboss.tools.common.el.core;bundle-version="3.2.0",
org.eclipse.jface.databinding;bundle-version="1.5.0",
org.eclipse.core.databinding.property;bundle-version="1.3.0",
- org.jboss.tools.jst.web;bundle-version="3.2.0"
+ org.jboss.tools.jst.web;bundle-version="3.2.0",
+ org.jboss.tools.jst.web.ui;bundle-version="3.2.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.jst.css,
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/CSSPerspective.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/CSSPerspective.java 2011-09-22 00:53:37 UTC (rev 34948)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/CSSPerspective.java 2011-09-22 00:56:24 UTC (rev 34949)
@@ -40,8 +40,6 @@
"leftTop", IPageLayout.LEFT, (float) 0.2, editorArea); //$NON-NLS-1$
leftTop.addView(JavaUI.ID_PACKAGES);
leftTop.addView("org.jboss.tools.jst.web.ui.navigator.WebProjectsView"); //$NON-NLS-1$
- leftTop
- .addView("org.jboss.tools.seam.ui.views.SeamComponentsNavigator"); //$NON-NLS-1$
leftTop.addPlaceholder(IPageLayout.ID_RES_NAV);
IFolderLayout leftBottom = layout.createFolder(
14 years, 6 months