JBoss Tools SVN: r24156 - trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2010-08-13 11:35:17 -0400 (Fri, 13 Aug 2010)
New Revision: 24156
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java
Log:
https://jira.jboss.org/browse/JBIDE-3136
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java 2010-08-13 15:22:56 UTC (rev 24155)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java 2010-08-13 15:35:17 UTC (rev 24156)
@@ -10,6 +10,9 @@
******************************************************************************/
package org.jboss.tools.cdi.ui.test.wizard;
+import java.util.ArrayList;
+import java.util.List;
+
import junit.framework.TestCase;
import org.eclipse.core.resources.IFile;
@@ -31,6 +34,7 @@
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
//import org.jboss.tools.cdi.ui.wizard.NewCDIAnnotationWizardPage;
+import org.jboss.tools.cdi.ui.wizard.NewDecoratorWizardPage;
import org.jboss.tools.cdi.ui.wizard.NewInterceptorBindingWizardPage;
import org.jboss.tools.cdi.ui.wizard.NewInterceptorWizardPage;
import org.jboss.tools.cdi.ui.wizard.NewQualifierWizardPage;
@@ -54,6 +58,7 @@
static String SCOPE_NAME = "MyScope";
static String INTERCEPTOR_BINDING_NAME = "MyInterceptorBinding";
static String INTERCEPTOR_NAME = "MyInterceptor";
+ static String DECORATOR_NAME = "MapDecorator<K,V>";
static class WizardContext {
NewElementWizard wizard;
@@ -88,7 +93,10 @@
public String getNewTypeContent() {
IType type = null;
try {
- type = jp.findType(packName + "." + typeName);
+ String tn = typeName;
+ int q = tn.indexOf("<");
+ if(q >= 0) tn = tn.substring(0, q);
+ type = jp.findType(packName + "." + tn);
} catch (JavaModelException e) {
JUnitUtils.fail("Cannot find type " + typeName, e);
}
@@ -229,4 +237,30 @@
}
}
+ public void testNewDecoratorWizard() {
+ WizardContext context = new WizardContext();
+ context.init("org.jboss.tools.cdi.ui.wizard.NewDecoratorCreationWizard",
+ PACK_NAME, DECORATOR_NAME);JobUtils.waitForIdle(2000);
+ JobUtils.waitForIdle(2000);
+ ICDIProject cdi = CDICorePlugin.getCDIProject(context.tck, true);
+
+ try {
+ NewDecoratorWizardPage page = (NewDecoratorWizardPage)context.page;
+
+ List<String> interfacesNames = new ArrayList<String>();
+ interfacesNames.add("java.util.Map<K,V>");
+ page.setSuperInterfaces(interfacesNames, true);
+
+ context.wizard.performFinish();
+
+ String text = context.getNewTypeContent();
+ System.out.println(text);
+
+ assertTrue(text.contains("@Decorator"));
+ assertTrue(text.contains("@Delegate"));
+ } finally {
+ context.close();
+ }
+ }
+
}
\ No newline at end of file
15 years, 8 months
JBoss Tools SVN: r24155 - in trunk/cdi/plugins/org.jboss.tools.cdi.ui: src/org/jboss/tools/cdi/ui and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2010-08-13 11:22:56 -0400 (Fri, 13 Aug 2010)
New Revision: 24155
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorCreationWizard.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties
Log:
https://jira.jboss.org/browse/JBIDE-3136
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2010-08-13 15:22:23 UTC (rev 24154)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2010-08-13 15:22:56 UTC (rev 24155)
@@ -191,6 +191,18 @@
</description>
</wizard>
+ <wizard
+ category="org.jboss.tools.cdi.ui"
+ class="org.jboss.tools.cdi.ui.wizard.NewDecoratorCreationWizard"
+ icon="icons/cdi16.png"
+ id="org.jboss.tools.cdi.ui.wizard.NewDecoratorCreationWizard"
+ name="Decorator Type"
+ project="false">
+ <description>
+ Create an Decorator Java File
+ </description>
+ </wizard>
+
</extension>
-
+
</plugin>
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java 2010-08-13 15:22:23 UTC (rev 24154)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java 2010-08-13 15:22:56 UTC (rev 24155)
@@ -40,6 +40,9 @@
public static String NEW_INTERCEPTOR_WIZARD_TITLE;
public static String NEW_INTERCEPTOR_WIZARD_PAGE_NAME;
+ public static String NEW_DECORATOR_WIZARD_TITLE;
+ public static String NEW_DECORATOR_WIZARD_PAGE_NAME;
+
public static String SELECT_STEREOTYPE;
public static String SELECT_INTERCEPTOR_BINDING;
@@ -51,4 +54,7 @@
public static String MESSAGE_METHOD_NAME_EMPTY;
public static String MESSAGE_METHOD_NAME_NOT_VALID;
+ public static String MESSAGE_FIELD_NAME_EMPTY;
+ public static String MESSAGE_FIELD_NAME_NOT_VALID;
+
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2010-08-13 15:22:23 UTC (rev 24154)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2010-08-13 15:22:56 UTC (rev 24155)
@@ -29,6 +29,9 @@
NEW_INTERCEPTOR_WIZARD_TITLE=New Interceptor
NEW_INTERCEPTOR_WIZARD_PAGE_NAME=Interceptor Type
+NEW_DECORATOR_WIZARD_TITLE=New Decorator
+NEW_DECORATOR_WIZARD_PAGE_NAME=Decorator Type
+
SELECT_STEREOTYPE=Select Stereotype Annotation Type
SELECT_INTERCEPTOR_BINDING=Select Interceptor Binding Annotation Type
@@ -38,4 +41,8 @@
FIELD_EDITOR_STEREOTYPES_LABEL=Stereotypes:
MESSAGE_METHOD_NAME_EMPTY=Method Name is empty.
-MESSAGE_METHOD_NAME_NOT_VALID=Method Name is not valid. {0}
\ No newline at end of file
+MESSAGE_METHOD_NAME_NOT_VALID=Method Name is not valid. {0}
+
+MESSAGE_FIELD_NAME_EMPTY=Field Name is empty.
+MESSAGE_FIELD_NAME_NOT_VALID=Field Name is not valid. {0}
+
Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorCreationWizard.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorCreationWizard.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorCreationWizard.java 2010-08-13 15:22:56 UTC (rev 24155)
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.cdi.ui.wizard;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.internal.ui.wizards.NewElementWizard;
+import org.eclipse.jdt.ui.wizards.NewClassWizardPage;
+import org.jboss.tools.cdi.ui.CDIUIMessages;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class NewDecoratorCreationWizard extends NewElementWizard {
+ private NewClassWizardPage fPage;
+ private boolean fOpenEditorOnFinish = true;
+
+
+ public NewDecoratorCreationWizard() {
+ setWindowTitle(CDIUIMessages.NEW_DECORATOR_WIZARD_TITLE);
+ }
+
+ /*
+ * @see Wizard#createPages
+ */
+ public void addPages() {
+ super.addPages();
+ if (fPage == null) {
+ fPage = new NewDecoratorWizardPage();
+ fPage.init(getSelection());
+ }
+ addPage(fPage);
+ }
+
+ /*(non-Javadoc)
+ * @see org.eclipse.jdt.internal.ui.wizards.NewElementWizard#canRunForked()
+ */
+ protected boolean canRunForked() {
+ return !fPage.isEnclosingTypeSelected();
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jdt.internal.ui.wizards.NewElementWizard#finishPage(org.eclipse.core.runtime.IProgressMonitor)
+ */
+ protected void finishPage(IProgressMonitor monitor) throws InterruptedException, CoreException {
+ fPage.createType(monitor); // use the full progress monitor
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.wizard.IWizard#performFinish()
+ */
+ public boolean performFinish() {
+ warnAboutTypeCommentDeprecation();
+ boolean res= super.performFinish();
+ if (res) {
+ IResource resource= fPage.getModifiedResource();
+ if (resource != null) {
+ selectAndReveal(resource);
+ if (fOpenEditorOnFinish) {
+ openResource((IFile) resource);
+ }
+ }
+ }
+ return res;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jdt.internal.ui.wizards.NewElementWizard#getCreatedElement()
+ */
+ public IJavaElement getCreatedElement() {
+ return fPage.getCreatedType();
+ }
+
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorCreationWizard.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java 2010-08-13 15:22:56 UTC (rev 24155)
@@ -0,0 +1,401 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.cdi.ui.wizard;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.jdt.core.Flags;
+import org.eclipse.jdt.core.IBuffer;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IField;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IMethod;
+import org.eclipse.jdt.core.ISourceRange;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.formatter.CodeFormatter;
+import org.eclipse.jdt.internal.corext.codemanipulation.CodeGenerationSettings;
+import org.eclipse.jdt.internal.corext.codemanipulation.StubUtility;
+import org.eclipse.jdt.internal.corext.util.JavaConventionsUtil;
+import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
+import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
+import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;
+import org.eclipse.jdt.internal.ui.dialogs.StatusUtil;
+import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
+import org.eclipse.jdt.ui.CodeGeneration;
+import org.eclipse.jdt.ui.wizards.NewClassWizardPage;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.cdi.core.CDIConstants;
+import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.cdi.ui.CDIUIMessages;
+import org.jboss.tools.common.java.generation.JavaBeanGenerator;
+import org.jboss.tools.common.ui.widget.editor.CompositeEditor;
+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.LabelFieldEditor;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class NewDecoratorWizardPage extends NewClassWizardPage {
+ protected InterceptorBindingSelectionProvider interceptorBindingsProvider = new InterceptorBindingSelectionProvider();
+ IFieldEditor fieldName = null;
+
+ protected StatusInfo fieldNameStatus = new StatusInfo();
+
+ public NewDecoratorWizardPage() {
+ setTitle(CDIUIMessages.NEW_DECORATOR_WIZARD_PAGE_NAME);
+ }
+
+ public void init(IStructuredSelection selection) {
+ super.init(selection);
+ if (!selection.isEmpty()) {
+ Object o = selection.iterator().next();
+ IType type = null;
+ if (o instanceof IType) {
+ type = (IType) o;
+ } else if (o instanceof ICompilationUnit) {
+ ICompilationUnit cu = (ICompilationUnit) o;
+ try {
+ IType[] ts = cu.getTypes();
+ if (ts != null && ts.length > 0)
+ type = ts[0];
+ } catch (JavaModelException e) {
+ CDICorePlugin.getDefault().logError(e);
+ }
+
+ }
+ boolean isInterface = false;
+ try {
+ isInterface = type != null && type.isInterface();
+ } catch (JavaModelException e) {
+ CDICorePlugin.getDefault().logError(e);
+ }
+ if (isInterface) {
+ ArrayList<String> interfacesNames = new ArrayList<String>();
+ String name = "";
+ try {
+ name = type.getFullyQualifiedParameterizedName();
+ } catch (JavaModelException e) {
+ name = type.getFullyQualifiedName();
+ }
+ interfacesNames.add(name);
+ setSuperInterfaces(interfacesNames, true);
+ superInterfacesChanged();
+ setDefaultTypeName(name);
+ }
+ }
+ setModifiers(getModifiers() | Flags.AccAbstract, true);
+
+ doStatusUpdate();
+ }
+
+ void setDefaultTypeName(String interfaceName) {
+ int d = interfaceName.lastIndexOf('.');
+ int b = interfaceName.indexOf('<');
+ if (b < 0)
+ b = interfaceName.length();
+ String elementName = interfaceName.substring(d + 1, b);
+ String typeName = elementName + "Decorator";
+ typeName += interfaceName.substring(b);
+ setTypeName(typeName, true);
+ typeNameChanged();
+ String defaultFieldName = elementName;
+ if(defaultFieldName.length() > 0) {
+ defaultFieldName = defaultFieldName.substring(0, 1).toLowerCase() + defaultFieldName.substring(1);
+ if(fieldName != null) {
+ fieldName.setValue(defaultFieldName);
+ }
+ }
+
+ }
+
+ public void createControl(Composite parent) {
+ initializeDialogUnits(parent);
+
+ Composite composite = new Composite(parent, SWT.NONE);
+ composite.setFont(parent.getFont());
+
+ int nColumns = 4;
+
+ GridLayout layout = new GridLayout();
+ layout.numColumns = nColumns;
+ composite.setLayout(layout);
+
+ // pick & choose the wanted UI components
+
+ createContainerControls(composite, nColumns);
+ createPackageControls(composite, nColumns);
+ // createEnclosingTypeControls(composite, nColumns);
+
+ createSeparator(composite, nColumns);
+
+ createTypeNameControls(composite, nColumns);
+ createModifierControls(composite, nColumns);
+
+ // createSuperClassControls(composite, nColumns);
+ createSuperInterfacesControls(composite, nColumns);
+
+ // createMethodStubSelectionControls(composite, nColumns);
+
+ createCustomFields(composite);
+
+ createCommentControls(composite, nColumns);
+ enableCommentControl(true);
+
+ setControl(composite);
+
+ Dialog.applyDialogFont(composite);
+ PlatformUI.getWorkbench().getHelpSystem()
+ .setHelp(composite, IJavaHelpContextIds.NEW_CLASS_WIZARD_PAGE);
+
+ // onInterceptorBindingChange();
+ doStatusUpdate();
+ }
+
+ protected void createTypeMembers(IType newType,
+ final ImportsManager imports, IProgressMonitor monitor)
+ throws CoreException {
+ createInheritedMethods(newType, true, true, imports,
+ new SubProgressMonitor(monitor, 1));
+
+ ISourceRange range = newType.getSourceRange();
+ IBuffer buf = newType.getCompilationUnit().getBuffer();
+ String lineDelimiter = StubUtility.getLineDelimiterUsed(newType
+ .getJavaProject());
+ StringBuffer sb = new StringBuffer();
+ addAnnotations(imports, sb, lineDelimiter);
+ buf.replace(range.getOffset(), 0, sb.toString());
+ createDelegateField(newType, imports, monitor, lineDelimiter);
+ modifyMethodContent(newType, imports, monitor, lineDelimiter);
+ }
+
+ void addAnnotations(ImportsManager imports, StringBuffer sb,
+ String lineDelimiter) {
+ addDecoratorAnnotation(imports, sb, lineDelimiter);
+ }
+
+ protected void addDecoratorAnnotation(ImportsManager imports,
+ StringBuffer sb, String lineDelimiter) {
+ NewCDIAnnotationWizardPage.addAnnotation(
+ CDIConstants.DECORATOR_STEREOTYPE_TYPE_NAME, imports, sb,
+ lineDelimiter);
+ }
+
+ protected void createCustomFields(Composite composite) {
+ createFieldNameField(composite);
+ }
+
+ protected void createFieldNameField(Composite composite) {
+ String label = "Delegate Field Name:";
+ List is = getSuperInterfaces();
+ String defaultFieldName = "";
+ if (is != null && !is.isEmpty()) {
+ defaultFieldName = is.get(0).toString();
+ int i = defaultFieldName.lastIndexOf('.');
+ if (i >= 0)
+ defaultFieldName = defaultFieldName.substring(i + 1);
+ if (defaultFieldName.length() > 0) {
+ defaultFieldName = defaultFieldName.substring(0, 1)
+ .toLowerCase() + defaultFieldName.substring(1);
+ }
+ i = defaultFieldName.indexOf('<');
+ if (i >= 0) {
+ defaultFieldName = defaultFieldName.substring(0, i);
+ }
+ }
+ fieldName = IFieldEditorFactory.INSTANCE.createTextEditor("fieldName",
+ label, defaultFieldName);
+ ((CompositeEditor) fieldName)
+ .addFieldEditors(new IFieldEditor[] { new LabelFieldEditor(
+ "fieldName", "") });
+ fieldName.doFillIntoGrid(composite);
+ fieldName.addPropertyChangeListener(new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent evt) {
+ onFieldNameChange();
+ doStatusUpdate();
+ }
+ });
+ }
+
+ void onFieldNameChange() {
+ String methodName = this.fieldName.getValueAsString();
+ fieldNameStatus = new StatusInfo();
+ if (methodName.length() == 0) {
+ fieldNameStatus.setError(CDIUIMessages.MESSAGE_FIELD_NAME_EMPTY);
+ return;
+ }
+ IStatus val = JavaConventionsUtil.validateMethodName(methodName, null);
+ if (val != null && val.getSeverity() == IStatus.ERROR) {
+ fieldNameStatus.setError(NLS.bind(
+ CDIUIMessages.MESSAGE_FIELD_NAME_NOT_VALID,
+ val.getMessage()));
+ }
+
+ }
+
+ protected IField createDelegateField(IType type, ImportsManager imports,
+ IProgressMonitor monitor, String lineDelimiter)
+ throws CoreException {
+ String fieldName = "" + this.fieldName.getValue();
+
+ imports.addImport("javax.interceptor.InvocationContext");
+ imports.addImport("javax.interceptor.AroundInvoke");
+ imports.addImport(CDIConstants.INJECT_ANNOTATION_TYPE_NAME);
+ imports.addImport(CDIConstants.ANY_QUALIFIER_TYPE_NAME);
+ imports.addImport(CDIConstants.DELEGATE_STEREOTYPE_TYPE_NAME);
+
+ ICompilationUnit cu = type.getCompilationUnit();
+ JavaModelUtil.reconcile(cu);
+ CodeGenerationSettings settings = JavaPreferencesSettings
+ .getCodeGenerationSettings(type.getJavaProject());
+ settings.createComments = isAddComments();
+ String access = "private";
+ String javatype = "Object";
+ List is = getSuperInterfaces();
+ if (is != null)
+ for (int i = 0; i < is.size(); i++) {
+ String in = is.get(i).toString();
+ int d = in.lastIndexOf('.');
+ if (d >= 0)
+ in = in.substring(d + 1);
+ javatype = in;
+ break;
+ }
+
+ String fieldHeader = "@Inject @Delegate @Any " + access + " " + javatype + " " + fieldName + ";" + lineDelimiter; //$NON-NLS-1$ //$NON-NLS-2$
+ IJavaElement[] cs = type.getChildren();
+ IJavaElement sibling = cs == null || cs.length == 0 ? null : cs[0];
+ IField m = type.createField(fieldHeader, sibling, true, null);
+
+ editField(cu, m, javatype, fieldHeader, lineDelimiter);
+ return m;
+ }
+
+ void editField(ICompilationUnit cu, IField m, String javatype, String fieldHeader,
+ String lineDelimiter) throws CoreException {
+ synchronized (cu) {
+ cu.reconcile(ICompilationUnit.NO_AST, true, null, null);
+ }
+ ISourceRange range = m.getSourceRange();
+ IBuffer buf = cu.getBuffer();
+ StringBuffer sb = new StringBuffer(lineDelimiter);
+ if (isAddComments()) {
+ String fieldComment = CodeGeneration.getFieldComment(cu,
+ javatype, m.getElementName(), lineDelimiter);
+ sb.append(fieldComment).append(lineDelimiter);
+ }
+ sb.append(fieldHeader);
+ String formattedContent = JavaBeanGenerator.codeFormat2(
+ CodeFormatter.K_CLASS_BODY_DECLARATIONS, sb.toString(), 1,
+ lineDelimiter, cu.getJavaProject());
+ if (formattedContent != null && formattedContent.startsWith("\t")) { //$NON-NLS-1$
+ formattedContent = formattedContent.substring(1);
+ }
+ buf.replace(range.getOffset(), range.getLength(), formattedContent);
+ }
+
+ protected IStatus superInterfacesChanged() {
+ List list = getSuperInterfaces();
+ if(list != null && !list.isEmpty()) {
+ setDefaultTypeName(list.get(0).toString());
+ }
+ StatusInfo result = (StatusInfo) super.superInterfacesChanged();
+ if (!result.isError()) {
+ if (list == null || list.isEmpty()) {
+ result.setError("Please select decorated type.");
+ }
+ }
+ return result;
+ }
+
+ private void doStatusUpdate() {
+ // status of all used components
+ IStatus[] status = new IStatus[] {
+ fContainerStatus,
+ isEnclosingTypeSelected() ? fEnclosingTypeStatus
+ : fPackageStatus, fTypeNameStatus, fModifierStatus,
+ fSuperClassStatus, fSuperInterfacesStatus };
+
+ // the mode severe status will be displayed and the OK button
+ // enabled/disabled.
+ updateStatus(status);
+ }
+
+ protected void updateStatus(IStatus[] status) {
+ IStatus[] ns = new IStatus[status.length + 1];
+ System.arraycopy(status, 0, ns, 0, status.length);
+ ns[status.length] = fieldNameStatus;
+ status = ns;
+ updateStatus(StatusUtil.getMostSevere(status));
+ }
+
+ protected void modifyMethodContent(IType type, ImportsManager imports,
+ IProgressMonitor monitor, String lineDelimiter) throws CoreException {
+ IMethod[] ms = type.getMethods();
+ for (int i = 0; i < ms.length; i++) {
+ if(ms[i].isConstructor()) continue;
+ ICompilationUnit cu = type.getCompilationUnit();
+ synchronized (cu) {
+ cu.reconcile(ICompilationUnit.NO_AST, true, null, null);
+ }
+ IBuffer buf = cu.getBuffer();
+ ISourceRange range = ms[i].getSourceRange();
+
+ int start = -1;
+ int end = -1;
+ StringBuffer sb = new StringBuffer();
+ if("void".equals(ms[i].getReturnType()) || "V".equals(ms[i].getReturnType())) {
+ end = buf.getContents().indexOf("}", range.getOffset());
+ if(end < 0) continue;
+ end = buf.getContents().lastIndexOf(lineDelimiter, end);
+ if(end < 0 || end < range.getOffset()) continue;
+// end += lineDelimiter.length();
+ start = end;
+ } else {
+ start = buf.getContents().indexOf("return", range.getOffset());
+ if(start < 0 || start > range.getOffset() + range.getLength()) continue;
+ start += 7;
+ end = buf.getContents().indexOf(";", start);
+ if(end < 0) continue;
+ end++;
+ }
+ String fieldName = "" + this.fieldName.getValue();
+ String methodName = ms[i].getElementName();
+ String[] ps = ms[i].getParameterNames();
+ sb.append(fieldName).append('.').append(methodName).append('(');
+ for (int k = 0; k < ps.length; k++) {
+ if(k > 0) sb.append(", ");
+ sb.append(ps[k]);
+ }
+ sb.append(");");
+ buf.replace(start, end - start, sb.toString());
+ }
+
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 8 months
JBoss Tools SVN: r24154 - trunk/usage/tests/org.jboss.tools.usage.test.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-08-13 11:22:23 -0400 (Fri, 13 Aug 2010)
New Revision: 24154
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageRequestsTest.launch
trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageTest.launch
Log:
[JBIDE-6376] test launch configs corrected
Modified: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageRequestsTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageRequestsTest.launch 2010-08-13 15:16:07 UTC (rev 24153)
+++ trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageRequestsTest.launch 2010-08-13 15:22:23 UTC (rev 24154)
@@ -3,14 +3,14 @@
<booleanAttribute key="append.args" value="true"/>
<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
<booleanAttribute key="clearConfig" value="true"/>
<booleanAttribute key="clearws" value="true"/>
<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBossToolsUsageRequestsTest"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBossToolsUsageRequestsTest2"/>
<booleanAttribute key="default" value="false"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
@@ -35,11 +35,12 @@
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
-<booleanAttribute key="run_in_ui_thread" value="false"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
<stringAttribute key="selected_target_plugins" value="org.eclipse.ui@default:default,org.eclipse.ecf@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.expressions@default:default,javax.servlet@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.osgi.services@default:default,javax.transaction@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.ui.ide@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.!
ui.forms@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.security@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.net@default:default,com.ibm.icu@default:default,org.eclipse.jface.text@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.jface.databinding@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.text@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.transforms.hook@default:false,org.junit4@default:default,org.hamcrest.core@default:default,org.jboss.tools.xulrunner.initializer@default:false!
,org.eclipse.equinox.app@default:default,org.eclipse.swt@defau!
lt:defau
lt,org.eclipse.core.variables@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.commands@default:default,org.eclipse.help@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.preferences@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
<booleanAttribute key="useProduct" value="false"/>
Modified: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageTest.launch 2010-08-13 15:16:07 UTC (rev 24153)
+++ trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageTest.launch 2010-08-13 15:22:23 UTC (rev 24154)
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
<booleanAttribute key="askclear" value="false"/>
<booleanAttribute key="automaticAdd" value="true"/>
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="false"/>
+<booleanAttribute key="clearws" value="true"/>
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBossToolsUsageTest"/>
<booleanAttribute key="default" value="false"/>
@@ -28,17 +27,19 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.usage.test.JBossToolsUsageTest"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -log"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.usage.test"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.ecf.provider.filetransfer@default:default,com.springsource.org.apache.commons.logging@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ui.forms@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.jface.text@default:default,com.springsource.org.apache.commons.codec@default:default,org.eclipse.core.databi!
nding@default:default,org.eclipse.help@default:default,org.eclipse.equinox.security@default:default,org.junit4@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.ui@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.text@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.ecf.identity@default:default,org.hamcrest.core@default:default,org.eclipse.ecf.ssl@default:false,javax.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.jface@default:default,com.ibm.icu@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ant.core@default:default,org.eclipse.ecf.provider.filetr!
ansfer.ssl@default:false,javax.transaction@default:false,org.e!
clipse.c
ore.databinding.observable@default:default,org.eclipse.ecf@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt@default:default,org.apache.commons.httpclient@default:default,org.eclipse.ui.views@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.expressions@default:default,org.eclipse.equinox.p2.metadata@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.ui@default:default,org.eclipse.ecf@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.expressions@default:default,javax.servlet@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.osgi.services@default:default,javax.transaction@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.ui.ide@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.!
ui.forms@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.security@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.net@default:default,com.ibm.icu@default:default,org.eclipse.jface.text@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.jface.databinding@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.text@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.transforms.hook@default:false,org.junit4@default:default,org.hamcrest.core@default:default,org.jboss.tools.xulrunner.initializer@default:false!
,org.eclipse.equinox.app@default:default,org.eclipse.swt@defau!
lt:defau
lt,org.eclipse.core.variables@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.commands@default:default,org.eclipse.help@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.preferences@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
<booleanAttribute key="useProduct" value="false"/>
15 years, 8 months
JBoss Tools SVN: r24153 - trunk/usage/tests/org.jboss.tools.usage.test.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-08-13 11:16:07 -0400 (Fri, 13 Aug 2010)
New Revision: 24153
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageTest.launch
Log:
[JBIDE-6376] url strategey completed + test completed
Modified: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageTest.launch 2010-08-13 15:15:57 UTC (rev 24152)
+++ trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageTest.launch 2010-08-13 15:16:07 UTC (rev 24153)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
<booleanAttribute key="append.args" value="true"/>
<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
@@ -10,7 +10,7 @@
<booleanAttribute key="clearConfig" value="true"/>
<booleanAttribute key="clearws" value="false"/>
<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBossToolsUsageTest"/>
<booleanAttribute key="default" value="false"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
@@ -21,8 +21,8 @@
<listEntry value="1"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
@@ -35,11 +35,11 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.ui.ide@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.jface@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.help@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.jface.text@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.common@2:true,com.springsource.org.apache.commons.codec@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.core.filesystem.linux.x86@default:false,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ecf.filetransfer@default:default,com.springsource.org.apache.commons.logging@default:default,or!
g.eclipse.equinox.p2.repository@default:default,org.eclipse.text@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.databinding@default:default,javax.servlet@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.app@default:default,org.eclipse.swt.gtk.linux.x86@default:false,org.apache.commons.httpclient@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.net@default:default,org.eclipse.ui.views@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.security@default:default,org.eclipse.ui.forms@default:default,org.eclipse.swt@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.ecf.identity@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.n!
et.linux.x86@default:false,org.junit4@default:default,org.ecli!
pse.core
.filesystem@default:default,org.eclipse.core.resources@default:default,org.hamcrest.core@default:default,com.ibm.icu@default:default,org.eclipse.core.runtime@default:true,org.eclipse.osgi.services@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.transforms.hook@default:false,javax.transaction@default:false,org.eclipse.osgi@-1:true,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.concurrent@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.ecf.provider.filetransfer@default:default,com.springsource.org.apache.commons.logging@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ui.forms@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.jface.text@default:default,com.springsource.org.apache.commons.codec@default:default,org.eclipse.core.databi!
nding@default:default,org.eclipse.help@default:default,org.eclipse.equinox.security@default:default,org.junit4@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.ui@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.text@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.ecf.identity@default:default,org.hamcrest.core@default:default,org.eclipse.ecf.ssl@default:false,javax.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.jface@default:default,com.ibm.icu@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ant.core@default:default,org.eclipse.ecf.provider.filetr!
ansfer.ssl@default:false,javax.transaction@default:false,org.e!
clipse.c
ore.databinding.observable@default:default,org.eclipse.ecf@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt@default:default,org.apache.commons.httpclient@default:default,org.eclipse.ui.views@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.expressions@default:default,org.eclipse.equinox.p2.metadata@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
<booleanAttribute key="useProduct" value="false"/>
</launchConfiguration>
15 years, 8 months
JBoss Tools SVN: r24152 - trunk/usage/tests/org.jboss.tools.usage.test.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-08-13 11:15:57 -0400 (Fri, 13 Aug 2010)
New Revision: 24152
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/FocusPointTest.launch
Log:
[JBIDE-6376] url strategey completed + test completed
Modified: trunk/usage/tests/org.jboss.tools.usage.test/FocusPointTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/FocusPointTest.launch 2010-08-13 15:15:46 UTC (rev 24151)
+++ trunk/usage/tests/org.jboss.tools.usage.test/FocusPointTest.launch 2010-08-13 15:15:57 UTC (rev 24152)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
<booleanAttribute key="append.args" value="true"/>
<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
@@ -10,7 +10,7 @@
<booleanAttribute key="clearConfig" value="true"/>
<booleanAttribute key="clearws" value="true"/>
<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/FocusPointTest"/>
<booleanAttribute key="default" value="false"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
@@ -21,8 +21,8 @@
<listEntry value="1"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
@@ -34,12 +34,12 @@
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.core.net.linux.x86@default:false,org.eclipse.ui.views@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,javax.transaction@default:false,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ui.forms@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.resources.compatibility@default:false,org.eclipse.ecf.identity@default:default,com.springsource.org.apache.commons.logging@default:default,org.eclipse.osgi.services@default:default,com.ibm.icu@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ant.core@default:default,com.springsource.org.apache.commons.codec@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.jface@default:default,org.junit4@default:default,org.hamcrest.core@default:default!
,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.variables@default:default,org.eclipse.ecf@default:default,org.eclipse.ui@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.text@default:default,org.apache.commons.httpclient@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.common@2:true,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.databinding@default:default,org.eclipse.help@default:default,javax.servlet@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.net@default:default,org.eclipse.core.databindin!
g.observable@default:default,org.jboss.tools.xulrunner.initial!
izer@def
ault:false,org.eclipse.jface.text@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.filesystem.linux.x86@default:false,org.eclipse.core.expressions@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.p2.repository@default:default,org.eclipse.swt@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.swt.gtk.linux.x86@default:false"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.analytics@default:default,org.jboss.tools.usage.test@default:default"/>
+<booleanAttribute key="run_in_ui_thread" value="false"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ui.forms@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.osgi.services@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.jface.text@default:default,org.eclipse.core.databinding@default:default,org.eclipse.!
help@default:default,org.eclipse.equinox.security@default:default,org.eclipse.swt.cocoa.macosx@default:false,org.junit4@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.ui@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.text@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.ecf.identity@default:default,org.hamcrest.core@default:default,org.eclipse.ecf.ssl@default:false,javax.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.jface@default:default,com.ibm.icu@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ant.core@default:default,org.eclipse.ecf.provid!
er.filetransfer.ssl@default:false,javax.transaction@default:fa!
lse,org.
eclipse.core.databinding.observable@default:default,org.eclipse.ecf@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt@default:default,org.eclipse.ui.views@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.expressions@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.p2.metadata@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
<booleanAttribute key="useProduct" value="false"/>
</launchConfiguration>
15 years, 8 months
JBoss Tools SVN: r24151 - trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-08-13 11:15:46 -0400 (Fri, 13 Aug 2010)
New Revision: 24151
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java
Log:
[JBIDE-6376] url strategey completed + test completed
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java 2010-08-13 13:38:38 UTC (rev 24150)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java 2010-08-13 15:15:46 UTC (rev 24151)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.usage.test;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.io.UnsupportedEncodingException;
@@ -26,6 +25,10 @@
private static final String GANALYTICS_ACCOUNTNAME = "UA-17645367-1";
private static final String HOSTNAME = "jboss.org";
+
+// private static final String COOKIE_DELIMITER = EncodingUtils.checkedEncodeUtf8(String
+// .valueOf(IGoogleAnalyticsParameters.PLUS_SIGN));
+
private GoogleAnalyticsUrlStrategy urlStrategy;
@Before
@@ -50,37 +53,62 @@
+ "&utmr=0"
+ "&utmp=%2Ftesting%2Fstrategy"
+ "&utmac=UA-17645367-1"
- + "&__utma%3D156030503.195542053.1281528584.1281528584.1281528584.1%3B%2B__utmz%3D156030500.1281528584.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+ + "&utmcc=__utma%3D156030503.195542053.1281528584.1281528584.1281528584.1%3B%2B__utmz%3D156030500.1281528584.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+ "&gaq=1";
- // assertEquals(expectedUrl, builtUrl);
- assertEqualParameterValues(IGoogleAnalyticsParameters.PARAM_TRACKING_CODE_VERSION, url, targetUrl);
- assertEqualParameterValues(IGoogleAnalyticsParameters.PARAM_HOST_NAME, url, targetUrl);
- assertEqualParameterValues(IGoogleAnalyticsParameters.PARAM_LANGUAGE_ENCODING, url, targetUrl);
- assertEqualParameterValues(IGoogleAnalyticsParameters.PARAM_SCREEN_RESOLUTION, url, targetUrl);
- assertEqualParameterValues(IGoogleAnalyticsParameters.PARAM_SCREEN_COLOR_DEPTH, url, targetUrl);
- assertEqualParameterValues(IGoogleAnalyticsParameters.PARAM_PAGE_TITLE, url, targetUrl);
- assertEqualParameterValues(IGoogleAnalyticsParameters.PARAM_REFERRAL, url, targetUrl);
- assertEqualParameterValues(IGoogleAnalyticsParameters.PARAM_PAGE_REQUEST, url, targetUrl);
- assertEqualParameterValues(IGoogleAnalyticsParameters.PARAM_ACCOUNT_NAME, url, targetUrl);
+ assertTrue(areEqualParameterValues(IGoogleAnalyticsParameters.PARAM_TRACKING_CODE_VERSION, url, targetUrl));
+ assertTrue(areEqualParameterValues(IGoogleAnalyticsParameters.PARAM_HOST_NAME, url, targetUrl));
+ assertTrue(areEqualParameterValues(IGoogleAnalyticsParameters.PARAM_LANGUAGE_ENCODING, url, targetUrl));
+ assertTrue(areEqualParameterValues(IGoogleAnalyticsParameters.PARAM_SCREEN_RESOLUTION, url, targetUrl));
+ assertTrue(areEqualParameterValues(IGoogleAnalyticsParameters.PARAM_SCREEN_COLOR_DEPTH, url, targetUrl));
+ assertTrue(areEqualParameterValues(IGoogleAnalyticsParameters.PARAM_PAGE_TITLE, url, targetUrl));
+ assertTrue(areEqualParameterValues(IGoogleAnalyticsParameters.PARAM_REFERRAL, url, targetUrl));
+ assertTrue(areEqualParameterValues(IGoogleAnalyticsParameters.PARAM_PAGE_REQUEST, url, targetUrl));
+ assertTrue(areEqualParameterValues(IGoogleAnalyticsParameters.PARAM_ACCOUNT_NAME, url, targetUrl));
+
+ assertTrue(hasCookieValue("__utma", url));
+ assertTrue(hasCookieValue("__utmz", url));
+ assertTrue(hasCookieValue("utmcsr", url));
+ assertTrue(hasCookieValue("utmccn", url));
+ assertTrue(hasCookieValue("utmcmd", url));
+
+ assertTrue(areEqualParameterValues(IGoogleAnalyticsParameters.PARAM_GAQ, url, targetUrl));
}
- private void assertEqualParameterValues(String paramName, String url, String targetUrl) {
- String targetValue = getParameterValue(paramName, targetUrl,IGoogleAnalyticsParameters.AMPERSAND);
- String value = getParameterValue(paramName, url,IGoogleAnalyticsParameters.AMPERSAND);
- assertEquals("parameter '" + paramName + "' did not match", targetValue, value);
+ private boolean areEqualParameterValues(String paramName, String url, String targetUrl) {
+ return areEqualParameterValues(paramName, url, targetUrl, String.valueOf(IGoogleAnalyticsParameters.AMPERSAND));
}
- private String getParameterValue(String parameterName, String url, char... delimiters) {
+ private boolean areEqualParameterValues(String paramName, String url, String targetUrl, String delimiters) {
+ String targetValue = getParameterValue(paramName, targetUrl, delimiters);
+ String value = getParameterValue(paramName, url, delimiters);
+ return targetValue != null && targetValue.equals(value);
+ }
+
+ private boolean hasCookieValue(String cookieName, String url) {
+ String cookieValues = getParameterValue(IGoogleAnalyticsParameters.PARAM_COOKIES, url,
+ String.valueOf(IGoogleAnalyticsParameters.AMPERSAND));
+ return cookieValues != null && cookieValues.indexOf(cookieName) >= 0;
+ }
+
+// private void assertEqualCookieParameterValues(String paramName, String url, String targetUrl) {
+// String targetCookieValues = getParameterValue(IGoogleAnalyticsParameters.PARAM_COOKIES, targetUrl,
+// IGoogleAnalyticsParameters.AMPERSAND);
+// String cookieValues = getParameterValue(IGoogleAnalyticsParameters.PARAM_COOKIES, url,
+// IGoogleAnalyticsParameters.AMPERSAND);
+// assertEqualParameterValues(paramName, cookieValues, targetCookieValues, COOKIE_DELIMITER.toCharArray());
+// }
+
+ private String getParameterValue(String parameterName, String url, String delimiters) {
String value = null;
int parameterNameStart = url.indexOf(parameterName);
- if (parameterNameStart > 0) {
- for (char delimiter : delimiters) {
- int valueEnd = url.indexOf(delimiter, parameterNameStart + parameterName.length());
- if (valueEnd > 0) {
- value = url.substring(parameterNameStart + parameterName.length() + 1, valueEnd);
- break;
+ if (parameterNameStart >= 0) {
+ int valueStart = parameterNameStart + parameterName.length() + 1;
+ int valueEnd = url.indexOf(delimiters, parameterNameStart + parameterName.length());
+ if (valueEnd < 0) {
+ value = url.substring(valueStart);
+ } else {
+ value = url.substring(valueStart, valueEnd);
}
- }
}
return value;
}
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-13 13:38:38 UTC (rev 24150)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-13 15:15:46 UTC (rev 24151)
@@ -79,7 +79,7 @@
+"&utmr=0"
+"&utmp=%2Ftools%2Fusage%2FtestUrl0_1"
+"&utmac=UA-17645367-1"
- +"&__utma%3D156030508.195542053.1281528584.1281528584.1281528584.1%3B%2B__utmz%3D156030500.1281528584.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+ +"&utmcc=__utma%3D156030508.195542053.1281528584.1281528584.1281528584.1%3B%2B__utmz%3D156030500.1281528584.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+"&gaq=1";
method.request(url);
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
@@ -154,7 +154,7 @@
+"&utmr=0"
+"&utmp=%2Ftools%2Fusage%2FtestUrl0_4"
+"&utmac=UA-17645367-1"
- +"&__utma%3D156030502.195542053.1281528584.1281528584.1281528584.1%3B%2B__utmz%3D156030500.1281528584.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+ +"&utmcc=__utma%3D156030502.195542053.1281528584.1281528584.1281528584.1%3B%2B__utmz%3D156030500.1281528584.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+"&gaq=1";
method.request(url);
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
15 years, 8 months
JBoss Tools SVN: r24150 - in trunk/seam/tests/org.jboss.tools.seam.core.test: src/org/jboss/tools/seam/core/test and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2010-08-13 09:38:38 -0400 (Fri, 13 Aug 2010)
New Revision: 24150
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.2
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.original
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.xml
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
Log:
https://jira.jboss.org/browse/JBDS-1130
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.2
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.2 2010-08-13 13:20:43 UTC (rev 24149)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.2 2010-08-13 13:38:38 UTC (rev 24150)
@@ -16,36 +16,4 @@
<property name="abc">value1</property>
</component>
- <core:init debug="true" jndi-pattern="@jndiPattern@"/>
-
- <core:manager concurrent-request-timeout="500"
- conversation-timeout="120000"
- conversation-id-parameter="cid"
- conversation-is-long-running-parameter="clr"/>
-
-
- <core:entity-manager-factory name="SeamWebWarTestProjectEntityManagerFactory"
- persistence-unit-name="SeamWebWarTestProject"/>
-
- <core:ejb installed="@embeddedEjb@"/>
-
-
-
- <event type="org.jboss.seam.notLoggedIn">
- <action expression="#{redirect.captureCurrentView}"/>
- </event>
- <event type="org.jboss.seam.postAuthenticate">
- <action expression="#{redirect.returnToCapturedView}"/>
- </event>
-
- <mail:mail-session host="localhost" port="2525" username="test" password="test" />
-
- <!-- For use with jBPM pageflow or process management -->
- <!--
- <core:jbpm>
- <core:process-definitions></core:process-definitions>
- <core:pageflow-definitions></core:pageflow-definitions>
- </core:jbpm>
- -->
-
</components>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.original
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.original 2010-08-13 13:20:43 UTC (rev 24149)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.original 2010-08-13 13:38:38 UTC (rev 24150)
@@ -12,52 +12,4 @@
http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-1.2.xsd
http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.2.xsd">
- <core:init debug="true" jndi-pattern="@jndiPattern@"/>
-
- <core:manager concurrent-request-timeout="500"
- conversation-timeout="120000"
- conversation-id-parameter="cid"
- conversation-is-long-running-parameter="clr"/>
-
- <core:managed-persistence-context name="entityManager"
- auto-create="true"
- entity-manager-factory="#{SeamWebWarTestProjectEntityManagerFactory}"/>
-
- <core:entity-manager-factory name="SeamWebWarTestProjectEntityManagerFactory"
- persistence-unit-name="SeamWebWarTestProject"/>
-
- <core:ejb installed="@embeddedEjb@"/>
-
- <drools:rule-base name="securityRules">
- <drools:rule-files><value>/security.drl</value></drools:rule-files>
- </drools:rule-base>
-
- <security:identity authenticate-method="#{authenticator.authenticate}"
- security-rules="#{securityRules}"
- remember-me="true"/>
-
- <event type="org.jboss.seam.notLoggedIn">
- <action expression="#{redirect.captureCurrentView}"/>
- </event>
- <event type="org.jboss.seam.postAuthenticate">
- <action expression="#{redirect.returnToCapturedView}"/>
- </event>
-
- <mail:mail-session host="localhost" port="2525" username="test" password="test" />
-
- <!-- For use with jBPM pageflow or process management -->
- <!--
- <core:jbpm>
- <core:process-definitions></core:process-definitions>
- <core:pageflow-definitions></core:pageflow-definitions>
- </core:jbpm>
- -->
- <component class="org.domain.SeamWebWarTestProject.session.TestComponent" name="test" />
-
- <factory name="test" />
-
- <security:identity authenticate-method="#{test.operate}"
- security-rules="#{securityRules}"
- remember-me="true"/>
-
</components>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.xml 2010-08-13 13:20:43 UTC (rev 24149)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.xml 2010-08-13 13:38:38 UTC (rev 24150)
@@ -12,52 +12,4 @@
http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-1.2.xsd
http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.2.xsd">
- <core:init debug="true" jndi-pattern="@jndiPattern@"/>
-
- <core:manager concurrent-request-timeout="500"
- conversation-timeout="120000"
- conversation-id-parameter="cid"
- conversation-is-long-running-parameter="clr"/>
-
- <core:managed-persistence-context name="entityManager"
- auto-create="true"
- entity-manager-factory="#{SeamWebWarTestProjectEntityManagerFactory}"/>
-
- <core:entity-manager-factory name="SeamWebWarTestProjectEntityManagerFactory"
- persistence-unit-name="SeamWebWarTestProject"/>
-
- <core:ejb installed="@embeddedEjb@"/>
-
- <drools:rule-base name="securityRules">
- <drools:rule-files><value>/security.drl</value></drools:rule-files>
- </drools:rule-base>
-
- <security:identity authenticate-method="#{authenticator.authenticate}"
- security-rules="#{securityRules}"
- remember-me="true"/>
-
- <event type="org.jboss.seam.notLoggedIn">
- <action expression="#{redirect.captureCurrentView}"/>
- </event>
- <event type="org.jboss.seam.postAuthenticate">
- <action expression="#{redirect.returnToCapturedView}"/>
- </event>
-
- <mail:mail-session host="localhost" port="2525" username="test" password="test" />
-
- <!-- For use with jBPM pageflow or process management -->
- <!--
- <core:jbpm>
- <core:process-definitions></core:process-definitions>
- <core:pageflow-definitions></core:pageflow-definitions>
- </core:jbpm>
- -->
- <component class="org.domain.SeamWebWarTestProject.session.TestComponent" name="test" />
-
- <factory name="test" />
-
- <security:identity authenticate-method="#{test.operate}"
- security-rules="#{securityRules}"
- remember-me="true"/>
-
</components>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2010-08-13 13:20:43 UTC (rev 24149)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2010-08-13 13:38:38 UTC (rev 24150)
@@ -136,7 +136,7 @@
SeamCoreValidatorWrapper seamValidator = new SeamCoreValidatorWrapper(project);
seamValidator.validate(componentFile);
- assertTrue(seamValidator.isMessageCreated(SeamValidationMessages.UNKNOWN_FACTORY_NAME, new String[]{"somethings"}));
+ assertTrue("Error marker not found", seamValidator.isMessageCreated(SeamValidationMessages.UNKNOWN_FACTORY_NAME, new String[]{"somethings"}));
copyContentsFile(componentFile, "src/action/org/domain/SeamWebWarTestProject/session/FactoryTest.original");
}
@@ -184,7 +184,7 @@
SeamCoreValidatorWrapper seamValidator = new SeamCoreValidatorWrapper(project);
seamValidator.validate(subclassComponentFile);
- assertTrue(seamValidator.isMessageCreated(SeamValidationMessages.STATEFUL_COMPONENT_DOES_NOT_CONTAIN_REMOVE, new String[]{"testComponentJBIDE1696"}));
+ assertTrue("Error marker not found", seamValidator.isMessageCreated(SeamValidationMessages.STATEFUL_COMPONENT_DOES_NOT_CONTAIN_REMOVE, new String[]{"testComponentJBIDE1696"}));
IFile superclassComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/SuperclassTestComponent.java");
copyContentsFile(superclassComponentFile, "src/action/org/domain/SeamWebWarTestProject/session/SuperclassTestComponent.withRemove");
@@ -206,8 +206,8 @@
ELValidatorWrapper elValidator = new ELValidatorWrapper(project);
elValidator.validate(jbide1631XHTMLFile);
- assertTrue(elValidator.isMessageCreated(JSFValidationMessages.UNKNOWN_EL_VARIABLE_NAME, new Object[]{"foo1"}));
- assertTrue(elValidator.isMessageCreated(JSFValidationMessages.UNKNOWN_EL_VARIABLE_NAME, new Object[]{"foo2"}));
+ assertTrue("Error marker not found", elValidator.isMessageCreated(JSFValidationMessages.UNKNOWN_EL_VARIABLE_NAME, new Object[]{"foo1"}));
+ assertTrue("Error marker not found", elValidator.isMessageCreated(JSFValidationMessages.UNKNOWN_EL_VARIABLE_NAME, new Object[]{"foo2"}));
}
public void testDuplicateComponentNameValidator() throws CoreException, ValidationException {
@@ -219,7 +219,7 @@
SeamCoreValidatorWrapper seamValidator = new SeamCoreValidatorWrapper(project);
seamValidator.validate(bbcComponentFile);
- assertTrue(!seamValidator.isMessageCreated(
+ assertFalse("Error marker was found", seamValidator.isMessageCreated(
SeamValidationMessages.NONUNIQUE_COMPONENT_NAME_MESSAGE, new Object[]{"abcComponent"}));
// Duplicate component name
@@ -228,7 +228,7 @@
"src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.2");
seamValidator = new SeamCoreValidatorWrapper(project);
seamValidator.validate(bbcComponentFile);
- assertTrue(seamValidator.isMessageCreated(
+ assertTrue("Error marker not found", seamValidator.isMessageCreated(
SeamValidationMessages.NONUNIQUE_COMPONENT_NAME_MESSAGE, new Object[]{"abcComponent"}));
// restore file content
@@ -276,8 +276,8 @@
Object[] parameters,int lineNumber) throws CoreException, ValidationException {
IFile targetFile = project.getFile(target);
validator.validate(targetFile);
- assertTrue(validator.isMessageCreated(markerTemplate, parameters));
- assertTrue(validator.isMessageCreatedOnLine(markerTemplate, parameters,lineNumber));
+ assertTrue("Error marker not found", validator.isMessageCreated(markerTemplate, parameters));
+ assertTrue("Error marker has wrong line number", validator.isMessageCreatedOnLine(markerTemplate, parameters,lineNumber));
}
private void assertMarkerIsNotCreatedForFile(String target, String newContent, String markerTemplate,
@@ -304,7 +304,7 @@
throws ValidationException, CoreException {
IFile targetFile = project.getFile(target);
validator.validate(targetFile);
- assertTrue(!validator.isMessageCreated(markerTemplate, parameters));
+ assertFalse("Error marker was found", validator.isMessageCreated(markerTemplate, parameters));
}
public void testStatefulComponentWithoutDestroyMethodValidator() throws CoreException, ValidationException {
@@ -540,50 +540,43 @@
21);
}
- public void testMultipleDataBinderValidator() throws CoreException {
- IFile selectionTestFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/SelectionTest.java");
- IFile selectionIndexTestFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/SelectionIndexTest.java");
+ public void testMultipleDataBinderValidator() throws CoreException, ValidationException {
- int number = getMarkersNumber(selectionTestFile);
- assertEquals("Problem marker was found in SelectionIndexTest.java", 0, number);
+ assertMarkerIsNotCreatedForFile(
+ "src/action/org/domain/SeamWebWarTestProject/session/SelectionTest.java",
+ SeamValidationMessages.MULTIPLE_DATA_BINDER,
+ new Object[] {});
- number = getMarkersNumber(selectionIndexTestFile);
- assertEquals("Problem marker was found in SelectionIndexTest.java", 0, number);
-
- // Multiple data binder
+ assertMarkerIsNotCreatedForFile(
+ "src/action/org/domain/SeamWebWarTestProject/session/SelectionIndexTest.java",
+ SeamValidationMessages.MULTIPLE_DATA_BINDER,
+ new Object[] {});
- copyContentsFile(selectionTestFile, "src/action/org/domain/SeamWebWarTestProject/session/SelectionTest.2");
-
- copyContentsFile(selectionIndexTestFile, "src/action/org/domain/SeamWebWarTestProject/session/SelectionIndexTest.2");
+ assertMarkerIsCreatedForLine(
+ "src/action/org/domain/SeamWebWarTestProject/session/SelectionTest.java",
+ "src/action/org/domain/SeamWebWarTestProject/session/SelectionTest.2",
+ SeamValidationMessages.MULTIPLE_DATA_BINDER,
+ new Object[] {},
+ 21);
+ assertMarkerIsCreatedForLine(
+ "src/action/org/domain/SeamWebWarTestProject/session/SelectionTest.java",
+ SeamValidationMessages.MULTIPLE_DATA_BINDER,
+ new Object[] {},
+ 24);
- number = getMarkersNumber(selectionTestFile);
- assertFalse("Problem marker 'Multiple data binder' was not found", number == 0);
+ assertMarkerIsCreatedForLine(
+ "src/action/org/domain/SeamWebWarTestProject/session/SelectionIndexTest.java",
+ "src/action/org/domain/SeamWebWarTestProject/session/SelectionIndexTest.2",
+ SeamValidationMessages.MULTIPLE_DATA_BINDER,
+ new Object[] {},
+ 21);
- String[] messages = getMarkersMessage(selectionTestFile, SEAM_MARKER_FILTER);
- assertTrue("Problem marker 'Multiple data binder", messages[0].startsWith("@DataModelSelection and @DataModelSelectionIndex without name of the DataModel requires the only one @DataModel in the component"));
-
- Integer[] lineNumbers = getMarkersNumbersOfLine(selectionTestFile, SEAM_MARKER_FILTER);
-
- assertTrue("Wrong number of problem markers", lineNumbers.length == messages.length && messages.length == 2);
-
- assertTrue("Problem marker has wrong line number", lineNumbers[0] == 21 || lineNumbers[0] == 24);
- assertTrue("Problem marker has wrong line number", lineNumbers[0] == 21 || lineNumbers[0] == 24);
-
- number = getMarkersNumber(selectionIndexTestFile);
- assertFalse("Problem marker 'Multiple data binder' was not found", number == 0);
-
- messages = getMarkersMessage(selectionIndexTestFile, SEAM_MARKER_FILTER);
- assertTrue("Problem marker 'Multiple data binder", messages[0].startsWith("@DataModelSelection and @DataModelSelectionIndex without name of the DataModel requires the only one @DataModel in the component"));
-
- lineNumbers = getMarkersNumbersOfLine(selectionIndexTestFile, SEAM_MARKER_FILTER);
-
- assertTrue("Wrong number of problem markers", lineNumbers.length == messages.length && messages.length == 2);
-
- assertTrue("Problem marker has wrong line number", lineNumbers[0] == 21 || lineNumbers[0] == 24);
- assertTrue("Problem marker has wrong line number", lineNumbers[0] == 21 || lineNumbers[0] == 24);
-
-
+ assertMarkerIsCreatedForLine(
+ "src/action/org/domain/SeamWebWarTestProject/session/SelectionIndexTest.java",
+ SeamValidationMessages.MULTIPLE_DATA_BINDER,
+ new Object[] {},
+ 24);
}
public void testUnknownDataModelNameValidator() throws CoreException, ValidationException {
@@ -606,35 +599,26 @@
27);
}
- public void testDuplicateVariableName_Validator() throws CoreException {
+ public void testDuplicateVariableName_Validator() throws CoreException, ValidationException {
modifyPreferences();
-
- IFile contextVariableTestFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/ContextVariableTest.java");
- refreshProject(project);
+ assertMarkerIsNotCreatedForFile(
+ "src/action/org/domain/SeamWebWarTestProject/session/ContextVariableTest.java",
+ SeamValidationMessages.DUPLICATE_VARIABLE_NAME,
+ new Object[] {"messageList"});
- int number = getMarkersNumber(contextVariableTestFile);
- assertEquals("Problem marker was found in contextVariableTestFile.java", 0, number);
-
- // Duplicate variable name
-
- copyContentsFile(contextVariableTestFile, "src/action/org/domain/SeamWebWarTestProject/session/ContextVariableTest.2");
-
- refreshProject(project);
-
- String[] messages = getMarkersMessage(contextVariableTestFile, SEAM_MARKER_FILTER);
-
- assertEquals("Not all problem markers 'Duplicate variable name' was found", 2, messages.length);
-
- for(int i=0;i<2;i++)
- assertEquals("Problem marker 'Duplicate factory name' not found", "Duplicate factory name: \"messageList\"", messages[i]);
-
- Integer[] lineNumbers = getMarkersNumbersOfLine(contextVariableTestFile, SEAM_MARKER_FILTER);
-
- for(int i=0;i<2;i++)
- assertTrue("Problem marker has wrong line number", (lineNumbers[i] == 36)||(lineNumbers[i] == 41));
-
-
+ assertMarkerIsCreatedForLine(
+ "src/action/org/domain/SeamWebWarTestProject/session/ContextVariableTest.java",
+ "src/action/org/domain/SeamWebWarTestProject/session/ContextVariableTest.2",
+ SeamValidationMessages.DUPLICATE_VARIABLE_NAME,
+ new Object[] {"messageList"},
+ 36);
+
+ assertMarkerIsCreatedForLine(
+ "src/action/org/domain/SeamWebWarTestProject/session/ContextVariableTest.java",
+ SeamValidationMessages.DUPLICATE_VARIABLE_NAME,
+ new Object[] {"messageList"},
+ 41);
}
public void testUnknownVariableNameValidator() throws CoreException, ValidationException {
@@ -713,7 +697,7 @@
}
public void testPropertyHasOnlyGetterValidator() throws CoreException, ValidationException {
- project.build(IncrementalProjectBuilder.CLEAN_BUILD, null);
+ project.build(IncrementalProjectBuilder.FULL_BUILD, null);
try {
enableUnpairGetterOrSetterValidation(true);
@@ -766,49 +750,55 @@
}
// See https://jira.jboss.org/jira/browse/JBIDE-4393
- public void testDuplicateComponents() throws CoreException {
- refreshProject(project);
- IFile duplicateJavaComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/DuplicateComponent.java");
- IFile componentsXmlFile = project.getFile("WebContent/WEB-INF/components.xml");
-
- copyContentsFile(componentsXmlFile, "WebContent/WEB-INF/duplicateComponents.test");
+ public void testDuplicateComponents() throws CoreException, ValidationException {
- Integer[] lineNumbers = getMarkersNumbersOfLine(duplicateJavaComponentFile, SEAM_MARKER_FILTER);
- assertEquals("There should be the only one error marker in DuplicateComponent.java.", 1, lineNumbers.length);
- assertEquals("Problem marker has wrong line number", 5, lineNumbers[0].intValue());
+ assertMarkerIsCreatedForLine(
+ "WebContent/WEB-INF/components.xml",
+ "WebContent/WEB-INF/duplicateComponents.test",
+ SeamValidationMessages.NONUNIQUE_COMPONENT_NAME_MESSAGE,
+ new Object[] {"duplicateJavaAndXmlComponentName"},
+ 5);
- lineNumbers = getMarkersNumbersOfLine(componentsXmlFile, SEAM_MARKER_FILTER);
- assertEquals("There should be two error marker in components.xml.", 2, lineNumbers.length);
- assertTrue("Problem marker was not found on 8 line", findLine(lineNumbers, 8));
- assertTrue("Problem marker was not found on 9 line", findLine(lineNumbers, 9));
+ assertMarkerIsCreatedForLine(
+ "WebContent/WEB-INF/components.xml",
+ SeamValidationMessages.NONUNIQUE_COMPONENT_NAME_MESSAGE,
+ new Object[] {"duplicateJavaAndXmlComponentName"},
+ 8);
+
+ assertMarkerIsCreatedForLine(
+ "src/action/org/domain/SeamWebWarTestProject/session/DuplicateComponent.java",
+ SeamValidationMessages.NONUNIQUE_COMPONENT_NAME_MESSAGE,
+ new Object[] {"duplicateJavaAndXmlComponentName"},
+ 5);
+
}
// See https://jira.jboss.org/jira/browse/JBIDE-4515
- public void testRevalidationUnresolvedELs() throws CoreException{
- refreshProject(project);
+ public void testRevalidationUnresolvedELs() throws CoreException, ValidationException {
JSFModelPlugin.getDefault().getPreferenceStore().setValue(JSFSeverityPreferences.RE_VALIDATE_UNRESOLVED_EL, SeamPreferences.ENABLE);
JSFModelPlugin.getDefault().getPreferenceStore().setValue(JSFSeverityPreferences.UNKNOWN_EL_VARIABLE_NAME, SeamPreferences.ERROR);
-
- IFile componentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/entity/TestElRevalidation.java");
- IFile xhtmlFile = project.getFile("WebContent/testElRevalidation.xhtml");
-
- copyContentsFile(componentFile, "src/action/org/domain/SeamWebWarTestProject/entity/TestElRevalidation.new");
-
- refreshProject(project);
-
- IMarker[] markers = findMarkers(xhtmlFile, IMarker.PROBLEM, "\"testElRevalidation\" cannot be resolved");
- assertEquals("There should be an unresolved EL in testElRevalidation.xhtml.", 1, markers.length);
+ copyContentsFile("src/action/org/domain/SeamWebWarTestProject/entity/TestElRevalidation.java", "src/action/org/domain/SeamWebWarTestProject/entity/TestElRevalidation.new");
+
+ assertMarkerIsCreatedForLine(
+ new ELValidatorWrapper(project),
+ "WebContent/testElRevalidation.xhtml",
+ JSFValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME,
+ new Object[] {"testElRevalidation"},
+ 6);
JSFModelPlugin.getDefault().getPreferenceStore().setValue(JSFSeverityPreferences.RE_VALIDATE_UNRESOLVED_EL, SeamPreferences.DISABLE);
+
// Check if the validator was not invoked.
- copyContentsFile(componentFile, "src/action/org/domain/SeamWebWarTestProject/entity/TestElRevalidation.original");
+ copyContentsFile("src/action/org/domain/SeamWebWarTestProject/entity/TestElRevalidation.java", "src/action/org/domain/SeamWebWarTestProject/entity/TestElRevalidation.original");
+
+ assertMarkerIsCreatedForLine(
+ new ELValidatorWrapper(project),
+ "WebContent/testElRevalidation.xhtml",
+ JSFValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME,
+ new Object[] {"testElRevalidation"},
+ 6);
- refreshProject(project);
-
- markers = findMarkers(xhtmlFile, IMarker.PROBLEM, "\"testElRevalidation\" cannot be resolved");
- assertEquals("There should be an unresolved EL in testElRevalidation.xhtml.", 1, markers.length);
-
JSFModelPlugin.getDefault().getPreferenceStore().setValue(JSFSeverityPreferences.RE_VALIDATE_UNRESOLVED_EL, SeamPreferences.ENABLE);
JSFModelPlugin.getDefault().getPreferenceStore().setValue(JSFSeverityPreferences.UNKNOWN_EL_VARIABLE_NAME, SeamPreferences.IGNORE);
}
15 years, 8 months
JBoss Tools SVN: r24149 - trunk/usage/tests/org.jboss.tools.usage.test/META-INF.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-08-13 09:20:43 -0400 (Fri, 13 Aug 2010)
New Revision: 24149
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/META-INF/MANIFEST.MF
Log:
[JBIDE-6376] url strategey changed + test added
Modified: trunk/usage/tests/org.jboss.tools.usage.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/META-INF/MANIFEST.MF 2010-08-13 13:17:13 UTC (rev 24148)
+++ trunk/usage/tests/org.jboss.tools.usage.test/META-INF/MANIFEST.MF 2010-08-13 13:20:43 UTC (rev 24149)
@@ -5,7 +5,7 @@
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.jboss.tools.usage;bundle-version="1.0.0",
- org.junit4;bundle-version="[4.5.0,5.0.0)",
org.eclipse.osgi;bundle-version="3.5.2",
- org.eclipse.core.runtime;bundle-version="3.5.0"
+ org.eclipse.core.runtime;bundle-version="3.5.0",
+ org.junit4;bundle-version="4.0.0"
Bundle-Activator: GoogleAnalyticsTestActivator
15 years, 8 months
JBoss Tools SVN: r24148 - trunk/usage/tests/org.jboss.tools.usage.test.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-08-13 09:17:13 -0400 (Fri, 13 Aug 2010)
New Revision: 24148
Added:
trunk/usage/tests/org.jboss.tools.usage.test/GoogleAnalyticsUrlStrategyTest.launch
Log:
[JBIDE-6376] url strategey changed + test added
Added: trunk/usage/tests/org.jboss.tools.usage.test/GoogleAnalyticsUrlStrategyTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/GoogleAnalyticsUrlStrategyTest.launch (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/GoogleAnalyticsUrlStrategyTest.launch 2010-08-13 13:17:13 UTC (rev 24148)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/GoogleAnalyticsUrlStrategyTest"/>
+<booleanAttribute key="default" value="false"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.usage.test.GoogleAnalyticsUrlStrategyTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.usage.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.osgi.services@default:default,org.eclipse.jface.text@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.transforms.hook@default:false,javax.transaction@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.osgi,org.eclipse.equinox.concurrent@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.core.resources.compatibility@default:false,org.ecl!
ipse.equinox.common@default:default,org.eclipse.core.commands@default:default,org.eclipse.ecf.identity@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.expressions@default:default,org.eclipse.jface@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ui@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.swt@default:default,org.hamcrest.core@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.junit4@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.help@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.databinding.observable@default:default,javax.servlet@default:default,org.eclipse.core.ru!
ntime@default:true,org.eclipse.equinox.p2.metadata.repository@!
default:
default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.ui.forms@default:default,org.eclipse.text@default:default,org.eclipse.ui.views@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.app@default:default,com.ibm.icu@default:default,org.eclipse.ecf@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.resources@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.usage.test@default:default"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<booleanAttribute key="useProduct" value="false"/>
+</launchConfiguration>
Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/GoogleAnalyticsUrlStrategyTest.launch
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 8 months
JBoss Tools SVN: r24147 - trunk/usage/tests/org.jboss.tools.usage.test.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-08-13 09:17:01 -0400 (Fri, 13 Aug 2010)
New Revision: 24147
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageRequestsTest.launch
Log:
[JBIDE-6376] url strategey changed + test added
Modified: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageRequestsTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageRequestsTest.launch 2010-08-13 13:16:49 UTC (rev 24146)
+++ trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageRequestsTest.launch 2010-08-13 13:17:01 UTC (rev 24147)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
<booleanAttribute key="append.args" value="true"/>
<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticAdd" value="false"/>
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
<booleanAttribute key="clearConfig" value="true"/>
<booleanAttribute key="clearws" value="true"/>
<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBossToolsUsageRequestsTest"/>
<booleanAttribute key="default" value="false"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
@@ -21,25 +21,26 @@
<listEntry value="1"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.usage.test.JBossToolsUsageRequestsTest"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.usage.test"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.core.resources.compatibility@default:false,com.springsource.javax.servlet@default:default,org.eclipse.core.net.linux.x86@default:false,org.hamcrest.core@default:default,org.apache.ant@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.jface.databinding@default:default,org.eclipse.help.base@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.equinox.http.servlet@default:default,com.jboss.jbds.product@default:default,com.ibm.icu@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ui.ide@default:default,org.eclipse.core.expressions@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.variables@default:default,com.springsou!
rce.org.apache.commons.logging@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.help.ui@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui.ide.application@default:default,org.mortbay.jetty.util@default:default,org.eclipse.swt.gtk.linux.x86@default:false,org.eclipse.ui.navigator@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.jface.text@default:default,org.apache.jasper@default:default,org.apache.commons.el@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.common@2:true,javax.transaction@default:false,org.eclipse.ant.core@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.p2.repository@default:default,com.springsource.javax.el@default:default,org.eclipse.text@default:default,org.eclipse.equinox.p2.jarprocessor@default:!
default,org.jboss.tools.xulrunner.initializer@default:false,or!
g.eclips
e.ui.intro@default:default,org.eclipse.compare.core@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.transforms.hook@default:false,org.mortbay.jetty.server@default:default,org.eclipse.swt@default:default,org.eclipse.ecf.identity@default:default,org.apache.lucene.analysis@default:default,org.eclipse.ui.forms@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.jobs@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.jface@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.http.jetty@default:default,javax.servlet@default:default,org.eclipse.core.filesystem.linux.x86@default:false,org.eclipse.ecf@default:default,org.eclipse.equi!
nox.security@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.preferences@default:default,com.springsource.javax.servlet.jsp@default:default,org.apache.lucene@default:default,org.eclipse.help@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.osgi.services@default:default,org.junit4@default:default,org.eclipse.core.commands@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.analytics@default:default,org.jboss.tools.usage.test@default:default"/>
+<booleanAttribute key="run_in_ui_thread" value="false"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.ui@default:default,org.eclipse.ecf@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.expressions@default:default,javax.servlet@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.osgi.services@default:default,javax.transaction@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.ui.ide@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.!
ui.forms@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.security@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.net@default:default,com.ibm.icu@default:default,org.eclipse.jface.text@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.jface.databinding@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.text@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.transforms.hook@default:false,org.junit4@default:default,org.hamcrest.core@default:default,org.jboss.tools.xulrunner.initializer@default:false!
,org.eclipse.equinox.app@default:default,org.eclipse.swt@defau!
lt:defau
lt,org.eclipse.core.variables@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.commands@default:default,org.eclipse.help@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.preferences@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
<booleanAttribute key="useProduct" value="false"/>
</launchConfiguration>
15 years, 8 months