[jbosstools-commits] JBoss Tools SVN: r27028 - in trunk/usage: plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting and 2 other directories.

Author: adietish Date: 2010-11-30 11:14:44 -0500 (Tue, 30 Nov 2010) New Revision: 27028 Added: trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch trunk/usage/tests/org.jboss.tools.usage.test/UsageIntegrationTest.launch trunk/usage/tests/org.jboss.tools.usage.test/UsageReportIntegrationTest.launch trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageReportIntegrationTest.java Removed: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsEclipseEnvironmentTest.launch trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageIntegrationTest.launch trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsEclipseEnvironmentTest.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPointTest.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferences.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReport.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportEnablementDialog.java trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch Log: [JBIDE-7757] added integration tests for UsageReport Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferences.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferences.java 2010-11-30 16:02:52 UTC (rev 27027) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferences.java 2010-11-30 16:14:44 UTC (rev 27028) @@ -18,35 +18,64 @@ import org.jboss.tools.usage.tracker.internal.UsagePluginLogger; import org.osgi.service.prefs.BackingStoreException; +// TODO: Auto-generated Javadoc /** + * The Class UsageReportPreferences. + * * @author Andre Dietisheim */ public class UsageReportPreferences { + /** + * Enables (<code>true</code>) or disables (<code>false</code>) usage + * reporting preferences. + * + * @param enabled + * the new enabled + */ public static void setEnabled(boolean enabled) { UsageReportPreferencesUtils.getStore().putValue( IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID, String.valueOf(enabled)); save(); } + /** + * Returns <code>true</code> if usage reporting is enabled + * + * @return true, if is enabled + */ public static boolean isEnabled() { return UsageReportPreferencesUtils.getPreferences().getBoolean( IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID, IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_DEFAULTVALUE); } + /** + * Checks if is ask user. + * + * @return true, if is ask user + */ public static boolean isAskUser() { return UsageReportPreferencesUtils.getPreferences().getBoolean( IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID, IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_DEFAULTVALUE); } + /** + * Sets the ask user. + * + * @param askUser + * the new ask user + */ public static void setAskUser(boolean askUser) { UsageReportPreferencesUtils.getStore().putValue(IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID, String.valueOf(askUser)); save(); } + /** + * Save. + */ private static void save() { try { UsageReportPreferencesUtils.getStore().save(); @@ -57,10 +86,21 @@ } + /** + * Flush. + * + * @throws BackingStoreException + * the backing store exception + */ public static void flush() throws BackingStoreException { UsageReportPreferencesUtils.getPreferences().flush(); } + /** + * Creates the preference store. + * + * @return the i preference store + */ public static IPreferenceStore createPreferenceStore() { return UsageReportPreferencesUtils.getStore(); } Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReport.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReport.java 2010-11-30 16:02:52 UTC (rev 27027) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReport.java 2010-11-30 16:14:44 UTC (rev 27028) @@ -13,12 +13,10 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.IJobChangeEvent; -import org.eclipse.core.runtime.jobs.IJobChangeListener; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.window.Window; +import org.eclipse.swt.widgets.Display; import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.progress.UIJob; import org.jboss.tools.usage.googleanalytics.GoogleAnalyticsUrlStrategy; import org.jboss.tools.usage.googleanalytics.IJBossToolsEclipseEnvironment; import org.jboss.tools.usage.http.HttpGetRequest; @@ -32,7 +30,6 @@ import org.jboss.tools.usage.tracker.internal.SuffixFocusPoint; import org.jboss.tools.usage.tracker.internal.Tracker; import org.jboss.tools.usage.tracker.internal.UsagePluginLogger; -import org.osgi.framework.InvalidSyntaxException; import org.osgi.service.prefs.BackingStoreException; /** @@ -47,32 +44,103 @@ private IJBossToolsEclipseEnvironment eclipseEnvironment; UsagePluginLogger logger = new UsagePluginLogger(JBossToolsUsageActivator.getDefault()); - - public UsageReport() throws InvalidSyntaxException { - eclipseEnvironment = JBossToolsUsageActivator.getDefault().getJBossToolsEclipseEnvironment(); - focusPoint = new SuffixFocusPoint("tools", eclipseEnvironment.getJBossToolsVersion()) //$NON-NLS-1$ - .setChild(new FocusPoint("usage") //$NON-NLS-1$ - .setChild(new FocusPoint("action") //$NON-NLS-1$ - .setChild(new FocusPoint("wsstartup")))); //$NON-NLS-1$ - globalSettings = new GlobalUsageSettings(JBossToolsUsageActivator - .getDefault()); + + public UsageReport() { + this(JBossToolsUsageActivator.getDefault().getJBossToolsEclipseEnvironment()); + } + /** + * Instantiates a new usage report. + * + * @param eclipseEnvironment + * the eclipse environment + */ + protected UsageReport(IJBossToolsEclipseEnvironment eclipseEnvironment) { + this( + new SuffixFocusPoint("tools", eclipseEnvironment.getJBossToolsVersion()) //$NON-NLS-1$ + .setChild(new FocusPoint("usage") //$NON-NLS-1$ + .setChild(new FocusPoint("action") //$NON-NLS-1$ + .setChild(new FocusPoint("wsstartup")))), //$NON-NLS-1$ + eclipseEnvironment, + new GlobalUsageSettings(JBossToolsUsageActivator.getDefault())); + } + + /** + * Instantiates a new usage report. + * + * @param focusPoint + * the focus point + * @param eclipseEnvironment + * the eclipse environment + * @param globalSettings + * the global settings + */ + protected UsageReport(IFocusPoint focusPoint, IJBossToolsEclipseEnvironment eclipseEnvironment, + GlobalUsageSettings globalSettings) { + this.eclipseEnvironment = eclipseEnvironment; + this.focusPoint = focusPoint; + this.globalSettings = globalSettings; + } + + /** + * Reports the usage of this eclipse/jboss tools instance. + */ public void report() { new ReportingJob().schedule(); } + protected boolean isReportingGloballyEnabled() { + return globalSettings.isReportingEnabled(); + } + + /** + * Asks the user is he allows us to report usage. Opens a dialog for this + * sake. + */ private void askUser() { - UsageReportEnablementDialog dialog = new UsageReportEnablementDialog( - true, - PlatformUI.getWorkbench().getActiveWorkbenchWindow()); - if (dialog.open() == Window.OK) { - UsageReportPreferences.setEnabled(dialog.isReportEnabled()); + Boolean isEnabled = askUserForEnablement(); + if (isEnabled != null) { + UsageReportPreferences.setEnabled(isEnabled); UsageReportPreferences.setAskUser(false); flushPreferences(); } } + /** + * Checks reporting shall ask the user (which is the case if this was never + * done before. Asking user shall only be done once per eclipse + * installation) + * + * @return true, if is ask user + */ + protected boolean isAskUser() { + return UsageReportPreferences.isAskUser(); + } + + /** + * Asks the user if he allows us to report. + * + * @return the boolean + */ + protected Boolean askUserForEnablement() { + final Boolean[] userResponse = new Boolean[1]; + Display.getDefault().syncExec(new Runnable() { + + public void run() { + UsageReportEnablementDialog dialog = + new UsageReportEnablementDialog(true, PlatformUI.getWorkbench().getActiveWorkbenchWindow(), + JBossToolsUsageActivator.getDefault().getUsageBranding()); + if (dialog.open() == Window.OK) { + userResponse[0] = dialog.isReportEnabled(); + } else { + userResponse[0] = null; + } + } + }); + return userResponse[0]; + } + private void flushPreferences() { try { UsageReportPreferences.flush(); @@ -85,7 +153,7 @@ * Reports the usage of the current JBoss Tools / JBoss Developer Studio * installation. */ - private void doReport() { + protected void doReport() { if (UsageReportPreferences.isEnabled()) { IURLBuildingStrategy urlBuildingStrategy = new GoogleAnalyticsUrlStrategy(eclipseEnvironment); ITracker tracker = new Tracker( @@ -97,6 +165,7 @@ } private class ReportingJob extends Job { + private ReportingJob() { super(ReportingMessages.UsageReport_Reporting_Usage); } @@ -107,71 +176,22 @@ return Status.CANCEL_STATUS; } monitor.beginTask(ReportingMessages.UsageReport_Querying_Enablement, 2); - if (globalSettings.isReportingEnabled()) { + if (isReportingGloballyEnabled()) { if (monitor.isCanceled()) { return Status.CANCEL_STATUS; } monitor.worked(1); - if (UsageReportPreferences.isAskUser()) { + if (isAskUser()) { if (monitor.isCanceled()) { return Status.CANCEL_STATUS; } - askUserAndReport(); - } else { - if (monitor.isCanceled()) { - return Status.CANCEL_STATUS; - } - doReport(); + askUser(); } + doReport(); monitor.worked(2); monitor.done(); } return Status.OK_STATUS; } - - private void askUserAndReport() { - Job askUserJob = new AskUserJob(); - askUserJob.addJobChangeListener(new IJobChangeListener() { - - public void sleeping(IJobChangeEvent event) { - // ignore - } - - public void scheduled(IJobChangeEvent event) { - // ignore - } - - public void running(IJobChangeEvent event) { - // ignore - } - - public void done(IJobChangeEvent event) { - doReport(); - } - - public void awake(IJobChangeEvent event) { - // ignore - } - - public void aboutToRun(IJobChangeEvent event) { - // ignore - } - }); - askUserJob.setUser(true); - askUserJob.setPriority(Job.SHORT); - askUserJob.schedule(); - } } - - private class AskUserJob extends UIJob { - private AskUserJob() { - super(ReportingMessages.UsageReport_Asking_User); - } - - @Override - public IStatus runInUIThread(IProgressMonitor monitor) { - askUser(); - return Status.OK_STATUS; - } - } } Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportEnablementDialog.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportEnablementDialog.java 2010-11-30 16:02:52 UTC (rev 27027) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportEnablementDialog.java 2010-11-30 16:14:44 UTC (rev 27028) @@ -35,10 +35,10 @@ private boolean reportEnabled; private IUsageBranding branding; - public UsageReportEnablementDialog(boolean reportEnabled, IShellProvider parentShell) { + public UsageReportEnablementDialog(boolean reportEnabled, IShellProvider parentShell, IUsageBranding branding) { super(parentShell); this.reportEnabled = reportEnabled; - this.branding = JBossToolsUsageActivator.getDefault().getUsageBranding(); + this.branding = branding; } protected void buttonPressed(int buttonId) { Added: trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch (rev 0) +++ trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch 2010-11-30 16:14:44 UTC (rev 27028) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<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/pde-junit"/> +<booleanAttribute key="default" value="true"/> +<booleanAttribute key="includeOptional" value="true"/> +<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentTest.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.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.MAIN_TYPE" value="org.jboss.tools.usage.test.EclipseEnvironmentTest"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.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="org.eclipse.sdk.ide"/> +<booleanAttribute key="run_in_ui_thread" value="true"/> +<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="false"/> +<booleanAttribute key="useProduct" value="false"/> +</launchConfiguration> Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch 2010-11-30 16:02:52 UTC (rev 27027) +++ trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch 2010-11-30 16:14:44 UTC (rev 27028) @@ -7,13 +7,13 @@ <stringAttribute key="bootstrap" value=""/> <stringAttribute key="checked" value="[NONE]"/> <booleanAttribute key="clearConfig" value="true"/> -<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearws" value="false"/> <booleanAttribute key="clearwslog" value="false"/> <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Tools Usage Reporter"/> <booleanAttribute key="default" value="false"/> -<stringAttribute key="deselected_workspace_plugins" value="org.mozilla.xulrunner.cocoa.macosx,org.mozilla.xulrunner.gtk.linux.x86_64,org.mozilla.xulrunner.win32.win32.x86,com.jboss.jbds.usage.branding,org.jboss.tools.usage.test,org.mozilla.xulrunner.gtk.linux.x86,org.mozilla.xulrunner.carbon.macosx,org.mozilla.xpcom,org.jboss.tools.tests"/> +<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.tests,org.jboss.tools.usage.test,com.jboss.jbds.usage.branding"/> <booleanAttribute key="includeOptional" value="true"/> -<stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration(1)"/> +<stringAttribute key="location" value="${workspace_loc}/../runtime-usage"/> <listAttribute key="org.eclipse.debug.ui.favoriteGroups"> <listEntry value="org.eclipse.debug.ui.launchGroup.run"/> <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> @@ -23,8 +23,8 @@ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/> <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.sdk.ide"/> -<stringAttribute key="selected_target_plugins" value="org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ui@default:default,org.apache.lucene.analysis@default:default,org.eclipse.search@default:default,org.eclipse.ant.core@default:default,org.apache.xml.resolver@default:default,org.eclipse.jface.text@default:default,org.eclipse.help.ui@default:default,org.apache.ant@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.core.expressions@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.xml.core@default:default,com.ibm.icu@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.ec! lipse.jdt.compiler.tool@default:false,org.eclipse.equinox.security@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.wst.validation@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.emf.ecore.change@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.compare@default:default,org.eclipse.wst.common.uriresolver@default:default,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.wst.sse.core@default:default,org.eclipse.equinox.common@2:true,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.team.core@default:defa! ult,org.eclipse.osgi@-1:true,org.eclipse.wst.common.emf@defaul! t:defaul t,org.eclipse.core.databinding.property@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.mortbay.jetty.server@default:default,org.eclipse.update.configurator@3:true,org.apache.jasper@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.core.resources@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.team.ui@default:default,org.eclipse.ui.editors@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.rse.core@default:default,org.eclipse.jem.util@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.help.base@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.ecf@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.equinox.app@default:default,org.mortbay.jetty.util@default:default,org.apache.xerces@default:default,or! g.eclipse.ui.console@default:default,org.eclipse.ui.ide@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.equinox.p2.repository@default:default,javax.servlet@default:default,org.hamcrest.core@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.junit4@default:default,org.apache.lucene@default:default,org.eclipse.ui.views@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.emf.ecore@default:default,org.eclipse.emf.ecore.xmi@default:default,org.projectusus.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.osgi.util@default:default,org.eclipse.! help@default:default,org.eclipse.jface@default:default,org.ecl! ipse.ecf .ssl@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.osgi.services@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.jdt.compiler.apt@default:false,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.core.databinding@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.text@default:default,org.eclipse.equinox.util@default:default,org.eclipse.compare.core@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.jdt.core@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.debug.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.core.variables@default:default,org.eclipse.jdt.launching@default:def! ault,org.eclipse.rse.services@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.filesystem@default:default,javax.xml@default:default,org.eclipse.debug.ui@default:default,javax.servlet.jsp@default:default,org.eclipse.swt@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.net@default:default,org.apache.commons.el@default:default,org.eclipse.equinox.http.jetty@default:default,org.apache.xml.serializer@default:default,org.eclipse.sdk@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false"/> -<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.deltacloud.test@default:default,org.jruby.jruby@default:default,org.jboss.tools.usage@default:default,org.eclipse.epp.usagedata.ui@default:default,org.jboss.tools.deltacloud.core@default:default,org.eclipse.epp.usagedata.recording@default:default,org.jboss.tools.common@default:default,org.eclipse.epp.usagedata.gathering@default:default,org.jboss.tools.deltacloud.docs@default:default,org.jboss.tools.deltacloud.ui@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.core.databinding.beans@default:default,org.eclipse.ecf@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.resources@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.wst.xml.core@default:default,javax.xml@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.core.net.linux.x86_64@default:false,org.junit4@default:default,org.eclipse.swt@default:default,org.eclipse.help.ui@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui.workbench@default:default,org.apache.xerces@defaul! t:default,org.eclipse.compare.core@default:default,org.eclipse.help.base@default:default,org.eclipse.osgi.util@default:default,org.eclipse.debug.core@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.equinox.common@2:true,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.apache.xml.resolver@default:default,org.eclipse.core.net@default:default,javax.servlet@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.compare@default:default,org.projectusus.core@default:default,org.eclipse.ui.intro@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.jface@default:default,org.eclipse.update.configurator@3:true,org.eclipse.emf.ecore.xmi@default:default,org.apache.ant@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.forms@! default:default,org.eclipse.equinox.p2.metadata.repository@def! ault:def ault,org.eclipse.ui.views@default:default,org.eclipse.emf.common@default:default,com.ibm.icu@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.databinding@default:default,org.eclipse.emf.edit@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.rse.core@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.http.servlet@default:default,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.core.contenttype@default:default,org.apache.xml.serializer@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.equinox.app@default:default,org.apache.lucene@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.security@default:default,org.apache.jasper@default:default,org.eclipse.ui.views.properties.! tabbed@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ant.core@default:default,org.eclipse.help@default:default,org.eclipse.sdk@default:default,org.eclipse.team.core@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.wst.validation@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.jem.util@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.team.ui@default:default,org.eclipse.search@default:default,org.apache.commons.el@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.apache.lucene.analysis@default:default,org.eclipse.jdt.core@d! efault:default,org.eclipse.debug.ui@default:default,org.eclips! e.wst.co mmon.environment@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.core.commands@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.util@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.rse.services@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.ui@default:default,org.eclipse.osgi@-1:true,org.eclipse.ui.ide.application@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.ui.console@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.debug@default:default,org.eclipse.core.jobs@default:default,javax.servlet.jsp@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ws! t.common.emfworkbench.integration@default:default,org.eclipse.text@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.runtime@default:true,org.hamcrest.core@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.jdt.core.manipulation@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.runtime.compatibility@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.deltacloud.ui@default:default,org.eclipse.epp.usagedata.gathering@default:default,org.jboss.tools.deltacloud.docs@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.test@default:default,org.eclipse.epp.usagedata.recording@default:default,org.eclipse.epp.usagedata.ui@default:default,org.jboss.tools.usage@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/> <booleanAttribute key="tracing" value="true"/> Deleted: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsEclipseEnvironmentTest.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsEclipseEnvironmentTest.launch 2010-11-30 16:02:52 UTC (rev 27027) +++ trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsEclipseEnvironmentTest.launch 2010-11-30 16:14:44 UTC (rev 27028) @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<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/pde-junit"/> -<booleanAttribute key="default" value="true"/> -<booleanAttribute key="includeOptional" value="true"/> -<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsEclipseEnvironmentTest.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.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.MAIN_TYPE" value="org.jboss.tools.usage.test.JBossToolsEclipseEnvironmentTest"/> -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.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="org.eclipse.sdk.ide"/> -<booleanAttribute key="run_in_ui_thread" value="true"/> -<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="false"/> -<booleanAttribute key="useProduct" value="false"/> -</launchConfiguration> Deleted: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageIntegrationTest.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageIntegrationTest.launch 2010-11-30 16:02:52 UTC (rev 27027) +++ trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageIntegrationTest.launch 2010-11-30 16:14:44 UTC (rev 27028) @@ -1,146 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> -<setAttribute key="additional_plugins"/> -<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="false"/> -<booleanAttribute key="clearws" value="false"/> -<booleanAttribute key="clearwslog" value="false"/> -<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBossToolsUsageIntegrationTest"/> -<booleanAttribute key="default" value="true"/> -<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.gwt.ui,org.jboss.tools.gwt.core,org.jboss.tools.common"/> -<stringAttribute key="featureDefaultLocation" value="workspace"/> -<stringAttribute key="featurePluginResolution" value="workspace"/> -<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/JBossToolsUsageIntegrationTest.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.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.JBossToolsUsageIntegrationTest"/> -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consolelog"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.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"/> -<setAttribute key="selected_features"> -<setEntry value="com.atlassian.connector.commons:default"/> -<setEntry value="com.atlassian.connector.eclipse.commons:default"/> -<setEntry value="com.atlassian.connector.eclipse.crucible:default"/> -<setEntry value="com.atlassian.connector.eclipse.jira:default"/> -<setEntry value="com.atlassian.connector.eclipse.monitor:default"/> -<setEntry value="com.atlassian.connector.eclipse.subversive:default"/> -<setEntry value="com.atlassian.connector.eclipse:default"/> -<setEntry value="com.google.gdt.eclipse.suite.e36.feature:default"/> -<setEntry value="com.google.gwt.eclipse.sdkbundle.e36.feature.2.0.4:default"/> -<setEntry value="com.instantiations.css.feature:default"/> -<setEntry value="com.instantiations.designer.core.feature:default"/> -<setEntry value="com.instantiations.designer.core.xml.feature:default"/> -<setEntry value="com.instantiations.designer.gwt.feature:default"/> -<setEntry value="com.instantiations.designer.gwtcore.feature:default"/> -<setEntry value="com.instantiations.eclipse.shared:default"/> -<setEntry value="com.instantiations.eclipse.ui:default"/> -<setEntry value="net.sf.jautodoc.feature:default"/> -<setEntry value="org.eclipse.cvs.source:default"/> -<setEntry value="org.eclipse.emf.cdo.epp:default"/> -<setEntry value="org.eclipse.emf.cdo.server:default"/> -<setEntry value="org.eclipse.emf.cdo:default"/> -<setEntry value="org.eclipse.equinox.p2.user.ui.source:default"/> -<setEntry value="org.eclipse.help.source:default"/> -<setEntry value="org.eclipse.jdt.source:default"/> -<setEntry value="org.eclipse.jsf.feature.source:default"/> -<setEntry value="org.eclipse.jsf_sdk.feature:default"/> -<setEntry value="org.eclipse.jst.enterprise_core.feature.source:default"/> -<setEntry value="org.eclipse.jst.enterprise_sdk.feature:default"/> -<setEntry value="org.eclipse.jst.enterprise_ui.feature.source:default"/> -<setEntry value="org.eclipse.jst.web_core.feature:default"/> -<setEntry value="org.eclipse.jst.web_ui.feature:default"/> -<setEntry value="org.eclipse.jst.webpageeditor.feature.source:default"/> -<setEntry value="org.eclipse.jst.webpageeditor_sdk.feature:default"/> -<setEntry value="org.eclipse.jst.ws.jaxws.dom.feature.source:default"/> -<setEntry value="org.eclipse.jst.ws.jaxws.dom_sdk.feature:default"/> -<setEntry value="org.eclipse.jst.ws.jaxws.feature.source:default"/> -<setEntry value="org.eclipse.jst.ws.jaxws_sdk.feature:default"/> -<setEntry value="org.eclipse.mylyn.commons:default"/> -<setEntry value="org.eclipse.mylyn.jira_feature:default"/> -<setEntry value="org.eclipse.mylyn.pde_feature:default"/> -<setEntry value="org.eclipse.mylyn.wikitext.sdk:default"/> -<setEntry value="org.eclipse.net4j.db.derby:default"/> -<setEntry value="org.eclipse.net4j.db.h2:default"/> -<setEntry value="org.eclipse.net4j.db:default"/> -<setEntry value="org.eclipse.net4j:default"/> -<setEntry value="org.eclipse.pde.source:default"/> -<setEntry value="org.eclipse.platform.source:default"/> -<setEntry value="org.eclipse.rcp.source:default"/> -<setEntry value="org.eclipse.sdk:default"/> -<setEntry value="org.eclipse.swtbot.eclipse.gef:default"/> -<setEntry value="org.eclipse.swtbot.eclipse.test.junit3:default"/> -<setEntry value="org.eclipse.swtbot.eclipse.test.junit4:default"/> -<setEntry value="org.eclipse.swtbot.eclipse:default"/> -<setEntry value="org.eclipse.swtbot.ide:default"/> -<setEntry value="org.eclipse.swtbot:default"/> -<setEntry value="org.eclipse.team.svn.mylyn:default"/> -<setEntry value="org.eclipse.wst.common.fproj.sdk:default"/> -<setEntry value="org.eclipse.wst.common.fproj:default"/> -<setEntry value="org.eclipse.wst.common_core.feature.source:default"/> -<setEntry value="org.eclipse.wst.common_core.feature:default"/> -<setEntry value="org.eclipse.wst.common_sdk.feature:default"/> -<setEntry value="org.eclipse.wst.common_ui.feature.source:default"/> -<setEntry value="org.eclipse.wst.common_ui.feature:default"/> -<setEntry value="org.eclipse.wst.jsdt.feature.source:default"/> -<setEntry value="org.eclipse.wst.jsdt.feature:default"/> -<setEntry value="org.eclipse.wst.jsdt_sdk.feature:default"/> -<setEntry value="org.eclipse.wst.server_adapters.feature.source:default"/> -<setEntry value="org.eclipse.wst.server_adapters.sdk.feature:default"/> -<setEntry value="org.eclipse.wst.server_core.feature.source:default"/> -<setEntry value="org.eclipse.wst.server_core.feature:default"/> -<setEntry value="org.eclipse.wst.server_sdk.feature:default"/> -<setEntry value="org.eclipse.wst.server_ui.feature.source:default"/> -<setEntry value="org.eclipse.wst.server_ui.feature:default"/> -<setEntry value="org.eclipse.wst.web_core.feature.source:default"/> -<setEntry value="org.eclipse.wst.web_core.feature:default"/> -<setEntry value="org.eclipse.wst.web_sdk.feature:default"/> -<setEntry value="org.eclipse.wst.web_ui.feature.source:default"/> -<setEntry value="org.eclipse.wst.web_ui.feature:default"/> -<setEntry value="org.eclipse.wst.ws_core.feature:default"/> -<setEntry value="org.eclipse.wst.ws_ui.feature:default"/> -<setEntry value="org.eclipse.wst.ws_userdoc.feature:default"/> -<setEntry value="org.eclipse.wst.xml_core.feature.source:default"/> -<setEntry value="org.eclipse.wst.xml_core.feature:default"/> -<setEntry value="org.eclipse.wst.xml_sdk.feature:default"/> -<setEntry value="org.eclipse.wst.xml_ui.feature.source:default"/> -<setEntry value="org.eclipse.wst.xml_ui.feature:default"/> -<setEntry value="org.eclipse.wst.xsl.feature.source:default"/> -<setEntry value="org.eclipse.wst.xsl_sdk.feature:default"/> -<setEntry value="org.hibernate.eclipse.feature:default"/> -<setEntry value="org.jboss.ide.eclipse.as.feature:default"/> -<setEntry value="org.jboss.tools.gwt.feature:default"/> -<setEntry value="org.jboss.tools.seam.feature:default"/> -<setEntry value="org.jboss.tools.usage.feature:default"/> -</setAttribute> -<stringAttribute key="selected_target_plugins" value="org.eclipse.osgi.services@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.swt@default:default,org.eclipse.core.databinding.observable@default:default,org.junit4@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.databinding@default:default,com.ibm.icu@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.eclipse.help@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.expressions@default:default,javax.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.swt.cocoa.macosx.x86_64! @default:false,org.eclipse.jface.databinding@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.app@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="com.jboss.jbds.usage@default:default,org.jboss.tools.usage.fragment@default:false,com.jboss.jbds.usage.fragment@default:false,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"/> -</launchConfiguration> Added: trunk/usage/tests/org.jboss.tools.usage.test/UsageIntegrationTest.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/UsageIntegrationTest.launch (rev 0) +++ trunk/usage/tests/org.jboss.tools.usage.test/UsageIntegrationTest.launch 2010-11-30 16:14:44 UTC (rev 27028) @@ -0,0 +1,146 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> +<setAttribute key="additional_plugins"/> +<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="false"/> +<booleanAttribute key="clearws" value="false"/> +<booleanAttribute key="clearwslog" value="false"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBossToolsUsageIntegrationTest"/> +<booleanAttribute key="default" value="true"/> +<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.gwt.ui,org.jboss.tools.gwt.core,org.jboss.tools.common"/> +<stringAttribute key="featureDefaultLocation" value="workspace"/> +<stringAttribute key="featurePluginResolution" value="workspace"/> +<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/UsageIntegrationTest.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.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.UsageIntegrationTest"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consolelog"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.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"/> +<setAttribute key="selected_features"> +<setEntry value="com.atlassian.connector.commons:default"/> +<setEntry value="com.atlassian.connector.eclipse.commons:default"/> +<setEntry value="com.atlassian.connector.eclipse.crucible:default"/> +<setEntry value="com.atlassian.connector.eclipse.jira:default"/> +<setEntry value="com.atlassian.connector.eclipse.monitor:default"/> +<setEntry value="com.atlassian.connector.eclipse.subversive:default"/> +<setEntry value="com.atlassian.connector.eclipse:default"/> +<setEntry value="com.google.gdt.eclipse.suite.e36.feature:default"/> +<setEntry value="com.google.gwt.eclipse.sdkbundle.e36.feature.2.0.4:default"/> +<setEntry value="com.instantiations.css.feature:default"/> +<setEntry value="com.instantiations.designer.core.feature:default"/> +<setEntry value="com.instantiations.designer.core.xml.feature:default"/> +<setEntry value="com.instantiations.designer.gwt.feature:default"/> +<setEntry value="com.instantiations.designer.gwtcore.feature:default"/> +<setEntry value="com.instantiations.eclipse.shared:default"/> +<setEntry value="com.instantiations.eclipse.ui:default"/> +<setEntry value="net.sf.jautodoc.feature:default"/> +<setEntry value="org.eclipse.cvs.source:default"/> +<setEntry value="org.eclipse.emf.cdo.epp:default"/> +<setEntry value="org.eclipse.emf.cdo.server:default"/> +<setEntry value="org.eclipse.emf.cdo:default"/> +<setEntry value="org.eclipse.equinox.p2.user.ui.source:default"/> +<setEntry value="org.eclipse.help.source:default"/> +<setEntry value="org.eclipse.jdt.source:default"/> +<setEntry value="org.eclipse.jsf.feature.source:default"/> +<setEntry value="org.eclipse.jsf_sdk.feature:default"/> +<setEntry value="org.eclipse.jst.enterprise_core.feature.source:default"/> +<setEntry value="org.eclipse.jst.enterprise_sdk.feature:default"/> +<setEntry value="org.eclipse.jst.enterprise_ui.feature.source:default"/> +<setEntry value="org.eclipse.jst.web_core.feature:default"/> +<setEntry value="org.eclipse.jst.web_ui.feature:default"/> +<setEntry value="org.eclipse.jst.webpageeditor.feature.source:default"/> +<setEntry value="org.eclipse.jst.webpageeditor_sdk.feature:default"/> +<setEntry value="org.eclipse.jst.ws.jaxws.dom.feature.source:default"/> +<setEntry value="org.eclipse.jst.ws.jaxws.dom_sdk.feature:default"/> +<setEntry value="org.eclipse.jst.ws.jaxws.feature.source:default"/> +<setEntry value="org.eclipse.jst.ws.jaxws_sdk.feature:default"/> +<setEntry value="org.eclipse.mylyn.commons:default"/> +<setEntry value="org.eclipse.mylyn.jira_feature:default"/> +<setEntry value="org.eclipse.mylyn.pde_feature:default"/> +<setEntry value="org.eclipse.mylyn.wikitext.sdk:default"/> +<setEntry value="org.eclipse.net4j.db.derby:default"/> +<setEntry value="org.eclipse.net4j.db.h2:default"/> +<setEntry value="org.eclipse.net4j.db:default"/> +<setEntry value="org.eclipse.net4j:default"/> +<setEntry value="org.eclipse.pde.source:default"/> +<setEntry value="org.eclipse.platform.source:default"/> +<setEntry value="org.eclipse.rcp.source:default"/> +<setEntry value="org.eclipse.sdk:default"/> +<setEntry value="org.eclipse.swtbot.eclipse.gef:default"/> +<setEntry value="org.eclipse.swtbot.eclipse.test.junit3:default"/> +<setEntry value="org.eclipse.swtbot.eclipse.test.junit4:default"/> +<setEntry value="org.eclipse.swtbot.eclipse:default"/> +<setEntry value="org.eclipse.swtbot.ide:default"/> +<setEntry value="org.eclipse.swtbot:default"/> +<setEntry value="org.eclipse.team.svn.mylyn:default"/> +<setEntry value="org.eclipse.wst.common.fproj.sdk:default"/> +<setEntry value="org.eclipse.wst.common.fproj:default"/> +<setEntry value="org.eclipse.wst.common_core.feature.source:default"/> +<setEntry value="org.eclipse.wst.common_core.feature:default"/> +<setEntry value="org.eclipse.wst.common_sdk.feature:default"/> +<setEntry value="org.eclipse.wst.common_ui.feature.source:default"/> +<setEntry value="org.eclipse.wst.common_ui.feature:default"/> +<setEntry value="org.eclipse.wst.jsdt.feature.source:default"/> +<setEntry value="org.eclipse.wst.jsdt.feature:default"/> +<setEntry value="org.eclipse.wst.jsdt_sdk.feature:default"/> +<setEntry value="org.eclipse.wst.server_adapters.feature.source:default"/> +<setEntry value="org.eclipse.wst.server_adapters.sdk.feature:default"/> +<setEntry value="org.eclipse.wst.server_core.feature.source:default"/> +<setEntry value="org.eclipse.wst.server_core.feature:default"/> +<setEntry value="org.eclipse.wst.server_sdk.feature:default"/> +<setEntry value="org.eclipse.wst.server_ui.feature.source:default"/> +<setEntry value="org.eclipse.wst.server_ui.feature:default"/> +<setEntry value="org.eclipse.wst.web_core.feature.source:default"/> +<setEntry value="org.eclipse.wst.web_core.feature:default"/> +<setEntry value="org.eclipse.wst.web_sdk.feature:default"/> +<setEntry value="org.eclipse.wst.web_ui.feature.source:default"/> +<setEntry value="org.eclipse.wst.web_ui.feature:default"/> +<setEntry value="org.eclipse.wst.ws_core.feature:default"/> +<setEntry value="org.eclipse.wst.ws_ui.feature:default"/> +<setEntry value="org.eclipse.wst.ws_userdoc.feature:default"/> +<setEntry value="org.eclipse.wst.xml_core.feature.source:default"/> +<setEntry value="org.eclipse.wst.xml_core.feature:default"/> +<setEntry value="org.eclipse.wst.xml_sdk.feature:default"/> +<setEntry value="org.eclipse.wst.xml_ui.feature.source:default"/> +<setEntry value="org.eclipse.wst.xml_ui.feature:default"/> +<setEntry value="org.eclipse.wst.xsl.feature.source:default"/> +<setEntry value="org.eclipse.wst.xsl_sdk.feature:default"/> +<setEntry value="org.hibernate.eclipse.feature:default"/> +<setEntry value="org.jboss.ide.eclipse.as.feature:default"/> +<setEntry value="org.jboss.tools.gwt.feature:default"/> +<setEntry value="org.jboss.tools.seam.feature:default"/> +<setEntry value="org.jboss.tools.usage.feature:default"/> +</setAttribute> +<stringAttribute key="selected_target_plugins" value="org.eclipse.osgi.services@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.swt@default:default,org.eclipse.core.databinding.observable@default:default,org.junit4@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.databinding@default:default,com.ibm.icu@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.eclipse.help@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.expressions@default:default,javax.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.swt.cocoa.macosx.x86_64! @default:false,org.eclipse.jface.databinding@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.app@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="com.jboss.jbds.usage@default:default,org.jboss.tools.usage.fragment@default:false,com.jboss.jbds.usage.fragment@default:false,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"/> +</launchConfiguration> Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/UsageIntegrationTest.launch ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/usage/tests/org.jboss.tools.usage.test/UsageReportIntegrationTest.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/UsageReportIntegrationTest.launch (rev 0) +++ trunk/usage/tests/org.jboss.tools.usage.test/UsageReportIntegrationTest.launch 2010-11-30 16:14:44 UTC (rev 27028) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<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/pde-junit"/> +<booleanAttribute key="default" value="false"/> +<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.jboss.tools.deltacloud.core,org.eclipse.epp.usagedata.ui,org.eclipse.epp.usagedata.gathering,org.jboss.tools.deltacloud.docs,org.jboss.tools.tests,org.jboss.tools.deltacloud.ui,org.jboss.tools.deltacloud.test,com.jboss.jbds.usage.branding"/> +<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/UsageReportIntegrationTest.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.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.MAIN_TYPE" value="org.jboss.tools.usage.test.UsageReportIntegrationTest"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.usage.test"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/> +<stringAttribute key="pde.version" value="3.3"/> +<stringAttribute key="product" value="org.eclipse.sdk.ide"/> +<booleanAttribute key="run_in_ui_thread" value="true"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.ecf@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.resources@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.wst.xml.core@default:default,javax.xml@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.osgi.services@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.core.net.linux.x86_64@default:false,org.junit4@default:default,org.eclipse.swt@default:default,org.eclipse.help.ui@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui.workbench@default:default,org.apache.xerces@default:default,org.eclipse.compare.core@default:default,org.eclipse.help.base@default:default,org.eclipse.osgi.util@default:default,org.ecl! ipse.debug.core@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.equinox.common@2:true,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.apache.xml.resolver@default:default,org.eclipse.core.net@default:default,javax.servlet@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.compare@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.jface@default:default,org.eclipse.update.configurator@3:true,org.eclipse.emf.ecore.xmi@default:default,org.apache.ant@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.forms@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.views@default:default,org.eclipse.emf.common@default:default,com.ibm.icu@default:default,org.eclipse.jface.text@defaul! t:default,org.eclipse.equinox.p2.metadata@default:default,org.! eclipse. core.databinding@default:default,org.eclipse.emf.edit@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.http.servlet@default:default,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.core.contenttype@default:default,org.apache.xml.serializer@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.equinox.app@default:default,org.apache.lucene@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.security@default:default,org.apache.jasper@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ant.core@default:default,org.eclipse.help@default:default,org.eclipse.sdk@default:default,org.eclipse.team.core@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.co! re.databinding.property@default:default,org.eclipse.wst.validation@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.jem.util@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.team.ui@default:default,org.eclipse.search@default:default,org.apache.commons.el@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.apache.lucene.analysis@default:default,org.eclipse.jdt.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.core.commands@de! fault:default,org.eclipse.emf.ecore@default:default,org.eclips! e.equino x.http.jetty@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.ui@default:default,org.eclipse.osgi@-1:true,org.eclipse.ui.ide.application@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.ui.console@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.debug@default:default,org.eclipse.core.jobs@default:default,javax.servlet.jsp@default:default,org.mortbay.jetty.util@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.text@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.runtime@default:true,org.hamcrest.core@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.jdt.core.manipulati! on@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.runtime.compatibility@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.common@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="false"/> +<booleanAttribute key="useProduct" value="false"/> +</launchConfiguration> Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/UsageReportIntegrationTest.launch ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch 2010-11-30 16:02:52 UTC (rev 27027) +++ trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch 2010-11-30 16:14:44 UTC (rev 27028) @@ -12,7 +12,7 @@ <booleanAttribute key="clearwslog" value="false"/> <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> <booleanAttribute key="default" value="false"/> -<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.jboss.tools.deltacloud.core,org.eclipse.epp.usagedata.gathering,org.mozilla.xulrunner.cocoa.macosx,org.jboss.tools.deltacloud.docs,org.mozilla.xulrunner.gtk.linux.x86_64,org.jboss.tools.deltacloud.test,org.mozilla.xulrunner.win32.win32.x86,com.jboss.jbds.usage.branding,org.mozilla.xulrunner.gtk.linux.x86,org.eclipse.epp.usagedata.ui,org.mozilla.xulrunner.carbon.macosx,org.mozilla.xpcom,org.jboss.tools.deltacloud.ui,org.jboss.tools.tests,org.jruby.jruby"/> +<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.jboss.tools.deltacloud.core,org.eclipse.epp.usagedata.ui,org.eclipse.epp.usagedata.gathering,org.jboss.tools.deltacloud.docs,org.jboss.tools.tests,org.jboss.tools.deltacloud.ui,org.jboss.tools.deltacloud.test,com.jboss.jbds.usage.branding"/> <booleanAttribute key="includeOptional" value="true"/> <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> @@ -38,8 +38,8 @@ <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.swt@default:default,org.eclipse.jface@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.net@default:default,org.eclipse.core.expressions@default:default,org.eclipse.osgi.util@default:default,org.eclipse.equinox.p2.metadata@default:default,org.hamcrest.core@default:default,org.eclipse.wst.common.emf@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.text@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.jobs@default:default,org.eclipse.help@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.compare@default:default,org.eclipse.ui.workbench.texteditor@default:def! ault,org.eclipse.wst.validation@default:default,org.eclipse.jface.text@default:default,org.eclipse.jdt.compiler.apt@default:false,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.equinox.app@default:default,org.eclipse.core.resources@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.osgi.services@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,javax.servlet@default:default,org.eclipse.wst.xml.core@default:default,org.apache.xerces@default:default,org.eclipse.debug.core@default:default,org.eclipse.emf.edit@default:default,org.eclipse.ui@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.osgi,org.eclipse.compare.core@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.emf.ecore.change@default:default,com.instantia! tions.designer.jdt.fragment@default:false,org.eclipse.wst.comm! on.urire solver@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.variables@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.ecf@default:default,org.eclipse.ant.core@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.team.ui@default:default,org.eclipse.ui.views@default:default,org.apache.xml.resolver@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.jdt.core@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,com.ibm.icu@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.contenttype@default:default,javax.xml@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.ui.forms@default:def! ault,org.eclipse.jface.databinding@default:default,org.eclipse.search@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.editors@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.common@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.core.commands@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.debug.ui@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ui.console@default:default,org.eclipse.core.databinding.observable@default:default,org.junit4@default:default,org.eclipse.emf.ecore@default:defau! lt,org.eclipse.jem.util@default:default,org.eclipse.wst.sse.co! re@defau lt:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.jdt.debug@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.team.core@default:default,org.apache.xml.serializer@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.wst.common.environment@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.common@default:default,org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.ecf@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.resources@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.wst.xml.core@default:default,javax.xml@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.osgi.services@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.core.net.linux.x86_64@default:false,org.junit4@default:default,org.eclipse.swt@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui.workbench@default:default,org.apache.xerces@default:default,org.eclipse.compare.core@default:default,org.eclipse.osgi.util@default:default,org.eclipse.debug.core@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.equinox.common@2:true,org.apac! he.commons.logging*1.0.4.v201005080501@default:default,org.apache.xml.resolver@default:default,org.eclipse.core.net@default:default,javax.servlet@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.compare@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.jface@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.forms@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.views@default:default,org.eclipse.emf.common@default:default,com.ibm.icu@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.databinding@default:default,org.eclipse.emf.edit@default:default,org.eclipse.jdt.ui@default:default,org.eclips! e.ltk.ui.refactoring@default:default,com.instantiations.design! er.jdt.f ragment@default:false,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.core.contenttype@default:default,org.apache.xml.serializer@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.security@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ant.core@default:default,org.eclipse.help@default:default,org.eclipse.team.core@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.wst.validation@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.jem.util@default:default,org.jbos! s.tools.xulrunner.initializer@default:false,org.eclipse.team.ui@default:default,org.eclipse.search@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.jdt.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.core.commands@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.ui@default:default,org.eclipse.osgi@-1:true,org.eclipse.ui.console@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.debug@default:default,org.eclipse.core.jobs@default:default,org.eclipse.wst.common.emfworkbench.integration@defaul! t:default,org.eclipse.text@default:default,org.eclipse.equinox! .registr y@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.runtime@default:true,org.hamcrest.core@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.jdt.core.manipulation@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.p2.engine@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.common@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"/> Deleted: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsEclipseEnvironmentTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsEclipseEnvironmentTest.java 2010-11-30 16:02:52 UTC (rev 27027) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsEclipseEnvironmentTest.java 2010-11-30 16:14:44 UTC (rev 27028) @@ -1,73 +0,0 @@ -/******************************************************************************* - * 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.usage.test; - -import static org.junit.Assert.assertTrue; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.eclipse.core.runtime.IBundleGroupProvider; -import org.jboss.tools.usage.googleanalytics.eclipse.AbstractEclipseEnvironment; -import org.jboss.tools.usage.internal.reporting.JBossToolsComponents; -import org.jboss.tools.usage.test.fakes.BundleGroupProviderFake; -import org.jboss.tools.usage.test.fakes.ReportingEclipseEnvironmentFake; -import org.junit.Test; - -/** - * @author Andre Dietisheim - */ -public class JBossToolsEclipseEnvironmentTest { - - @Test - public void keywordReportsJbossComponents() { - AbstractEclipseEnvironment eclipseEnvironment = new ReportingEclipseEnvironmentFake() { - - @Override - protected IBundleGroupProvider[] getBundleGroupProviders() { - return new IBundleGroupProvider[] { - new BundleGroupProviderFake( - "org.jboss.tools.gwt.feature", - "org.jboss.tools.seam.feature", - "org.jboss.tools.smooks.feature") - }; - } - }; - - String keyword = eclipseEnvironment.getKeyword(); - - Matcher matcher = Pattern.compile("(([A-Z]+)-){3}").matcher(keyword); - assertTrue(matcher.matches()); - assertTrue(keyword.indexOf(JBossToolsComponents.JBossToolsFeatureIdentifiers.GWT.name()) >= 0); - assertTrue(keyword.indexOf(JBossToolsComponents.JBossToolsFeatureIdentifiers.SEAM.name()) >= 0); - assertTrue(keyword.indexOf(JBossToolsComponents.JBossToolsFeatureIdentifiers.SMOOKS.name()) >= 0); - } - - @Test - public void keywordIsEmptyIfNoJBossFeaturesFound() { - AbstractEclipseEnvironment eclipseEnvironment = new ReportingEclipseEnvironmentFake() { - - @Override - protected IBundleGroupProvider[] getBundleGroupProviders() { - return new IBundleGroupProvider[] { - new BundleGroupProviderFake( - "org.jboss.tools.gwt", - "org.eclipse.emf.cdo") - }; - } - }; - - String keyword = eclipseEnvironment.getKeyword(); - assertTrue(keyword != null && keyword.length() == 0); - } - - -} Deleted: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPointTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPointTest.java 2010-11-30 16:02:52 UTC (rev 27027) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPointTest.java 2010-11-30 16:14:44 UTC (rev 27028) @@ -1,68 +0,0 @@ -/******************************************************************************* - * 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.usage.test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import org.jboss.tools.usage.tracker.IFocusPoint; -import org.jboss.tools.usage.tracker.internal.FocusPoint; -import org.jboss.tools.usage.tracker.internal.SuffixFocusPoint; -import org.jboss.tools.usage.util.HttpEncodingUtils; -import org.junit.Test; - -/** - * @author Andre Dietisheim - */ -public class JBossToolsFocusPointTest { - - private static final String JBOSS_TOOLS_VERSION = "42.0.42"; - - private static final String ROOT = "root"; - - private static final String CHILD = "child"; - - private static final String URI_SEPARATOR_ENCODED = HttpEncodingUtils.checkedEncodeUtf8(FocusPoint.URI_SEPARATOR); - - private static final String TITLE_SEPARATOR_ENCODED = HttpEncodingUtils - .checkedEncodeUtf8(FocusPoint.TITLE_SEPARATOR); - - @Test - public void appendsJBossToolsVersionToTheEnd() throws Exception { - IFocusPoint focusPoint = new JBossToolsFocusPointFake(ROOT) - .setChild(new FocusPoint(CHILD) - .setChild(new FocusPoint(CHILD))); - String contentURI = focusPoint.getURI(); - - assertNotNull(contentURI); - assertEquals( URI_SEPARATOR_ENCODED - + ROOT - + URI_SEPARATOR_ENCODED - + CHILD + URI_SEPARATOR_ENCODED - + CHILD + URI_SEPARATOR_ENCODED - + JBOSS_TOOLS_VERSION, contentURI); - - String title = focusPoint.getTitle(); - assertNotNull(title); - assertEquals(ROOT - + TITLE_SEPARATOR_ENCODED - + CHILD + TITLE_SEPARATOR_ENCODED - + CHILD + TITLE_SEPARATOR_ENCODED - + JBOSS_TOOLS_VERSION, title); - } - - private static class JBossToolsFocusPointFake extends SuffixFocusPoint { - - public JBossToolsFocusPointFake(String name) { - super(name, JBOSS_TOOLS_VERSION); - } - } -} Deleted: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java 2010-11-30 16:02:52 UTC (rev 27027) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java 2010-11-30 16:14:44 UTC (rev 27028) @@ -1,112 +0,0 @@ -/******************************************************************************* - * 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.usage.test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.jboss.tools.common.log.ILoggingAdapter; -import org.jboss.tools.usage.googleanalytics.GoogleAnalyticsUrlStrategy; -import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters; -import org.jboss.tools.usage.http.HttpGetRequest; -import org.jboss.tools.usage.http.IHttpGetRequest; -import org.jboss.tools.usage.test.fakes.ReportingEclipseEnvironmentFake; -import org.jboss.tools.usage.test.fakes.RepportingEclipseEnvironmentFakeSingleton; -import org.jboss.tools.usage.tracker.IFocusPoint; -import org.jboss.tools.usage.tracker.IURLBuildingStrategy; -import org.jboss.tools.usage.tracker.internal.UsagePluginLogger; -import org.junit.Test; - -/** - * @author Andre Dietisheim - */ -public class JBossToolsUsageIntegrationTest { - - @Test - public void sameUserIdOnSametEclipseInstance() throws Exception { - UrlRevealingTracker tracker = getTracker(RepportingEclipseEnvironmentFakeSingleton.INSTANCE); - IFocusPoint focusPoint = createFocusPoint("testSameUserIdOnSametEclipseInstance" + System.currentTimeMillis()); - tracker.trackSynchronously(focusPoint); - String userId = getUserId(tracker.getTrackingUrl()); - assertTrue(userId != null); - - tracker = getTracker(RepportingEclipseEnvironmentFakeSingleton.INSTANCE); - tracker.trackSynchronously(focusPoint); - String newUserId = getUserId(tracker.getTrackingUrl()); - - assertTrue(newUserId != null); - assertEquals(userId, newUserId); - } - - @Test - public void differentUserIdOnDifferentEclipseInstance() throws Exception { - String focusPointName = "testDifferentUserIdOnDifferentEclipseInstance" - + System.currentTimeMillis(); - UrlRevealingTracker tracker = getTracker(new ReportingEclipseEnvironmentFake()); - tracker.trackSynchronously(createFocusPoint(focusPointName)); - String userId = getUserId(tracker.getTrackingUrl()); - assertTrue(userId != null); - - tracker = getTracker(new ReportingEclipseEnvironmentFake()); - IFocusPoint focusPoint = createFocusPoint(focusPointName); - tracker.trackSynchronously(focusPoint); - String newUserId = getUserId(tracker.getTrackingUrl()); - - assertTrue(newUserId != null); - assertTrue(!userId.equals(newUserId)); - } - - @Test - public void visitCountIncreases() throws Exception { - IGoogleAnalyticsParameters eclipseEnvironment = new ReportingEclipseEnvironmentFake(); - assertEquals(1, eclipseEnvironment.getVisitCount()); - UrlRevealingTracker tracker = getTracker(eclipseEnvironment); - tracker.trackSynchronously(createFocusPoint("testVisitCount")); - assertEquals(2, eclipseEnvironment.getVisitCount()); - tracker.trackSynchronously(createFocusPoint("testVisitCount")); - assertEquals(3, eclipseEnvironment.getVisitCount()); - } - - @Test - public void urlEndsWithJBossToolsVersion() { - IGoogleAnalyticsParameters eclipseEnvironment = new ReportingEclipseEnvironmentFake(); - UrlRevealingTracker tracker = getTracker(eclipseEnvironment); - tracker.trackSynchronously(createFocusPoint("testJBossToolsVersion")); - assertEquals(2, eclipseEnvironment.getVisitCount()); - tracker.trackSynchronously(createFocusPoint("testVisitCount")); - assertEquals(3, eclipseEnvironment.getVisitCount()); - } - - private String getUserId(String trackingUrl) { - Pattern pattern = Pattern.compile(".+" + IGoogleAnalyticsParameters.PARAM_COOKIES_UNIQUE_VISITOR_ID - + "%3D([0-9]+\\.[0-9]+)\\..+"); - Matcher matcher = pattern.matcher(trackingUrl); - if (matcher.matches()) { - return matcher.group(1); - } else { - return null; - } - } - - private UrlRevealingTracker getTracker(IGoogleAnalyticsParameters environment) { - UsagePluginLogger logger = new UsagePluginLogger(JBossToolsUsageTestActivator.getDefault()); - IURLBuildingStrategy urlStrategy = new GoogleAnalyticsUrlStrategy(environment); - IHttpGetRequest httpGetRequest = new HttpGetRequest(environment.getUserAgent(), logger); - return new UrlRevealingTracker(urlStrategy, httpGetRequest, logger); - } - - private IFocusPoint createFocusPoint(String childFocusPoint) { - return new JBossToolsTestsFocusPoint(childFocusPoint); - } -} Added: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageReportIntegrationTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageReportIntegrationTest.java (rev 0) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageReportIntegrationTest.java 2010-11-30 16:14:44 UTC (rev 27028) @@ -0,0 +1,83 @@ +/******************************************************************************* + * 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.usage.test; + +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; + +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + +import org.jboss.tools.usage.internal.JBossToolsUsageActivator; +import org.jboss.tools.usage.internal.preferences.GlobalUsageSettings; +import org.jboss.tools.usage.internal.preferences.UsageReportPreferences; +import org.jboss.tools.usage.internal.reporting.UsageReport; +import org.junit.Test; + +public class UsageReportIntegrationTest { + + private CountDownLatch latch; + + private final class UsageReportFake extends UsageReport { + + private boolean enabled; + + public UsageReportFake(boolean enabled) { + super(new JBossToolsTestsFocusPoint("UsageReportIntegrationTest"), + JBossToolsUsageActivator.getDefault().getJBossToolsEclipseEnvironment(), + new GlobalUsageSettings(JBossToolsUsageActivator.getDefault())); + latch = new CountDownLatch(1); + this.enabled = enabled; + } + + @Override + protected void doReport() { + try { + super.doReport(); + } finally { + latch.countDown(); + } + } + + @Override + protected Boolean askUserForEnablement() { + return enabled; + } + + @Override + protected boolean isAskUser() { + // has to be true, askUserForEnablement is not queried otherwise + return true; + } + + @Override + protected boolean isReportingGloballyEnabled() { + // has to be true, askUserForEnablement is not queried otherwise + return true; + } + } + + @Test + public void doesEnableInPreferences() throws InterruptedException { + UsageReportPreferences.setEnabled(false); + new UsageReportFake(true).report(); + latch.await(10l, TimeUnit.SECONDS); + assertTrue(UsageReportPreferences.isEnabled()); + } + + @Test + public void doesDisableInPreferences() throws InterruptedException { + UsageReportPreferences.setEnabled(true); + new UsageReportFake(false).report(); + latch.await(10l, TimeUnit.SECONDS); + assertFalse(UsageReportPreferences.isEnabled()); + } +} Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageReportIntegrationTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain