JBoss Tools SVN: r40457 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-04-24 15:35:51 -0400 (Tue, 24 Apr 2012)
New Revision: 40457
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
Log:
https://issues.jboss.org/browse/JBIDE-11611 Cannot create Seam Project with Seam 2.3 Beta1 from WFK 2.0 ER4
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2012-04-24 19:15:15 UTC (rev 40456)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2012-04-24 19:35:51 UTC (rev 40457)
@@ -12,6 +12,7 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -66,8 +67,8 @@
import org.jboss.tools.common.ui.widget.editor.IFieldEditor;
import org.jboss.tools.common.ui.widget.editor.IFieldEditorFactory;
import org.jboss.tools.common.ui.widget.editor.ITaggedFieldEditor;
+import org.jboss.tools.seam.core.SeamCoreMessages;
import org.jboss.tools.seam.core.SeamCorePlugin;
-import org.jboss.tools.seam.core.SeamCoreMessages;
import org.jboss.tools.seam.core.SeamUtil;
import org.jboss.tools.seam.core.project.facet.SeamProjectPreferences;
import org.jboss.tools.seam.core.project.facet.SeamRuntime;
@@ -410,6 +411,14 @@
generalGroup.setLayout(gridLayout);
registerEditor(jBossSeamHomeEditor, generalGroup, 3);
+ jBossSeamHomeEditor.addPropertyChangeListener(new PropertyChangeListener(){
+ public void propertyChange(PropertyChangeEvent arg0) {
+ Boolean testProject = canTestProjectBeCreated();
+ createTestProjectCheckboxeditor.setValue(testProject);
+ createTestProjectCheckboxeditor.setEnabled(testProject);
+ }
+ });
+
registerEditor(jBossAsDeployAsEditor, generalGroup, 3);
registerEditor(ejbProjectNameditor, generalGroup, 3);
ejbProjectNameditor.setEnabled(getDeployAsDefaultValue().equals(ISeamFacetDataModelProperties.DEPLOY_AS_EAR));
@@ -842,6 +851,18 @@
}
+ private boolean canTestProjectBeCreated() {
+ String seamRuntimeName = jBossSeamHomeEditor.getValueAsString();
+ SeamRuntime seamRuntime = SeamRuntimeManager.getInstance().findRuntimeByName(seamRuntimeName);
+ if (seamRuntime != null) {
+ // bootstrap folder was removed in Seam 2.3.0.Beta1 from WFK 2.0 ER4
+ // See https://issues.jboss.org/browse/JBIDE-11611
+ File bootstrap = new File(seamRuntime.getHomeDir(), "bootstrap");
+ return bootstrap.exists();
+ }
+ return false;
+ }
+
class ProjectNamesDuplicationValidator implements IValidator {
String propertyName;
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r40456 - trunk/download.jboss.org/jbosstools/examples.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-04-24 15:15:15 -0400 (Tue, 24 Apr 2012)
New Revision: 40456
Modified:
trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3....
Log:
JBIDE-11631 - Update link to the html5 project archetype in JBoss Central
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3....
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3.... 2012-04-24 18:05:29 UTC (rev 40455)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3.... 2012-04-24 19:15:15 UTC (rev 40456)
@@ -160,7 +160,7 @@
<mavenArchetype>
<archetypeGroupId>org.jboss.aerogear.archetypes</archetypeGroupId>
<archetypeArtifactId>jboss-html5-mobile-archetype</archetypeArtifactId>
- <archetypeVersion>1.0.0.M2c</archetypeVersion>
+ <archetypeVersion>1.0.0.M3</archetypeVersion>
<!--
<archetypeRepository>http://repository.jboss.org/nexus/content/repositories/releases/</archetypeRepository>
-->
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r40455 - in trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui: dialogs and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2012-04-24 14:05:29 -0400 (Tue, 24 Apr 2012)
New Revision: 40455
Added:
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/dialogs/
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/dialogs/WSTesterURLInputsDialog.java
Modified:
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java
Log:
JBIDE-11635 - Adding dialog to allow parameter inputs and parm validation for JAX-RS parameters included in the URL.
Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/dialogs/WSTesterURLInputsDialog.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/dialogs/WSTesterURLInputsDialog.java (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/dialogs/WSTesterURLInputsDialog.java 2012-04-24 18:05:29 UTC (rev 40455)
@@ -0,0 +1,388 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.ws.ui.dialogs;
+
+import java.util.StringTokenizer;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.ICellModifier;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.TextCellEditor;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.swt.widgets.TreeItem;
+import org.jboss.tools.ws.ui.messages.JBossWSUIMessages;
+
+/**
+ * Dialog that pops up if the URL has parameters that need values.
+ * This should only appear if it's a JAX-RS endpoint being tested from the
+ * JAX-RS tooling.
+ * @author bfitzpat
+ *
+ */
+public class WSTesterURLInputsDialog extends TitleAreaDialog {
+
+ private TreeViewer treeRequestBody;
+ private static final String NAME_COLUMN = "name";//$NON-NLS-1$
+ private static final String VALUE_COLUMN = "value";//$NON-NLS-1$
+ private static final String[] TREE_COLUMNS = new String[] { NAME_COLUMN, VALUE_COLUMN };
+ private String stashedURL;
+ private Parameter[] parms;
+ private Button mOKButton = null;
+
+ /**
+ * Constructor
+ * @param parentShell
+ * @param url
+ */
+ public WSTesterURLInputsDialog(Shell parentShell, String url) {
+ super(parentShell);
+ stashedURL = url;
+ parms = parseURLParms(stashedURL);
+ }
+
+ /**
+ * Return the modified URL with values
+ * @return
+ */
+ public String getURL() {
+ return replaceParmsWithValues();
+ }
+
+ /*
+ * If we have values for parms, send them back
+ * @return
+ */
+ private String replaceParmsWithValues () {
+ if (parms.length > 0 && stashedURL != null && stashedURL.trim().length() > 0) {
+ String modified = stashedURL;
+ for (int i = 0; i < parms.length; i++) {
+ Parameter parm = parms[i];
+ if (parm.value != null && parm.value.trim().length() > 0) {
+ modified = modified.replace(parm.originalString, parm.value);
+ }
+ }
+ return modified;
+ }
+ return stashedURL;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.dialogs.TitleAreaDialog#createDialogArea(org.eclipse.swt.widgets.Composite)
+ */
+ @Override
+ protected Control createDialogArea(Composite parent) {
+ setTitle(JBossWSUIMessages.WSTesterURLInputsDialog_DialogTitle);
+ setMessage(JBossWSUIMessages.WSTesterURLInputsDialog_DialogMessage);
+ Composite area = (Composite) super.createDialogArea(parent);
+
+ Font font = parent.getFont();
+
+ Composite content = new Composite(area, SWT.NONE);
+ GridLayout layout = new GridLayout();
+ layout.numColumns = 2;
+ content.setLayout(layout);
+ GridData data = new GridData(GridData.FILL_BOTH);
+ content.setLayoutData(data);
+ content.setFont(font);
+
+ Label label = new Label(content, SWT.NONE);
+ label.setText(JBossWSUIMessages.WSTesterURLInputsDialog_URLParms_Label);
+ GridData gridData = new GridData();
+ gridData.horizontalSpan = 2;
+ label.setLayoutData(gridData);
+
+ treeRequestBody = new TreeViewer(area, SWT.BORDER | SWT.WRAP | SWT.V_SCROLL | SWT.FULL_SELECTION );
+ this.treeRequestBody.setAutoExpandLevel(TreeViewer.ALL_LEVELS);
+ GridData gd11 = new GridData(SWT.FILL, SWT.FILL, true, true);
+ gd11.heightHint = 100;
+ treeRequestBody.getTree().setLayoutData(gd11);
+ treeRequestBody.getTree().setHeaderVisible(true);
+ TreeColumn nameColumn = new TreeColumn(treeRequestBody.getTree(), SWT.LEFT);
+ nameColumn.setText(JBossWSUIMessages.JAXRSWSTestView2_Name_column);
+ nameColumn.setWidth(200);
+ TreeColumn valueColumn = new TreeColumn(treeRequestBody.getTree(), SWT.LEFT);
+ valueColumn.setText(JBossWSUIMessages.JAXRSWSTestView2_Value_column);
+ valueColumn.setWidth(200);
+
+ treeRequestBody.setColumnProperties(TREE_COLUMNS);
+
+ treeRequestBody.setLabelProvider(new ITableLabelProvider() {
+
+ @Override
+ public void addListener(ILabelProviderListener listener) {
+ }
+
+ @Override
+ public void dispose() {
+ }
+
+ @Override
+ public boolean isLabelProperty(Object element, String property) {
+ if (element instanceof Parameter && property.equalsIgnoreCase(NAME_COLUMN)) {
+ return true;
+ } else if (element instanceof Parameter && property.equalsIgnoreCase(VALUE_COLUMN)) {
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public void removeListener(ILabelProviderListener listener) {
+ }
+
+ @Override
+ public Image getColumnImage(Object element, int columnIndex) {
+ return null;
+ }
+
+ @Override
+ public String getColumnText(Object element, int columnIndex) {
+ if (element instanceof Parameter && columnIndex == 0) {
+ return ((Parameter)element).name;
+ } else if (element instanceof Parameter && columnIndex == 1) {
+ Parameter tp = (Parameter) element;
+ return tp.value;
+ }
+ return null;
+ }
+ });
+
+ treeRequestBody.setContentProvider(new ITreeContentProvider(){
+
+ Parameter[] parms;
+
+ @Override
+ public void dispose() {
+ }
+
+ @Override
+ public void inputChanged(Viewer viewer, Object oldInput,
+ Object newInput) {
+ if (newInput instanceof Parameter[]) {
+ parms = (Parameter[]) newInput;
+ }
+ }
+
+ @Override
+ public Object[] getElements(Object inputElement) {
+ if (inputElement instanceof Parameter[]) {
+ return this.parms;
+ }
+ return null;
+ }
+
+ @Override
+ public Object[] getChildren(Object parentElement) {
+ if (parentElement instanceof Parameter[]) {
+ return new Object[] {this.parms};
+ }
+ return null;
+ }
+
+ @Override
+ public Object getParent(Object element) {
+ if (element instanceof Parameter) {
+ return parms;
+ }
+ return null;
+ }
+
+ @Override
+ public boolean hasChildren(Object element) {
+ if (element instanceof Parameter[]) {
+ return ((Parameter[])element).length > 0;
+ }
+ return false;
+ }
+ });
+
+ treeRequestBody.setCellModifier(new ICellModifier() {
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.ICellModifier#canModify(java.lang.Object, java.lang.String)
+ */
+ public boolean canModify(Object element, String property) {
+ if (element instanceof Parameter && property.equalsIgnoreCase(VALUE_COLUMN)) {
+ return true;
+ }
+ return false;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.ICellModifier#getValue(java.lang.Object, java.lang.String)
+ */
+ public Object getValue(Object element, String property) {
+ if (element instanceof Parameter && property.equalsIgnoreCase(VALUE_COLUMN)) {
+ return ((Parameter) element).value;
+ }
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.ICellModifier#modify(java.lang.Object, java.lang.String, java.lang.Object)
+ */
+ public void modify(Object element, String property, Object value) {
+ if (element instanceof TreeItem && property.equalsIgnoreCase(VALUE_COLUMN)) {
+ TreeItem ti = (TreeItem) element;
+ Parameter parm = (Parameter) ti.getData();
+ parm.value = (String) value;
+ treeRequestBody.refresh(true);
+ validate();
+ }
+ }
+
+ });
+ treeRequestBody.setCellEditors(new CellEditor[] { null, new TextCellEditor(treeRequestBody.getTree()) });
+ treeRequestBody.setInput(parms);
+
+ return area;
+ }
+
+ /*
+ * Internal class for managing url parm details
+ */
+ private class Parameter {
+ String name;
+ String value = ""; //$NON-NLS-1$
+ String regEx;
+ String originalString;
+ }
+
+ /*
+ * Take the parms from the url and shove them into a local class for easier management
+ * @param url
+ * @return
+ */
+ private Parameter[] parseURLParms ( String url ) {
+ if (url != null && url.trim().length() > 0 && url.endsWith("}")) { //$NON-NLS-1$
+ String[] parsed = parseString(url.substring(url.indexOf('{')), "{"); //$NON-NLS-1$
+ if (parsed != null && parsed.length > 0) {
+ Parameter[] parms = new Parameter[parsed.length];
+ for (int i = 0; i < parsed.length; i++) {
+ String temp = parsed[i];
+ temp = temp.replace('}', ' ').trim();
+ String[] nameRegEx = parseString(temp, ":"); //$NON-NLS-1$
+ String parmName;
+ String regEx = null;
+ if (nameRegEx.length > 1) {
+ parmName = nameRegEx[0];
+ regEx = nameRegEx[1];
+ } else {
+ parmName = temp;
+ }
+ parms[i] = new Parameter();
+ parms[i].name = parmName;
+ parms[i].regEx = regEx;
+ parms[i].originalString = '{' + parsed[i];
+ }
+ return parms;
+ }
+ }
+ return new Parameter[0];
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
+ */
+ protected void createButtonsForButtonBar(Composite parent) {
+ this.mOKButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
+ true);
+ createButton(parent, IDialogConstants.CANCEL_ID,
+ IDialogConstants.CANCEL_LABEL, false);
+ this.mOKButton.setEnabled(true);
+ validate();
+ setErrorMessage(null);
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
+ */
+ @Override
+ protected void configureShell(Shell newShell) {
+ newShell.setText(JBossWSUIMessages.WSTesterURLInputsDialog_Window_Title);
+ super.configureShell(newShell);
+ }
+
+
+ /*
+ * Validate the parm values and send back a message
+ * @return
+ */
+ private String validateParmValues() {
+ String errorMessage = ""; //$NON-NLS-1$
+ if (parms != null && parms.length > 0) {
+ for (int i = 0; i < parms.length; i++) {
+ Parameter parm = parms[i];
+ if (parm.regEx != null && parm.regEx.trim().length() > 0) {
+ boolean valid = parm.value.matches(parm.regEx);
+ if (!valid) {
+ errorMessage = JBossWSUIMessages.WSTesterURLInputsDialog_Validation_Error_String;
+ errorMessage = NLS.bind(errorMessage, new String[]
+ { parm.name, parm.value, parm.regEx });
+ break;
+ }
+ }
+ }
+ }
+ return errorMessage;
+ }
+
+ /*
+ * Validate the parameter values and pop up a message for the first invalid value.
+ */
+ private void validate() {
+ // validates two different types of parameters in the url
+ // parms with regex: {id:[0-9][0-9]*}
+ // parms without regex: {id} (always valid, no way to test)
+ String errorMessage = validateParmValues();
+ boolean hasError = errorMessage.trim().length() > 0;
+ if (hasError) {
+ setErrorMessage(errorMessage);
+ }
+ else
+ setErrorMessage(null);
+ if (this.mOKButton != null && !this.mOKButton.isDisposed())
+ this.mOKButton.setEnabled(!hasError);
+ }
+
+ /*
+ * Parses the incoming string by the token.
+ * @param str_list String list
+ * @param token Token to use to break up the string
+ * @return String array
+ */
+ private String[] parseString(String str_list, String token) {
+ StringTokenizer tk = new StringTokenizer(str_list, token);
+ String[] pieces = new String[tk.countTokens()];
+ int index = 0;
+ while (tk.hasMoreTokens())
+ pieces[index++] = tk.nextToken();
+ return pieces;
+ }
+}
Property changes on: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/dialogs/WSTesterURLInputsDialog.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2012-04-24 13:39:32 UTC (rev 40454)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2012-04-24 18:05:29 UTC (rev 40455)
@@ -181,6 +181,11 @@
WSDLBrowseDialog_WSDL_URI_Field=WSDL URI:
WSDLBrowseDialog_WSDL_URL_Dialog_Title=WSDL URL
WSDLBrowseDialog_WSDL_URL_Prompt=Type the URL for the WSDL:
+WSTesterURLInputsDialog_DialogMessage=Specify a valid value for each parameter required by the url.
+WSTesterURLInputsDialog_DialogTitle=Specify URL Parameters
+WSTesterURLInputsDialog_URLParms_Label=URL Parameters:
+WSTesterURLInputsDialog_Validation_Error_String={0}'s value of "{1}" is not valid based on the regular expression "{2}".
+WSTesterURLInputsDialog_Window_Title=WS Tester: URL Parameters
WSTestUtils_SaveResponseText_Error_Msg=Error encountered writing response text to file.
WSTestUtils_SaveResponseText_Title=Save Response Text
DelimitedStringList_Msg_No_Btn=No
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2012-04-24 13:39:32 UTC (rev 40454)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2012-04-24 18:05:29 UTC (rev 40455)
@@ -220,6 +220,11 @@
public static String WSDLBrowseDialog_WSDL_URL_Dialog_Title;
public static String WSDLBrowseDialog_WSDL_URL_Prompt;
+ public static String WSTesterURLInputsDialog_DialogMessage;
+ public static String WSTesterURLInputsDialog_DialogTitle;
+ public static String WSTesterURLInputsDialog_URLParms_Label;
+ public static String WSTesterURLInputsDialog_Validation_Error_String;
+ public static String WSTesterURLInputsDialog_Window_Title;
public static String WSTestUtils_SaveResponseText_Error_Msg;
public static String WSTestUtils_SaveResponseText_Title;
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java 2012-04-24 13:39:32 UTC (rev 40454)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java 2012-04-24 18:05:29 UTC (rev 40455)
@@ -116,6 +116,7 @@
import org.eclipse.ui.forms.widgets.Section;
import org.eclipse.ui.part.ViewPart;
import org.jboss.tools.ws.ui.JBossWSUIPlugin;
+import org.jboss.tools.ws.ui.dialogs.WSTesterURLInputsDialog;
import org.jboss.tools.ws.ui.messages.JBossWSUIMessages;
import org.jboss.tools.ws.ui.utils.JAXRSTester;
import org.jboss.tools.ws.ui.utils.JAXWSTester2;
@@ -1610,6 +1611,19 @@
private void handleTest(final String wsTech) {
String urlText = urlCombo.getText();
+
+ // if we need to configure incoming parameters in the URL (i.e. from JAX-RS tooling)
+ if (urlText.endsWith("}")) { //$NON-NLS-1$
+ WSTesterURLInputsDialog dialog = new WSTesterURLInputsDialog(this.getSite().getShell(), urlText);
+ int rtn_code = dialog.open();
+ if (rtn_code == Window.OK) {
+ urlText = dialog.getURL();
+ urlCombo.setText(urlText);
+ } else {
+ return;
+ }
+ }
+
try {
new URL(urlText);
} catch (MalformedURLException mue) {
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r40454 - in trunk/tests: tests and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-04-24 09:39:32 -0400 (Tue, 24 Apr 2012)
New Revision: 40454
Modified:
trunk/tests/plugins/pom.xml
trunk/tests/tests/org.jboss.tools.ui.bot.ext.test/pom.xml
trunk/tests/tests/pom.xml
Log:
Move org.jboss.tools.ui.bot.ext.test from plugins module to test module
Modified: trunk/tests/plugins/pom.xml
===================================================================
--- trunk/tests/plugins/pom.xml 2012-04-24 13:13:29 UTC (rev 40453)
+++ trunk/tests/plugins/pom.xml 2012-04-24 13:39:32 UTC (rev 40454)
@@ -14,6 +14,5 @@
<modules>
<module>org.jboss.tools.tests</module>
<module>org.jboss.tools.ui.bot.ext</module>
- <module>org.jboss.tools.ui.bot.ext.test</module>
</modules>
</project>
Modified: trunk/tests/tests/org.jboss.tools.ui.bot.ext.test/pom.xml
===================================================================
--- trunk/tests/tests/org.jboss.tools.ui.bot.ext.test/pom.xml 2012-04-24 13:13:29 UTC (rev 40453)
+++ trunk/tests/tests/org.jboss.tools.ui.bot.ext.test/pom.xml 2012-04-24 13:39:32 UTC (rev 40454)
@@ -2,12 +2,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.jboss.tools.tests</groupId>
- <artifactId>plugins</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- </parent>
- <groupId>org.jboss.tools.tests.plugins</groupId>
+ <groupId>org.jboss.tools.tests</groupId>
+ <artifactId>tests</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.jboss.tools.tests.tests</groupId>
<artifactId>org.jboss.tools.ui.bot.ext.test</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
+ <packaging>eclipse-test-plugin</packaging>
+
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
+</project>
\ No newline at end of file
Modified: trunk/tests/tests/pom.xml
===================================================================
--- trunk/tests/tests/pom.xml 2012-04-24 13:13:29 UTC (rev 40453)
+++ trunk/tests/tests/pom.xml 2012-04-24 13:39:32 UTC (rev 40454)
@@ -14,6 +14,7 @@
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.tests.tests</module>
+ <module>org.jboss.tools.ui.bot.ext.test</module>
</modules>
</project>
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r40453 - in trunk/tests: tests and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-04-24 09:13:29 -0400 (Tue, 24 Apr 2012)
New Revision: 40453
Added:
trunk/tests/tests/org.jboss.tools.ui.bot.ext.test/
Removed:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/
Log:
Move from plugins module to test module
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r40452 - in trunk: as and 31 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-04-24 08:58:47 -0400 (Tue, 24 Apr 2012)
New Revision: 40452
Modified:
trunk/archives/pom.xml
trunk/as/pom.xml
trunk/birt/pom.xml
trunk/bpel/pom.xml
trunk/cdi/pom.xml
trunk/central/pom.xml
trunk/common/pom.xml
trunk/deltacloud/pom.xml
trunk/esb/pom.xml
trunk/examples/pom.xml
trunk/flow/pom.xml
trunk/forge/pom.xml
trunk/freemarker/pom.xml
trunk/gwt/pom.xml
trunk/hibernatetools/pom.xml
trunk/jbpm/pom.xml
trunk/jmx/pom.xml
trunk/jsf/pom.xml
trunk/jst/pom.xml
trunk/maven/pom.xml
trunk/modeshape/pom.xml
trunk/openshift/pom.xml
trunk/portlet/pom.xml
trunk/runtime-soa/pom.xml
trunk/runtime/pom.xml
trunk/seam/pom.xml
trunk/smooks/pom.xml
trunk/struts/pom.xml
trunk/tests/pom.xml
trunk/usage/pom.xml
trunk/vpe/pom.xml
trunk/ws/pom.xml
trunk/xulrunner/pom.xml
Log:
JBIDE-11615 : Remove ref to repositories. Expect them to be in ~/.m2/settings.xml
Modified: trunk/archives/pom.xml
===================================================================
--- trunk/archives/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/archives/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -16,21 +16,7 @@
<module>features</module>
<module>plugins</module>
<module>tests</module>
- <module>site</module>
- </modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
+ <module>site</module>
+ </modules>
</project>
Modified: trunk/as/pom.xml
===================================================================
--- trunk/as/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/as/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -18,19 +18,5 @@
<module>features</module>
<module>site</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/birt/pom.xml
===================================================================
--- trunk/birt/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/birt/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -16,21 +16,7 @@
<module>features</module>
<module>plugins</module>
<module>tests</module>
- <module>site</module>
- </modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
+ <module>site</module>
+ </modules>
</project>
Modified: trunk/bpel/pom.xml
===================================================================
--- trunk/bpel/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/bpel/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -18,19 +18,5 @@
<module>site</module>
<module>tests</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/cdi/pom.xml
===================================================================
--- trunk/cdi/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/cdi/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -18,19 +18,5 @@
<module>tests</module>
<module>site</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/central/pom.xml
===================================================================
--- trunk/central/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/central/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -24,19 +24,5 @@
<module>tests</module>
<module>site</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/common/pom.xml
===================================================================
--- trunk/common/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/common/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -19,19 +19,5 @@
<module>site</module>
<module>tests</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/deltacloud/pom.xml
===================================================================
--- trunk/deltacloud/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/deltacloud/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -19,18 +19,4 @@
<module>site</module>
<module>tests</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/esb/pom.xml
===================================================================
--- trunk/esb/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/esb/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -30,19 +30,5 @@
<module>tests</module>
<module>site</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/examples/pom.xml
===================================================================
--- trunk/examples/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/examples/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -19,19 +19,5 @@
<module>tests</module>
<module>site</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/flow/pom.xml
===================================================================
--- trunk/flow/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/flow/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -19,19 +19,5 @@
<module>features</module>
<module>site</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/forge/pom.xml
===================================================================
--- trunk/forge/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/forge/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -19,19 +19,5 @@
<module>features</module>
<module>site</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/freemarker/pom.xml
===================================================================
--- trunk/freemarker/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/freemarker/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -19,19 +19,5 @@
<module>site</module>
<module>tests</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/gwt/pom.xml
===================================================================
--- trunk/gwt/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/gwt/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -18,18 +18,5 @@
<module>tests</module>
<module>site</module>
</modules>
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/hibernatetools/pom.xml
===================================================================
--- trunk/hibernatetools/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/hibernatetools/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -16,21 +16,7 @@
<module>features</module>
<module>plugins</module>
<module>tests</module>
- <module>site</module>
- </modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
+ <module>site</module>
+ </modules>
</project>
Modified: trunk/jbpm/pom.xml
===================================================================
--- trunk/jbpm/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/jbpm/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -18,19 +18,5 @@
<module>tests</module>
<module>site</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/jmx/pom.xml
===================================================================
--- trunk/jmx/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/jmx/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -19,18 +19,4 @@
<module>site</module>
<module>tests</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/jsf/pom.xml
===================================================================
--- trunk/jsf/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/jsf/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -17,19 +17,5 @@
<module>features</module>
<module>site</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/jst/pom.xml
===================================================================
--- trunk/jst/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/jst/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -17,19 +17,5 @@
<module>features</module>
<module>site</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/maven/pom.xml
===================================================================
--- trunk/maven/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/maven/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -56,19 +56,5 @@
</plugins>
</pluginManagement>
</build>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/modeshape/pom.xml
===================================================================
--- trunk/modeshape/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/modeshape/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -19,19 +19,5 @@
<module>tests</module>
<module>site</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/openshift/pom.xml
===================================================================
--- trunk/openshift/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/openshift/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -18,19 +18,5 @@
<module>features</module>
<module>site</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/portlet/pom.xml
===================================================================
--- trunk/portlet/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/portlet/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -18,18 +18,4 @@
<module>tests</module>
<module>site</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/runtime/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -24,19 +24,5 @@
or
mvn clean install -Pdefault,jbosstools-nightly-staging-composite
-->
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/runtime-soa/pom.xml
===================================================================
--- trunk/runtime-soa/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/runtime-soa/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -37,17 +37,6 @@
<enabled>true</enabled>
</releases>
</repository>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
</repositories>
</project>
Modified: trunk/seam/pom.xml
===================================================================
--- trunk/seam/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/seam/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -20,19 +20,5 @@
<module>tests</module>
<module>site</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/smooks/pom.xml
===================================================================
--- trunk/smooks/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/smooks/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -19,19 +19,5 @@
<module>tests</module>
<module>site</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/struts/pom.xml
===================================================================
--- trunk/struts/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/struts/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -16,21 +16,7 @@
<module>features</module>
<module>plugins</module>
<module>tests</module>
- <module>site</module>
- </modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
+ <module>site</module>
+ </modules>
</project>
Modified: trunk/tests/pom.xml
===================================================================
--- trunk/tests/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/tests/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -18,18 +18,4 @@
<module>site</module>
<module>tests</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/usage/pom.xml
===================================================================
--- trunk/usage/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/usage/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -19,19 +19,5 @@
<module>features</module>
<module>site</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/vpe/pom.xml
===================================================================
--- trunk/vpe/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/vpe/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -18,18 +18,4 @@
<module>features</module>
<module>site</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/ws/pom.xml
===================================================================
--- trunk/ws/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/ws/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -19,19 +19,5 @@
<module>features</module>
<module>site</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
Modified: trunk/xulrunner/pom.xml
===================================================================
--- trunk/xulrunner/pom.xml 2012-04-24 12:38:54 UTC (rev 40451)
+++ trunk/xulrunner/pom.xml 2012-04-24 12:58:47 UTC (rev 40452)
@@ -17,19 +17,5 @@
<module>plugins</module>
<module>site</module>
</modules>
-
- <repositories>
- <!-- To resolve parent artifact -->
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </repository>
- </repositories>
</project>
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r40451 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test: rest and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-24 08:38:54 -0400 (Tue, 24 Apr 2012)
New Revision: 40451
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleRESTTestBase.java
Log:
only RESTful ws tests are now enabled for AS 7.1 runtime
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java 2012-04-24 12:10:13 UTC (rev 40450)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java 2012-04-24 12:38:54 UTC (rev 40451)
@@ -35,12 +35,12 @@
* @author jjankovi
*
*/
+//@Require(perspective="Java EE",
+// server=(a)Server(type=ServerType.JbossAS,
+// version = "7.1", operator = ">="))
@Require(perspective="Java EE",
- server=(a)Server(type=ServerType.JbossAS,
- version = "7.1", operator = ">="))
-//@Require(perspective="Java EE",
-// server=(a)Server(type=ServerType.EAP,
-// version = "5.1", operator = ">="))
+ server=(a)Server(type=ServerType.EAP,
+ version = "5.1", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ WSAllBotTests.class })
public class WSTestBase extends SWTTestExt {
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java 2012-04-24 12:10:13 UTC (rev 40450)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java 2012-04-24 12:38:54 UTC (rev 40451)
@@ -55,6 +55,11 @@
prepareRestProject();
}
+ @Override
+ public void cleanup() {
+
+ }
+
protected void prepareRestProject() {
if (!projectExists(getWsProjectName())) {
@@ -62,9 +67,6 @@
//importing project without targeted runtime set
importWSTestProject("resources/projects/" +
getWsProjectName(), getWsProjectName());
- //set target runtime - TO DO
- projectHelper.addConfiguredRuntimeIntoProject(
- getWsProjectName(), configuredState.getServer().name);
projectExplorer.selectProject(getWsProjectName());
eclipse.cleanAllProjects();
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java 2012-04-24 12:10:13 UTC (rev 40450)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java 2012-04-24 12:38:54 UTC (rev 40451)
@@ -38,11 +38,6 @@
return "restEmpty";
}
- @Override
- public void cleanup() {
-
- }
-
@Test
public void testWithEmptyPrefix() {
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java 2012-04-24 12:10:13 UTC (rev 40450)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java 2012-04-24 12:38:54 UTC (rev 40451)
@@ -35,11 +35,6 @@
return restEmptyProjectName;
}
- @Override
- public void cleanup() {
-
- }
-
@Test
public void testAddingSimpleRESTMethods() {
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java 2012-04-24 12:10:13 UTC (rev 40450)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java 2012-04-24 12:38:54 UTC (rev 40451)
@@ -31,11 +31,6 @@
return "restEmpty";
}
- @Override
- public void cleanup() {
-
- }
-
@Test
public void testCorrectValueValidation() {
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleRESTTestBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleRESTTestBase.java 2012-04-24 12:10:13 UTC (rev 40450)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleRESTTestBase.java 2012-04-24 12:38:54 UTC (rev 40451)
@@ -11,8 +11,6 @@
package org.jboss.tools.ws.ui.bot.test.sample;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.Type;
/**
@@ -20,7 +18,7 @@
* @author jjankovi
*
*/
-@Require(server=@Server(), perspective="Java EE")
+//@Require(server=@Server(), perspective="Java EE")
public class SampleRESTTestBase extends SampleWSBase {
protected void createSampleRESTWS(String project, String name, String pkg,
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r40450 - in trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test: config and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-04-24 08:10:13 -0400 (Tue, 24 Apr 2012)
New Revision: 40450
Added:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/Activator.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDefaultServer.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDisabledServer.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedEPPServer.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedJbossASServer.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedLocalServer.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedNotRunningServer.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedRemoteServer.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithESB.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithSeam.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnonatedRunningServer.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ClassWithoutTests.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ConfigBeanTest.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/NotAnnotated.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ServerUtil.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/Suite.java
Removed:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/Activator.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDefaultServer.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDisabledServer.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedEPPServer.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedJbossASServer.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedLocalServer.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedNotRunningServer.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedRemoteServer.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithESB.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithSeam.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnonatedRunningServer.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ClassWithoutTests.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ConfigBeanTest.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/NotAnnotated.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ServerUtil.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/Suite.java
Log:
Added javadoc and remove some tests from test suite Suite.java.
Deleted: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/Activator.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/Activator.java 2012-04-24 11:29:07 UTC (rev 40449)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/Activator.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -1,66 +0,0 @@
- /*******************************************************************************
- * Copyright (c) 2007-2009 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.ui.bot.ext.test;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.tools.ui.bot.ext.test";
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
- * )
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
- * )
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/Activator.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/Activator.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/Activator.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -0,0 +1,66 @@
+ /*******************************************************************************
+ * Copyright (c) 2007-2012 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.ui.bot.ext.test;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.jboss.tools.ui.bot.ext.test";
+
+ // The shared instance
+ private static Activator plugin;
+
+ /**
+ * The constructor
+ */
+ public Activator() {
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
+ * )
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
+ * )
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+}
Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/Activator.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDefaultServer.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDefaultServer.java 2012-04-24 11:29:07 UTC (rev 40449)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDefaultServer.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -1,32 +0,0 @@
-package org.jboss.tools.ui.bot.ext.test.config;
-
-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.config.Annotations.Server;
-import org.junit.Test;
-
-
-@Require(server=@Server(),perspective="Java EE")
-public class AnnotatedDefaultServer extends SWTTestExt {
-
- @Test
- public void configuredState() {
- assertTrue(configuredState.getServer().isRunning);
- assertTrue(configuredState.getServer().isConfigured);
- assertNotNull(configuredState.getServer().version);
- assertNotNull(configuredState.getServer().type);
- assertNotNull(configuredState.getServer().name);
- assertNotNull(configuredState.getServer().withJavaVersion);
- }
-
- @Test
- public void serverExists() {
- ServerUtil.serverExists();
- }
-
- @Test
- public void serverRunning() {
- ServerUtil.serverRunning();
- }
-
-}
Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDefaultServer.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDefaultServer.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDefaultServer.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -0,0 +1,51 @@
+ /*******************************************************************************
+ * Copyright (c) 2007-2012 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.ui.bot.ext.test.config;
+
+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.config.Annotations.Server;
+import org.junit.Test;
+/**
+ * Parent test for tests using server in default state.
+ * @author lzoubek
+ *
+ */
+@Require(server=@Server(),perspective="Java EE")
+public class AnnotatedDefaultServer extends SWTTestExt {
+ /**
+ * Checks server state
+ */
+ @Test
+ public void configuredState() {
+ assertTrue(configuredState.getServer().isRunning);
+ assertTrue(configuredState.getServer().isConfigured);
+ assertNotNull(configuredState.getServer().version);
+ assertNotNull(configuredState.getServer().type);
+ assertNotNull(configuredState.getServer().name);
+ assertNotNull(configuredState.getServer().withJavaVersion);
+ }
+ /**
+ * Checks server existence
+ */
+ @Test
+ public void serverExists() {
+ ServerUtil.serverExists();
+ }
+ /**
+ * Checks if server is running
+ */
+ @Test
+ public void serverRunning() {
+ ServerUtil.serverRunning();
+ }
+
+}
Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDefaultServer.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDisabledServer.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDisabledServer.java 2012-04-24 11:29:07 UTC (rev 40449)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDisabledServer.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -1,39 +0,0 @@
-package org.jboss.tools.ui.bot.ext.test.config;
-
-import org.eclipse.swtbot.swt.finder.SWTBot;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
-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.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.jboss.tools.ui.bot.ext.gen.ActionItem;
-import org.junit.Test;
-
-@Require(server=(a)Server(state=ServerState.Disabled))
-public class AnnotatedDisabledServer extends SWTTestExt {
-
- @Test
- public void configuredState() {
- assertTrue(!configuredState.getServer().isRunning);
- assertTrue(!configuredState.getServer().isConfigured);
- assertNull(configuredState.getServer().version);
- assertNull(configuredState.getServer().type);
- assertNull(configuredState.getServer().name);
- assertNull(configuredState.getServer().withJavaVersion);
- }
-
- @Test
- public void serverDoesNotExist() {
- assertTrue(!servers.show().bot().tree().hasItems());
- }
-
- @Test
- public void runtimeDoesNotExist() {
- SWTBot wiz = open
- .preferenceOpen(ActionItem.Preference.ServerRuntimeEnvironments.LABEL);
- SWTBotTable tbRuntimeEnvironments = bot.table();
- assertTrue(tbRuntimeEnvironments.rowCount()==0);
- open.closeCancel(wiz);
- }
-
-}
Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDisabledServer.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDisabledServer.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDisabledServer.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -0,0 +1,60 @@
+ /*******************************************************************************
+ * Copyright (c) 2007-2012 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.ui.bot.ext.test.config;
+
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
+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.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem;
+import org.junit.Test;
+/**
+ * Parent test for tests using server in disabled state.
+ * n state when server is not defined within workspace.
+ * @author lzoubek
+ *
+ */
+@Require(server=(a)Server(state=ServerState.Disabled))
+public class AnnotatedDisabledServer extends SWTTestExt {
+ /**
+ * Checks server state
+ */
+ @Test
+ public void configuredState() {
+ assertTrue(!configuredState.getServer().isRunning);
+ assertTrue(!configuredState.getServer().isConfigured);
+ assertNull(configuredState.getServer().version);
+ assertNull(configuredState.getServer().type);
+ assertNull(configuredState.getServer().name);
+ assertNull(configuredState.getServer().withJavaVersion);
+ }
+ /**
+ * Checks server doesn't exist
+ */
+ @Test
+ public void serverDoesNotExist() {
+ assertTrue(!servers.show().bot().tree().hasItems());
+ }
+ /**
+ * Checks server runtime doesn't exist
+ */
+ @Test
+ public void runtimeDoesNotExist() {
+ SWTBot wiz = open
+ .preferenceOpen(ActionItem.Preference.ServerRuntimeEnvironments.LABEL);
+ SWTBotTable tbRuntimeEnvironments = bot.table();
+ assertTrue(tbRuntimeEnvironments.rowCount()==0);
+ open.closeCancel(wiz);
+ }
+
+}
Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDisabledServer.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedEPPServer.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedEPPServer.java 2012-04-24 11:29:07 UTC (rev 40449)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedEPPServer.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -1,33 +0,0 @@
-package org.jboss.tools.ui.bot.ext.test.config;
-
-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.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
-import org.junit.Test;
-
-
-@Require(server=(a)Server(type=ServerType.EPP),perspective="Java EE")
-public class AnnotatedEPPServer extends SWTTestExt {
-
- @Test
- public void configuredState() {
- assertTrue(configuredState.getServer().isRunning);
- assertTrue(configuredState.getServer().isConfigured);
- assertNotNull(configuredState.getServer().version);
- assertNotNull(configuredState.getServer().type);
- assertNotNull(configuredState.getServer().name);
- assertNotNull(configuredState.getServer().withJavaVersion);
- }
-
- @Test
- public void serverExists() {
- ServerUtil.serverExists();
- }
-
- @Test
- public void serverRunning() {
- ServerUtil.serverRunning();
- }
-
-}
Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedEPPServer.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedEPPServer.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedEPPServer.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -0,0 +1,52 @@
+ /*******************************************************************************
+ * Copyright (c) 2007-2012 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.ui.bot.ext.test.config;
+
+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.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+import org.junit.Test;
+/**
+ * Parent test for tests using EPP server in default state.
+ * @author lzoubek
+ *
+ */
+@Require(server=(a)Server(type=ServerType.EPP),perspective="Java EE")
+public class AnnotatedEPPServer extends SWTTestExt {
+ /**
+ * Checks server state
+ */
+ @Test
+ public void configuredState() {
+ assertTrue(configuredState.getServer().isRunning);
+ assertTrue(configuredState.getServer().isConfigured);
+ assertNotNull(configuredState.getServer().version);
+ assertNotNull(configuredState.getServer().type);
+ assertNotNull(configuredState.getServer().name);
+ assertNotNull(configuredState.getServer().withJavaVersion);
+ }
+ /**
+ * Checks server existence
+ */
+ @Test
+ public void serverExists() {
+ ServerUtil.serverExists();
+ }
+ /**
+ * Checks if server is running
+ */
+ @Test
+ public void serverRunning() {
+ ServerUtil.serverRunning();
+ }
+
+}
Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedEPPServer.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedJbossASServer.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedJbossASServer.java 2012-04-24 11:29:07 UTC (rev 40449)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedJbossASServer.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -1,33 +0,0 @@
-package org.jboss.tools.ui.bot.ext.test.config;
-
-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.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
-import org.junit.Test;
-
-
-@Require(server=(a)Server(type=ServerType.JbossAS),perspective="Java EE")
-public class AnnotatedJbossASServer extends SWTTestExt {
-
- @Test
- public void configuredState() {
- assertTrue(configuredState.getServer().isRunning);
- assertTrue(configuredState.getServer().isConfigured);
- assertNotNull(configuredState.getServer().version);
- assertNotNull(configuredState.getServer().type);
- assertNotNull(configuredState.getServer().name);
- assertNotNull(configuredState.getServer().withJavaVersion);
- }
-
- @Test
- public void serverExists() {
- ServerUtil.serverExists();
- }
-
- @Test
- public void serverRunning() {
- ServerUtil.serverRunning();
- }
-
-}
Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedJbossASServer.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedJbossASServer.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedJbossASServer.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -0,0 +1,52 @@
+ /*******************************************************************************
+ * Copyright (c) 2007-2012 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.ui.bot.ext.test.config;
+
+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.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+import org.junit.Test;
+/**
+ * Parent test for tests using JBoss application server in default state.
+ * @author lzoubek
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS),perspective="Java EE")
+public class AnnotatedJbossASServer extends SWTTestExt {
+ /**
+ * Checks server state
+ */
+ @Test
+ public void configuredState() {
+ assertTrue(configuredState.getServer().isRunning);
+ assertTrue(configuredState.getServer().isConfigured);
+ assertNotNull(configuredState.getServer().version);
+ assertNotNull(configuredState.getServer().type);
+ assertNotNull(configuredState.getServer().name);
+ assertNotNull(configuredState.getServer().withJavaVersion);
+ }
+ /**
+ * Checks server existence
+ */
+ @Test
+ public void serverExists() {
+ ServerUtil.serverExists();
+ }
+ /**
+ * Checks if server is running
+ */
+ @Test
+ public void serverRunning() {
+ ServerUtil.serverRunning();
+ }
+
+}
Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedJbossASServer.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedLocalServer.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedLocalServer.java 2012-04-24 11:29:07 UTC (rev 40449)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedLocalServer.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -1,30 +0,0 @@
-package org.jboss.tools.ui.bot.ext.test.config;
-
-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.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerLocation;
-import org.junit.Test;
-@Require(server=(a)Server(location=ServerLocation.Local),perspective="Java EE")
-public class AnnotatedLocalServer extends SWTTestExt{
- @Test
- public void configuredState() {
- assertTrue(configuredState.getServer().isRunning);
- assertTrue(configuredState.getServer().isConfigured);
- assertNotNull(configuredState.getServer().version);
- assertNotNull(configuredState.getServer().type);
- assertNotNull(configuredState.getServer().name);
- assertNotNull(configuredState.getServer().withJavaVersion);
- assertTrue(configuredState.getServer().isLocal);
- }
-
- @Test
- public void serverExists() {
- ServerUtil.serverExists();
- }
-
- @Test
- public void serverRunning() {
- ServerUtil.serverRunning();
- }
-}
Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedLocalServer.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedLocalServer.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedLocalServer.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -0,0 +1,51 @@
+ /*******************************************************************************
+ * Copyright (c) 2007-2012 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.ui.bot.ext.test.config;
+/**
+ * Parent test for tests using local server in default state.
+ * @author lzoubek
+ *
+ */
+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.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerLocation;
+import org.junit.Test;
+@Require(server=(a)Server(location=ServerLocation.Local),perspective="Java EE")
+public class AnnotatedLocalServer extends SWTTestExt{
+ /**
+ * Checks server state
+ */
+ @Test
+ public void configuredState() {
+ assertTrue(configuredState.getServer().isRunning);
+ assertTrue(configuredState.getServer().isConfigured);
+ assertNotNull(configuredState.getServer().version);
+ assertNotNull(configuredState.getServer().type);
+ assertNotNull(configuredState.getServer().name);
+ assertNotNull(configuredState.getServer().withJavaVersion);
+ assertTrue(configuredState.getServer().isLocal);
+ }
+ /**
+ * Checks server existence
+ */
+ @Test
+ public void serverExists() {
+ ServerUtil.serverExists();
+ }
+ /**
+ * Checks if server is running
+ */
+ @Test
+ public void serverRunning() {
+ ServerUtil.serverRunning();
+ }
+}
Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedLocalServer.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedNotRunningServer.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedNotRunningServer.java 2012-04-24 11:29:07 UTC (rev 40449)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedNotRunningServer.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -1,51 +0,0 @@
-package org.jboss.tools.ui.bot.ext.test.config;
-
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
-import org.jboss.tools.ui.bot.ext.types.IDELabel;
-import org.junit.Test;
-
-
-@Require(server=(a)Server(state=ServerState.NotRunning),perspective="Java EE")
-public class AnnotatedNotRunningServer extends SWTTestExt {
-
- @Test
- public void configuredState() {
- assertTrue(!configuredState.getServer().isRunning);
- assertTrue(configuredState.getServer().isConfigured);
- assertNotNull(configuredState.getServer().version);
- assertNotNull(configuredState.getServer().type);
- assertNotNull(configuredState.getServer().name);
- assertNotNull(configuredState.getServer().withJavaVersion);
- }
-
- @Test
- public void serverExists() {
- ServerUtil.serverExists();
- }
-
- @Test
- public void serverNotRunning() {
- SWTBotTreeItem server =null;
- SWTBotTree tree = servers.show().bot().tree();
- for (SWTBotTreeItem item : tree.getAllItems()) {
- if (item.getText().startsWith(configuredState.getServer().name)) {
- server = item;
- break;
- }
- }
- if (server!=null) {
- ContextMenuHelper.prepareTreeItemForContextMenu(tree, server);
- assertFalse(new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Menu.STOP, false)).isEnabled());
- assertTrue(new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Menu.START, false)).isEnabled());
- }
- }
-
-
-}
Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedNotRunningServer.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedNotRunningServer.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedNotRunningServer.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -0,0 +1,70 @@
+ /*******************************************************************************
+ * Copyright (c) 2007-2012 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.ui.bot.ext.test.config;
+
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.junit.Test;
+/**
+ * Parent test for tests using ot running server.
+ * @author lzoubek
+ *
+ */
+@Require(server=(a)Server(state=ServerState.NotRunning),perspective="Java EE")
+public class AnnotatedNotRunningServer extends SWTTestExt {
+ /**
+ * Checks server state
+ */
+ @Test
+ public void configuredState() {
+ assertTrue(!configuredState.getServer().isRunning);
+ assertTrue(configuredState.getServer().isConfigured);
+ assertNotNull(configuredState.getServer().version);
+ assertNotNull(configuredState.getServer().type);
+ assertNotNull(configuredState.getServer().name);
+ assertNotNull(configuredState.getServer().withJavaVersion);
+ }
+ /**
+ * Checks server existence
+ */
+ @Test
+ public void serverExists() {
+ ServerUtil.serverExists();
+ }
+ /**
+ * Checks if server is not running
+ */
+ @Test
+ public void serverNotRunning() {
+ SWTBotTreeItem server =null;
+ SWTBotTree tree = servers.show().bot().tree();
+ for (SWTBotTreeItem item : tree.getAllItems()) {
+ if (item.getText().startsWith(configuredState.getServer().name)) {
+ server = item;
+ break;
+ }
+ }
+ if (server!=null) {
+ ContextMenuHelper.prepareTreeItemForContextMenu(tree, server);
+ assertFalse(new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Menu.STOP, false)).isEnabled());
+ assertTrue(new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Menu.START, false)).isEnabled());
+ }
+ }
+
+
+}
Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedNotRunningServer.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedRemoteServer.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedRemoteServer.java 2012-04-24 11:29:07 UTC (rev 40449)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedRemoteServer.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -1,25 +0,0 @@
-package org.jboss.tools.ui.bot.ext.test.config;
-
-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.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerLocation;
-import org.junit.Test;
-@Require(server=(a)Server(location=ServerLocation.Remote),perspective="Java EE")
-public class AnnotatedRemoteServer extends SWTTestExt{
- @Test
- public void configuredState() {
- assertTrue(configuredState.getServer().isRunning);
- assertTrue(configuredState.getServer().isConfigured);
- assertNotNull(configuredState.getServer().version);
- assertNotNull(configuredState.getServer().type);
- assertNotNull(configuredState.getServer().name);
- assertNotNull(configuredState.getServer().withJavaVersion);
- assertFalse(configuredState.getServer().isLocal);
- }
-
- @Test
- public void serverExists() {
- ServerUtil.serverExists();
- }
-}
Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedRemoteServer.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedRemoteServer.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedRemoteServer.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -0,0 +1,45 @@
+ /*******************************************************************************
+ * Copyright (c) 2007-2012 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.ui.bot.ext.test.config;
+
+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.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerLocation;
+import org.junit.Test;
+/**
+ * Parent test for tests using remote server in default state.
+ * @author lzoubek
+ *
+ */
+@Require(server=(a)Server(location=ServerLocation.Remote),perspective="Java EE")
+public class AnnotatedRemoteServer extends SWTTestExt{
+ /**
+ * Checks server state
+ */
+ @Test
+ public void configuredState() {
+ assertTrue(configuredState.getServer().isRunning);
+ assertTrue(configuredState.getServer().isConfigured);
+ assertNotNull(configuredState.getServer().version);
+ assertNotNull(configuredState.getServer().type);
+ assertNotNull(configuredState.getServer().name);
+ assertNotNull(configuredState.getServer().withJavaVersion);
+ assertFalse(configuredState.getServer().isLocal);
+ }
+ /**
+ * Checks server existence
+ */
+ @Test
+ public void serverExists() {
+ ServerUtil.serverExists();
+ }
+}
Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedRemoteServer.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithESB.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithESB.java 2012-04-24 11:29:07 UTC (rev 40449)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithESB.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -1,44 +0,0 @@
-package org.jboss.tools.ui.bot.ext.test.config;
-
-import org.eclipse.swtbot.swt.finder.SWTBot;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ESB;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.gen.ActionItem;
-import org.junit.Test;
-
-@Require(esb=@ESB(),perspective="Java EE")
-public class AnnotatedWithESB extends SWTTestExt {
-
- @Test
- public void configuredState() {
- assertTrue(configuredState.getEsb().isConfiured);
- assertNotNull(configuredState.getEsb().version);
- assertNotNull(configuredState.getEsb().name);
-
- }
-
- @Test
- public void runtimeExists() {
- boolean found=false;
- SWTBot bot = open.preferenceOpen(ActionItem.Preference.JBossToolsJBossESBRuntimes.LABEL);
- SWTBotTable tbRuntimeEnvironments = bot.table();
- // first check if Environment doesn't exist
- int numRows = tbRuntimeEnvironments.rowCount();
- if (numRows > 0) {
- int currentRow = 0;
- while (currentRow < numRows) {
- if (tbRuntimeEnvironments.cell(currentRow, 1).equalsIgnoreCase(
- configuredState.getEsb().name)) {
- found = true;
- break;
- } else {
- currentRow++;
- }
- }
- }
- assertTrue(found);
- }
-
-}
Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithESB.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithESB.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithESB.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -0,0 +1,61 @@
+ /*******************************************************************************
+ * Copyright (c) 2007-2012 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.ui.bot.ext.test.config;
+
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ESB;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem;
+import org.junit.Test;
+/**
+ * Parent test for tests with ESB requirement
+ * @author lzoubek
+ *
+ */
+@Require(esb=@ESB(),perspective="Java EE")
+public class AnnotatedWithESB extends SWTTestExt {
+ /**
+ * Checks ESB configuration state
+ */
+ @Test
+ public void configuredState() {
+ assertTrue(configuredState.getEsb().isConfiured);
+ assertNotNull(configuredState.getEsb().version);
+ assertNotNull(configuredState.getEsb().name);
+ }
+ /**
+ * Checks ESB runtime existence
+ */
+ @Test
+ public void runtimeExists() {
+ boolean found=false;
+ SWTBot bot = open.preferenceOpen(ActionItem.Preference.JBossToolsJBossESBRuntimes.LABEL);
+ SWTBotTable tbRuntimeEnvironments = bot.table();
+ // first check if Environment doesn't exist
+ int numRows = tbRuntimeEnvironments.rowCount();
+ if (numRows > 0) {
+ int currentRow = 0;
+ while (currentRow < numRows) {
+ if (tbRuntimeEnvironments.cell(currentRow, 1).equalsIgnoreCase(
+ configuredState.getEsb().name)) {
+ found = true;
+ break;
+ } else {
+ currentRow++;
+ }
+ }
+ }
+ assertTrue(found);
+ }
+
+}
Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithESB.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithSeam.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithSeam.java 2012-04-24 11:29:07 UTC (rev 40449)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithSeam.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -1,42 +0,0 @@
-package org.jboss.tools.ui.bot.ext.test.config;
-
-import org.eclipse.swtbot.swt.finder.SWTBot;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.jboss.tools.ui.bot.ext.config.Annotations.*;
-import org.jboss.tools.ui.bot.ext.gen.ActionItem;
-import org.junit.Test;
-
-@Require(seam=@Seam(),perspective="Java EE")
-public class AnnotatedWithSeam extends SWTTestExt {
-
- @Test
- public void configuredState() {
- assertTrue(configuredState.getSeam().isConfiured);
- assertNotNull(configuredState.getSeam().version);
- assertNotNull(configuredState.getSeam().name);
-
- }
-
- @Test
- public void runtimeExists() {
- boolean found=false;
- SWTBot bot = open.preferenceOpen(ActionItem.Preference.JBossToolsWebSeam.LABEL);
- SWTBotTable tbRuntimeEnvironments = bot.table();
- // first check if Environment doesn't exist
- int numRows = tbRuntimeEnvironments.rowCount();
- if (numRows > 0) {
- int currentRow = 0;
- while (currentRow < numRows) {
- if (tbRuntimeEnvironments.cell(currentRow, 1).equalsIgnoreCase(
- configuredState.getSeam().name)) {
- found = true;
- break;
- } else {
- currentRow++;
- }
- }
- }
- assertTrue(found);
- }
-}
Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithSeam.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithSeam.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithSeam.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -0,0 +1,60 @@
+ /*******************************************************************************
+ * Copyright (c) 2007-2012 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.ui.bot.ext.test.config;
+/**
+ * Parent test for tests with seam requirement
+ * @author lzoubek
+ *
+ */
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.config.Annotations.*;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem;
+import org.junit.Test;
+
+@Require(seam=@Seam(),perspective="Java EE")
+public class AnnotatedWithSeam extends SWTTestExt {
+ /**
+ * Checks seam configuration state
+ */
+ @Test
+ public void configuredState() {
+ assertTrue(configuredState.getSeam().isConfiured);
+ assertNotNull(configuredState.getSeam().version);
+ assertNotNull(configuredState.getSeam().name);
+
+ }
+ /**
+ * Checks seam runtime existence
+ */
+ @Test
+ public void runtimeExists() {
+ boolean found=false;
+ SWTBot bot = open.preferenceOpen(ActionItem.Preference.JBossToolsWebSeam.LABEL);
+ SWTBotTable tbRuntimeEnvironments = bot.table();
+ // first check if Environment doesn't exist
+ int numRows = tbRuntimeEnvironments.rowCount();
+ if (numRows > 0) {
+ int currentRow = 0;
+ while (currentRow < numRows) {
+ if (tbRuntimeEnvironments.cell(currentRow, 1).equalsIgnoreCase(
+ configuredState.getSeam().name)) {
+ found = true;
+ break;
+ } else {
+ currentRow++;
+ }
+ }
+ }
+ assertTrue(found);
+ }
+}
Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedWithSeam.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnonatedRunningServer.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnonatedRunningServer.java 2012-04-24 11:29:07 UTC (rev 40449)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnonatedRunningServer.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -1,33 +0,0 @@
-package org.jboss.tools.ui.bot.ext.test.config;
-
-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.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.junit.Test;
-
-
-@Require(server=(a)Server(state=ServerState.Running),perspective="Java EE")
-public class AnonatedRunningServer extends SWTTestExt {
-
- @Test
- public void configuredState() {
- assertTrue(configuredState.getServer().isRunning);
- assertTrue(configuredState.getServer().isConfigured);
- assertNotNull(configuredState.getServer().version);
- assertNotNull(configuredState.getServer().type);
- assertNotNull(configuredState.getServer().name);
- assertNotNull(configuredState.getServer().withJavaVersion);
- }
-
- @Test
- public void serverExists() {
- ServerUtil.serverExists();
- }
-
- @Test
- public void serverRunning() {
- ServerUtil.serverRunning();
- }
-
-}
Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnonatedRunningServer.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnonatedRunningServer.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnonatedRunningServer.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -0,0 +1,52 @@
+ /*******************************************************************************
+ * Copyright (c) 2007-2012 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.ui.bot.ext.test.config;
+
+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.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.junit.Test;
+/**
+ * Parent test for tests using server running in default state.
+ * @author lzoubek
+ *
+ */
+@Require(server=(a)Server(state=ServerState.Running),perspective="Java EE")
+public class AnonatedRunningServer extends SWTTestExt {
+ /**
+ * Checks server state
+ */
+ @Test
+ public void configuredState() {
+ assertTrue(configuredState.getServer().isRunning);
+ assertTrue(configuredState.getServer().isConfigured);
+ assertNotNull(configuredState.getServer().version);
+ assertNotNull(configuredState.getServer().type);
+ assertNotNull(configuredState.getServer().name);
+ assertNotNull(configuredState.getServer().withJavaVersion);
+ }
+ /**
+ * Checks server existence
+ */
+ @Test
+ public void serverExists() {
+ ServerUtil.serverExists();
+ }
+ /**
+ * Checks if server is running
+ */
+ @Test
+ public void serverRunning() {
+ ServerUtil.serverRunning();
+ }
+
+}
Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnonatedRunningServer.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ClassWithoutTests.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ClassWithoutTests.java 2012-04-24 11:29:07 UTC (rev 40449)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ClassWithoutTests.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -1,8 +0,0 @@
-package org.jboss.tools.ui.bot.ext.test.config;
-
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-
-@Require()
-public class ClassWithoutTests {
-
-}
Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ClassWithoutTests.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ClassWithoutTests.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ClassWithoutTests.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -0,0 +1,23 @@
+ /*******************************************************************************
+ * Copyright (c) 2007-2012 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.ui.bot.ext.test.config;
+
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+/**
+ * Test to see what happens when no class annotated with @Require
+ * annotation is run
+ * @author lzoubek
+ *
+ */
+@Require()
+public class ClassWithoutTests {
+
+}
Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ClassWithoutTests.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ConfigBeanTest.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ConfigBeanTest.java 2012-04-24 11:29:07 UTC (rev 40449)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ConfigBeanTest.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -1,38 +0,0 @@
-package org.jboss.tools.ui.bot.ext.test.config;
-
-import static org.junit.Assert.*;
-
-import org.jboss.tools.ui.bot.ext.config.RemoteSystemBean;
-import org.jboss.tools.ui.bot.ext.config.ServerBean;
-import org.junit.Test;
-
-public class ConfigBeanTest {
-
- @Test
- public void serverBeanRemote() throws Exception{
- ServerBean bean = ServerBean.fromString("EAP,5.0,1.6,/data/jboss/jboss-eap-5.0/jboss-as,jawa23.mw.lab.eng.brq.redhat.com,/opt/jboss-as");
- assertEquals(bean.type,"EAP");
- assertEquals(bean.version,"5.0");
- assertEquals(bean.withJavaVersion,"1.6");
- assertEquals(bean.runtimeHome,"/data/jboss/jboss-eap-5.0/jboss-as");
- assertEquals(bean.remoteSystem,"jawa23.mw.lab.eng.brq.redhat.com");
- assertEquals(bean.remoteHome, "/opt/jboss-as");
- }
- @Test
- public void serverBeanLocal() throws Exception{
- ServerBean bean = ServerBean.fromString("EAP,5.0,1.6,/data/jboss/jboss-eap-5.0/jboss-as");
- assertEquals(bean.type,"EAP");
- assertEquals(bean.version,"5.0");
- assertEquals(bean.withJavaVersion,"1.6");
- assertEquals(bean.runtimeHome,"/data/jboss/jboss-eap-5.0/jboss-as");
- assertNull(bean.remoteSystem);
- assertNull(bean.remoteHome);
- }
- @Test
- public void remoteSystem() throws Exception {
- RemoteSystemBean bean = RemoteSystemBean.fromString("lzoubek,jawa23.mw.lab.eng.brq.redhat.com,/home/lzoubek/.ssh/id_rsa");
- assertEquals(bean.user,"lzoubek");
- assertEquals(bean.host,"jawa23.mw.lab.eng.brq.redhat.com");
- assertEquals(bean.key,"/home/lzoubek/.ssh/id_rsa");
- }
-}
Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ConfigBeanTest.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ConfigBeanTest.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ConfigBeanTest.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2012 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.ui.bot.ext.test.config;
+
+import static org.junit.Assert.*;
+
+import org.jboss.tools.ui.bot.ext.config.RemoteSystemBean;
+import org.jboss.tools.ui.bot.ext.config.ServerBean;
+import org.junit.Test;
+/**
+ * Tests if Server Bean requirement configuration string is properly parsed
+ * and Server Bean fields are appropriately set.
+ * @author lzoubek
+ *
+ */
+public class ConfigBeanTest {
+ /**
+ * Checks Remote Server Configuration
+ *
+ * @throws Exception
+ */
+ @Test
+ public void serverBeanRemote() throws Exception{
+ ServerBean bean = ServerBean.fromString("EAP,5.0,1.6,/data/jboss/jboss-eap-5.0/jboss-as,jawa23.mw.lab.eng.brq.redhat.com,/opt/jboss-as");
+ assertEquals(bean.type,"EAP");
+ assertEquals(bean.version,"5.0");
+ assertEquals(bean.withJavaVersion,"1.6");
+ assertEquals(bean.runtimeHome,"/data/jboss/jboss-eap-5.0/jboss-as");
+ assertEquals(bean.remoteSystem,"jawa23.mw.lab.eng.brq.redhat.com");
+ assertEquals(bean.remoteHome, "/opt/jboss-as");
+ }
+ /**
+ * Checks Local Server Configuration
+ *
+ * @throws Exception
+ */
+ @Test
+ public void serverBeanLocal() throws Exception{
+ ServerBean bean = ServerBean.fromString("EAP,5.0,1.6,/data/jboss/jboss-eap-5.0/jboss-as");
+ assertEquals(bean.type,"EAP");
+ assertEquals(bean.version,"5.0");
+ assertEquals(bean.withJavaVersion,"1.6");
+ assertEquals(bean.runtimeHome,"/data/jboss/jboss-eap-5.0/jboss-as");
+ assertNull(bean.remoteSystem);
+ assertNull(bean.remoteHome);
+ }
+ /**
+ * Checks Remote System Configuration
+ *
+ * @throws Exception
+ */
+
+ @Test
+ public void remoteSystem() throws Exception {
+ RemoteSystemBean bean = RemoteSystemBean.fromString("lzoubek,jawa23.mw.lab.eng.brq.redhat.com,/home/lzoubek/.ssh/id_rsa");
+ assertEquals(bean.user,"lzoubek");
+ assertEquals(bean.host,"jawa23.mw.lab.eng.brq.redhat.com");
+ assertEquals(bean.key,"/home/lzoubek/.ssh/id_rsa");
+ }
+}
Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ConfigBeanTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/NotAnnotated.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/NotAnnotated.java 2012-04-24 11:29:07 UTC (rev 40449)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/NotAnnotated.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -1,11 +0,0 @@
-package org.jboss.tools.ui.bot.ext.test.config;
-
-import org.junit.Test;
-
-public class NotAnnotated {
-
- @Test
- public void testMustRun() {
-
- }
-}
Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/NotAnnotated.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/NotAnnotated.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/NotAnnotated.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -0,0 +1,26 @@
+ /*******************************************************************************
+ * Copyright (c) 2007-2012 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.ui.bot.ext.test.config;
+
+import org.junit.Test;
+/**
+ * Test to see what happens when no annotation @Require is added to
+ * test class and class is run with RequirementAwareSuite
+ * @author lzoubek
+ *
+ */
+public class NotAnnotated {
+
+ @Test
+ public void testMustRun() {
+
+ }
+}
Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/NotAnnotated.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ServerUtil.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ServerUtil.java 2012-04-24 11:29:07 UTC (rev 40449)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ServerUtil.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -1,39 +0,0 @@
-package org.jboss.tools.ui.bot.ext.test.config;
-
-import static org.junit.Assert.*;
-
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
-import org.jboss.tools.ui.bot.ext.types.IDELabel;
-
-public class ServerUtil {
-
- public static void serverExists() {
- boolean found=false;
- for (SWTBotTreeItem item : SWTTestExt.servers.show().bot().tree().getAllItems()) {
- if (item.getText().startsWith(SWTTestExt.configuredState.getServer().name)) {
- found = true;
- break;
- }
- }
- assertTrue(found);
- }
-
- public static void serverRunning() {
- SWTBotTreeItem server =null;
- SWTBotTree tree = SWTTestExt.servers.show().bot().tree();
- for (SWTBotTreeItem item : tree.getAllItems()) {
- if (item.getText().startsWith(SWTTestExt.configuredState.getServer().name)) {
- server = item;
- break;
- }
- }
- if (server!=null) {
- ContextMenuHelper.prepareTreeItemForContextMenu(tree, server);
- assertTrue(new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Menu.STOP, false)).isEnabled());
- }
- }
-}
Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ServerUtil.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ServerUtil.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ServerUtil.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -0,0 +1,57 @@
+ /*******************************************************************************
+ * Copyright (c) 2007-2012 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.ui.bot.ext.test.config;
+/**
+ * Utils fpr checking server
+ * @author lzoubek
+ *
+ */
+import static org.junit.Assert.*;
+
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+
+public class ServerUtil {
+ /**
+ * Checks if server exists
+ */
+ public static void serverExists() {
+ boolean found=false;
+ for (SWTBotTreeItem item : SWTTestExt.servers.show().bot().tree().getAllItems()) {
+ if (item.getText().startsWith(SWTTestExt.configuredState.getServer().name)) {
+ found = true;
+ break;
+ }
+ }
+ assertTrue(found);
+ }
+ /**
+ * Checks if server is running
+ */
+ public static void serverRunning() {
+ SWTBotTreeItem server =null;
+ SWTBotTree tree = SWTTestExt.servers.show().bot().tree();
+ for (SWTBotTreeItem item : tree.getAllItems()) {
+ if (item.getText().startsWith(SWTTestExt.configuredState.getServer().name)) {
+ server = item;
+ break;
+ }
+ }
+ if (server!=null) {
+ ContextMenuHelper.prepareTreeItemForContextMenu(tree, server);
+ assertTrue(new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Menu.STOP, false)).isEnabled());
+ }
+ }
+}
Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ServerUtil.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/Suite.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/Suite.java 2012-04-24 11:29:07 UTC (rev 40449)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/Suite.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007-2009 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.ui.bot.ext.test.config;
-
-import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
-
-@SuiteClasses( {
- ConfigBeanTest.class,
- NotAnnotated.class,
- //ClassWithoutTests.class,
- AnnotatedDefaultServer.class,
- AnnotatedEPPServer.class,
- AnnotatedJbossASServer.class,
- AnnotatedNotRunningServer.class,
- AnnotatedDefaultServer.class,
- AnnotatedWithESB.class,
- AnnotatedDisabledServer.class,
- AnonatedRunningServer.class,
- AnnotatedWithSeam.class,
- AnnotatedRemoteServer.class,
- AnnotatedLocalServer.class
-})
-(a)RunWith(RequirementAwareSuite.class)
-public class Suite {
-
-}
Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/Suite.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/Suite.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/Suite.java 2012-04-24 12:10:13 UTC (rev 40450)
@@ -0,0 +1,46 @@
+ /*******************************************************************************
+ * Copyright (c) 2007-2012 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.ui.bot.ext.test.config;
+
+import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+/**
+ * Test suite to test SWT Bot Extension configurations. Some tests are commented out
+ * to not run test during automated build.
+ * Test which are commented out should be run just manually when changing related configurations
+ * @author lzoubek
+ *
+ */
+@SuiteClasses( {
+ /*
+ ConfigBeanTest.class,
+ */
+ NotAnnotated.class,
+ /*
+ ClassWithoutTests.class,
+ AnnotatedDefaultServer.class,
+ AnnotatedEPPServer.class,
+ AnnotatedJbossASServer.class,
+ AnnotatedNotRunningServer.class,
+ AnnotatedDefaultServer.class,
+ AnnotatedWithESB.class,
+ AnnotatedDisabledServer.class,
+ AnonatedRunningServer.class,
+ AnnotatedWithSeam.class,
+ AnnotatedRemoteServer.class,
+ AnnotatedLocalServer.class
+ */
+})
+(a)RunWith(RequirementAwareSuite.class)
+public class Suite {
+
+}
Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/Suite.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r40449 - in trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot: test/generation and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-04-24 07:29:07 -0400 (Tue, 24 Apr 2012)
New Revision: 40449
Added:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/common/CodeGenerator.java
Modified:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/JPADDLGenerationTest.java
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/hql/HQLEditorTest.java
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/reveng/CreateRevengFileTest.java
Log:
Method names and test configuration fixes in hb ui bot tests
Added: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/common/CodeGenerator.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/common/CodeGenerator.java (rev 0)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/common/CodeGenerator.java 2012-04-24 11:29:07 UTC (rev 40449)
@@ -0,0 +1,5 @@
+package org.jboss.tools.hb.ui.bot.common;
+
+public class CodeGenerator {
+
+}
Property changes on: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/common/CodeGenerator.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/JPADDLGenerationTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/JPADDLGenerationTest.java 2012-04-24 11:27:11 UTC (rev 40448)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/JPADDLGenerationTest.java 2012-04-24 11:29:07 UTC (rev 40449)
@@ -19,7 +19,7 @@
final String hbcfg = "hibernate.cfg.xml";
@Test
- public void createJPAProject() {
+ public void jpaDDLGenerationTest() {
importTestProject("/resources/prj/" + prj);
createHBConfigurationAndSetPersistence();
generateDDLFromEntities();
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/hql/HQLEditorTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/hql/HQLEditorTest.java 2012-04-24 11:27:11 UTC (rev 40448)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/hql/HQLEditorTest.java 2012-04-24 11:29:07 UTC (rev 40449)
@@ -19,7 +19,7 @@
final String clazz = "Customer";
@Test
- public void jpaDetailsViewTest() {
+ public void hqlEditorTest() {
importTestProject("/resources/prj/hibernatelib");
importTestProject("/resources/prj/hibernate40");
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/reveng/CreateRevengFileTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/reveng/CreateRevengFileTest.java 2012-04-24 11:27:11 UTC (rev 40448)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/reveng/CreateRevengFileTest.java 2012-04-24 11:29:07 UTC (rev 40449)
@@ -1,6 +1,5 @@
package org.jboss.tools.hb.ui.bot.test.reveng;
-import static org.eclipse.swtbot.swt.finder.waits.Conditions.shellIsActive;
import static org.eclipse.swtbot.swt.finder.waits.Conditions.widgetIsEnabled;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
@@ -19,14 +18,14 @@
* @author jpeterka
*
*/
-@Require(clearProjects = false)
+@Require(clearProjects = true)
public class CreateRevengFileTest extends HibernateBaseTest {
final String prj = "hibernate35";
final String pkg = "org.reveng";
@Test
- public void createMappingFileTest() {
+ public void createRevengFileTest() {
importTestProject("/resources/prj/hibernate35");
createRevengFilesFromPackage();
}
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r40448 - trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-04-24 07:27:11 -0400 (Tue, 24 Apr 2012)
New Revision: 40448
Modified:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/CodeGenerationSuite.java
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/HibernateSuite.java
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/ViewSuite.java
Log:
HB ui bot test suites updated to reflect current state
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/CodeGenerationSuite.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/CodeGenerationSuite.java 2012-04-24 11:25:34 UTC (rev 40447)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/CodeGenerationSuite.java 2012-04-24 11:27:11 UTC (rev 40448)
@@ -1,5 +1,8 @@
package org.jboss.tools.hb.ui.bot.suite;
+import org.jboss.tools.hb.ui.bot.test.generation.CreateCodeGenerationConfiguration;
+import org.jboss.tools.hb.ui.bot.test.generation.JPADDLGenerationTest;
+import org.jboss.tools.hb.ui.bot.test.generation.JPAEntitiesGenerationTest;
import org.jboss.tools.hb.ui.bot.test.generation.RunSchemaExportTest;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
@@ -9,8 +12,8 @@
//(a)SuiteClasses({CreateCodeGenerationConfiguration.class})
//(a)SuiteClasses({JPADDLGenerationTest.class})
//(a)SuiteClasses({JPAEntitiesGenerationTest.class})
-(a)SuiteClasses({RunSchemaExportTest.class})
-//(a)SuiteClasses({CreateCodeGenerationConfiguration.class,JPADDLGenerationTest.class,JPAEntitiesGenerationTest.class})
+//(a)SuiteClasses({RunSchemaExportTest.class})
+(a)SuiteClasses({CreateCodeGenerationConfiguration.class,JPADDLGenerationTest.class,JPAEntitiesGenerationTest.class,RunSchemaExportTest.class})
public class CodeGenerationSuite {
}
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/HibernateSuite.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/HibernateSuite.java 2012-04-24 11:25:34 UTC (rev 40447)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/HibernateSuite.java 2012-04-24 11:27:11 UTC (rev 40448)
@@ -4,7 +4,6 @@
import org.jboss.tools.hb.ui.bot.test.configuration.CreateConfigurationFileTest;
import org.jboss.tools.hb.ui.bot.test.configuration.EditConfigurationFileTest;
import org.jboss.tools.hb.ui.bot.test.console.CreateConsoleConfigurationTest;
-import org.jboss.tools.hb.ui.bot.test.console.EditConsoleConfigurationTest;
import org.jboss.tools.hb.ui.bot.test.criteria.CriteriaEditorTest;
import org.jboss.tools.hb.ui.bot.test.diagram.MappingDiagramTest;
import org.jboss.tools.hb.ui.bot.test.generation.CreateCodeGenerationConfiguration;
@@ -36,7 +35,6 @@
EditConfigurationFileTest.class,
/* console */
CreateConsoleConfigurationTest.class,
- EditConsoleConfigurationTest.class,
/* criteria */
CriteriaEditorTest.class,
/* diagram */
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/ViewSuite.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/ViewSuite.java 2012-04-24 11:25:34 UTC (rev 40447)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/ViewSuite.java 2012-04-24 11:27:11 UTC (rev 40448)
@@ -1,5 +1,6 @@
package org.jboss.tools.hb.ui.bot.suite;
+import org.jboss.tools.hb.ui.bot.test.view.JPADetailViewTest;
import org.jboss.tools.hb.ui.bot.test.view.PackageInfoTest;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
@@ -7,7 +8,8 @@
@RunWith(RequirementAwareSuite.class)
//(a)SuiteClasses({JPADetailViewTest.class})
-(a)SuiteClasses({PackageInfoTest.class})
+//(a)SuiteClasses({PackageInfoTest.class})
+(a)SuiteClasses({JPADetailViewTest.class,PackageInfoTest.class})
public class ViewSuite {
}
13 years, 8 months
- 1
- 0