Author: adietish Date: 2010-09-14 07:25:25 -0400 (Tue, 14 Sep 2010) New Revision: 24911 Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossToolsComponents.java trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsComponentsTest.launch trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsComponentsTest.java Removed: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossComponents.java trunk/usage/tests/org.jboss.tools.usage.test/JBossComponentsTest.launch trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossComponentsTest.java Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingEclipseEnvironment.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/ReportingEclipseEnvironmentTest.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java Log: [JBIDE-7035] JBossComponents renamed to JBossToolsComponents Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossComponents.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossComponents.java 2010-09-14 11:17:13 UTC (rev 24910) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossComponents.java 2010-09-14 11:25:25 UTC (rev 24911) @@ -1,139 +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.reporting; - -import java.util.Collection; -import java.util.Set; -import java.util.TreeSet; -import java.util.regex.Pattern; - -import org.eclipse.core.runtime.IBundleGroup; -import org.eclipse.core.runtime.IBundleGroupProvider; -import org.jboss.tools.usage.util.collectionfilter.CollectionFilterUtils; -import org.jboss.tools.usage.util.collectionfilter.CompositeCollectionFilter; -import org.jboss.tools.usage.util.collectionfilter.ICollectionFilter; - -/** - * @author Andre Dietisheim - */ -public class JBossComponents { - - public enum JBossToolsFeatureNames { - ARCHIVES("org.jboss.ide.eclipse.archives.feature"), - BIRT("org.jboss.tools.birt.feature"), - BPEL("org.jboss.tools.bpel.feature"), - CDI("org.jboss.tools.cdi.feature"), - COMMON("org.jboss.tools.common.feature"), - DELTACLOUD("org.jboss.tools.deltacloud.feature"), - DROOLS("org.drools.eclipse.feature"), - ESB("org.jboss.tools.esb.feature"), - EXAMPLES("org.jboss.tools.project.examples.feature"), - FLOW("org.jboss.tools.flow.common.feature"), - FREEMARKER("org.jboss.ide.eclipse.freemarker.feature"), - GWT("org.jboss.tools.gwt.feature"), - HIBERNATETOOLS("org.hibernate.eclipse.feature"), - JBPM("org.jboss.tools.jbpm.common.feature"), - JMX("org.jboss.tools.jmx.feature"), - JSF("org.jboss.tools.jsf.feature"), - MAVEN("org.jboss.tools.maven.feature"), - MODESHAPE("org.jboss.tools.modeshape.rest.feature"), - PORTLET("org.jboss.tools.portlet.feature"), - PROFILER("org.jboss.tools.profiler.feature"), - RUNTIME("org.jboss.tools.runtime.feature"), - SEAM("org.jboss.tools.seam.feature"), - SMOOKS("org.jboss.tools.smooks.feature"), - STRUTS("org.jboss.tools.struts.feature"), - TPTP("org.jboss.tools.tptp.feature"), - USAGE("org.jboss.tools.usage.feature"), - VPE("org.jboss.tools.vpe.feature"), - WORKINGSET("org.jboss.tools.workingset.feature"), - WS("org.jboss.tools.ws.feature"), - XULRUNNER("org.mozilla.xulrunner.feature"); - - private String featureName; - - JBossToolsFeatureNames(String featureName) { - this.featureName = featureName; - } - - /** - * Returns whether the given bundle group has the same name as the this - * feature name. - * - * @param bundleName - * the bundle name to check whether it's a member of this - * group of bundles. - * @return <tt>true</tt>, if the given bundle - */ - public boolean matches(IBundleGroup bundleGroup) { - return featureName.equals(bundleGroup.getName()); - } - - public String getAbbreviation() { - return name(); - } - } - - private static final String JBOSS_TOOLS_BUNDLES_PREFIX = "org\\.jboss\\.tools.+"; //$NON-NLS-1$ - - private JBossComponents() { - // inhibit instantiation - } - - - /** - * Returns the jboss components that the given bundle group provider provides - * - * @param bundles - * the bundles group providers to check for jboss components - * @return - */ - @SuppressWarnings("unchecked") - public static Collection<String> getComponentIds(IBundleGroupProvider[] bundleGroupProviders) { - Set<String> componentNames = new TreeSet<String>(); - for (IBundleGroupProvider bundleGroupProvider : bundleGroupProviders) { - CollectionFilterUtils.filter( - new CompositeCollectionFilter<IBundleGroup>( - new JBossToolsNameFilter() - , new JBossToolsFeaturesFilter(componentNames)) - , bundleGroupProvider.getBundleGroups(), null); - } - return componentNames; - } - - private static class JBossToolsNameFilter implements ICollectionFilter<IBundleGroup> { - - Pattern pattern = Pattern.compile(JBOSS_TOOLS_BUNDLES_PREFIX); - - public boolean matches(IBundleGroup bundleGroup) { - return pattern.matcher(bundleGroup.getName()).matches(); - } - } - - private static class JBossToolsFeaturesFilter implements ICollectionFilter<IBundleGroup> { - - private Collection<String> componentNames; - - private JBossToolsFeaturesFilter(Collection<String> componentNames) { - this.componentNames = componentNames; - } - - public boolean matches(IBundleGroup bundleGroup) { - for (JBossToolsFeatureNames featureName : JBossToolsFeatureNames.values()) { - if (featureName.matches(bundleGroup)) { - this.componentNames.add(featureName.getAbbreviation()); - return true; - } - } - return false; - } - } -} \ No newline at end of file Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossToolsComponents.java (from rev 24908, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossComponents.java) =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossToolsComponents.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossToolsComponents.java 2010-09-14 11:25:25 UTC (rev 24911) @@ -0,0 +1,139 @@ +/******************************************************************************* + * 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.reporting; + +import java.util.Collection; +import java.util.Set; +import java.util.TreeSet; +import java.util.regex.Pattern; + +import org.eclipse.core.runtime.IBundleGroup; +import org.eclipse.core.runtime.IBundleGroupProvider; +import org.jboss.tools.usage.util.collectionfilter.CollectionFilterUtils; +import org.jboss.tools.usage.util.collectionfilter.CompositeCollectionFilter; +import org.jboss.tools.usage.util.collectionfilter.ICollectionFilter; + +/** + * @author Andre Dietisheim + */ +public class JBossToolsComponents { + + public enum JBossToolsFeatureNames { + ARCHIVES("org.jboss.ide.eclipse.archives.feature"), + BIRT("org.jboss.tools.birt.feature"), + BPEL("org.jboss.tools.bpel.feature"), + CDI("org.jboss.tools.cdi.feature"), + COMMON("org.jboss.tools.common.feature"), + DELTACLOUD("org.jboss.tools.deltacloud.feature"), + DROOLS("org.drools.eclipse.feature"), + ESB("org.jboss.tools.esb.feature"), + EXAMPLES("org.jboss.tools.project.examples.feature"), + FLOW("org.jboss.tools.flow.common.feature"), + FREEMARKER("org.jboss.ide.eclipse.freemarker.feature"), + GWT("org.jboss.tools.gwt.feature"), + HIBERNATETOOLS("org.hibernate.eclipse.feature"), + JBPM("org.jboss.tools.jbpm.common.feature"), + JMX("org.jboss.tools.jmx.feature"), + JSF("org.jboss.tools.jsf.feature"), + MAVEN("org.jboss.tools.maven.feature"), + MODESHAPE("org.jboss.tools.modeshape.rest.feature"), + PORTLET("org.jboss.tools.portlet.feature"), + PROFILER("org.jboss.tools.profiler.feature"), + RUNTIME("org.jboss.tools.runtime.feature"), + SEAM("org.jboss.tools.seam.feature"), + SMOOKS("org.jboss.tools.smooks.feature"), + STRUTS("org.jboss.tools.struts.feature"), + TPTP("org.jboss.tools.tptp.feature"), + USAGE("org.jboss.tools.usage.feature"), + VPE("org.jboss.tools.vpe.feature"), + WORKINGSET("org.jboss.tools.workingset.feature"), + WS("org.jboss.tools.ws.feature"), + XULRUNNER("org.mozilla.xulrunner.feature"); + + private String featureName; + + JBossToolsFeatureNames(String featureName) { + this.featureName = featureName; + } + + /** + * Returns whether the given bundle group has the same name as the this + * feature name. + * + * @param bundleName + * the bundle name to check whether it's a member of this + * group of bundles. + * @return <tt>true</tt>, if the given bundle + */ + public boolean matches(IBundleGroup bundleGroup) { + return featureName.equals(bundleGroup.getName()); + } + + public String getAbbreviation() { + return name(); + } + } + + private static final String JBOSS_TOOLS_BUNDLES_PREFIX = "org\\.jboss\\.tools.+"; //$NON-NLS-1$ + + private JBossToolsComponents() { + // inhibit instantiation + } + + + /** + * Returns the jboss components that the given bundle group provider provides + * + * @param bundles + * the bundles group providers to check for jboss components + * @return + */ + @SuppressWarnings("unchecked") + public static Collection<String> getComponentIds(IBundleGroupProvider[] bundleGroupProviders) { + Set<String> componentNames = new TreeSet<String>(); + for (IBundleGroupProvider bundleGroupProvider : bundleGroupProviders) { + CollectionFilterUtils.filter( + new CompositeCollectionFilter<IBundleGroup>( + new JBossToolsNameFilter() + , new JBossToolsFeaturesFilter(componentNames)) + , bundleGroupProvider.getBundleGroups(), null); + } + return componentNames; + } + + private static class JBossToolsNameFilter implements ICollectionFilter<IBundleGroup> { + + Pattern pattern = Pattern.compile(JBOSS_TOOLS_BUNDLES_PREFIX); + + public boolean matches(IBundleGroup bundleGroup) { + return pattern.matcher(bundleGroup.getName()).matches(); + } + } + + private static class JBossToolsFeaturesFilter implements ICollectionFilter<IBundleGroup> { + + private Collection<String> componentNames; + + private JBossToolsFeaturesFilter(Collection<String> componentNames) { + this.componentNames = componentNames; + } + + public boolean matches(IBundleGroup bundleGroup) { + for (JBossToolsFeatureNames featureName : JBossToolsFeatureNames.values()) { + if (featureName.matches(bundleGroup)) { + this.componentNames.add(featureName.getAbbreviation()); + return true; + } + } + return false; + } + } +} \ No newline at end of file Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingEclipseEnvironment.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingEclipseEnvironment.java 2010-09-14 11:17:13 UTC (rev 24910) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingEclipseEnvironment.java 2010-09-14 11:25:25 UTC (rev 24911) @@ -31,7 +31,7 @@ @Override public String getKeyword() { - Collection<String> jbossComponentNames = JBossComponents.getComponentIds(getBundleGroupProviders()); + Collection<String> jbossComponentNames = JBossToolsComponents.getComponentIds(getBundleGroupProviders()); return bundleGroupsToKeywordString(jbossComponentNames ); } Deleted: trunk/usage/tests/org.jboss.tools.usage.test/JBossComponentsTest.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/JBossComponentsTest.launch 2010-09-14 11:17:13 UTC (rev 24910) +++ trunk/usage/tests/org.jboss.tools.usage.test/JBossComponentsTest.launch 2010-09-14 11:25:25 UTC (rev 24911) @@ -1,48 +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="false"/> -<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.gwt.core,org.jboss.tools.gwt.ui,org.jboss.tools.common,org.jboss.tools.common.model"/> -<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/JBossComponentsTest.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.JBossComponentsTest"/> -<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 -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -XX:MaxPermSize=256m -Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Xms40m -Xmx512m -Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts"/> -<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="javax.activation@default:default,org.eclipse.equinox.app@default:default,org.junit4@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,javax.servlet@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.update.configurator@3:true,org.apache.jasper@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.text@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ui.ide.application@default:default,org.eclipse.ant.core@default:default,org.apache.lucene@default:default,org.eclipse.ui@default:default,org! .eclipse.ecf.filetransfer@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.apache.ant@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.jface.text@default:default,org.mortbay.jetty.server@default:default,org.eclipse.core.databinding@default:default,org.eclipse.help@default:default,org.eclipse.net4j.jms.api@default:default,org.apache.lucene.analysis@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.swt@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.http.jetty@default:default,org.hamcrest.core@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.common@2:true,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.! core@default:default,ch.qos.logback.classic@default:default,or! g.eclips e.equinox.security.macosx@default:false,org.eclipse.help.base@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.help.ui@default:default,org.eclipse.equinox.concurrent@default:default,ch.qos.logback.slf4j@default:false,ch.qos.logback.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.ecf.identity@default:default,org.slf4j.api@default:default,org.eclipse.core.net@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.core.resources@default:default,org.mortbay.jetty.util@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.commands@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.apache.commons.el! @default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.sdk@default:default,javax.servlet.jsp@default:default,org.eclipse.ui.cocoa@default:false,javax.mail@default:default,com.ibm.icu@default:default,org.eclipse.jface@default:default,org.eclipse.ecf@default:default,org.eclipse.ui.workbench@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.xulrunner.initializer@default:false"/> -<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> Added: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsComponentsTest.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsComponentsTest.launch (rev 0) +++ trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsComponentsTest.launch 2010-09-14 11:25:25 UTC (rev 24911) @@ -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.jboss.tools.gwt.core,org.jboss.tools.gwt.ui,org.jboss.tools.common,org.jboss.tools.common.model"/> +<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/JBossToolsComponentsTest.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.JBossToolsComponentsTest"/> +<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 -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -XX:MaxPermSize=256m -Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Xms40m -Xmx512m -Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts"/> +<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="javax.activation@default:default,org.eclipse.equinox.app@default:default,org.junit4@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,javax.servlet@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.update.configurator@3:true,org.apache.jasper@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.text@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ui.ide.application@default:default,org.eclipse.ant.core@default:default,org.apache.lucene@default:default,org.eclipse.ui@default:default,org! .eclipse.ecf.filetransfer@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.apache.ant@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.jface.text@default:default,org.mortbay.jetty.server@default:default,org.eclipse.core.databinding@default:default,org.eclipse.help@default:default,org.eclipse.net4j.jms.api@default:default,org.apache.lucene.analysis@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.swt@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.http.jetty@default:default,org.hamcrest.core@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.common@2:true,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.! core@default:default,ch.qos.logback.classic@default:default,or! g.eclips e.equinox.security.macosx@default:false,org.eclipse.help.base@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.help.ui@default:default,org.eclipse.equinox.concurrent@default:default,ch.qos.logback.slf4j@default:false,ch.qos.logback.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.ecf.identity@default:default,org.slf4j.api@default:default,org.eclipse.core.net@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.core.resources@default:default,org.mortbay.jetty.util@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.commands@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.apache.commons.el! @default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.sdk@default:default,javax.servlet.jsp@default:default,org.eclipse.ui.cocoa@default:false,javax.mail@default:default,com.ibm.icu@default:default,org.eclipse.jface@default:default,org.eclipse.ecf@default:default,org.eclipse.ui.workbench@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.xulrunner.initializer@default:false"/> +<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/JBossToolsComponentsTest.launch ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossComponentsTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossComponentsTest.java 2010-09-14 11:17:13 UTC (rev 24910) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossComponentsTest.java 2010-09-14 11:25:25 UTC (rev 24911) @@ -1,34 +0,0 @@ -package org.jboss.tools.usage.test; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; - -import java.util.Collection; - -import org.eclipse.core.runtime.IBundleGroupProvider; -import org.jboss.tools.usage.reporting.JBossComponents; -import org.jboss.tools.usage.test.fakes.BundleGroupProviderFake; -import org.junit.Test; -import org.junit.matchers.JUnitMatchers; - -public class JBossComponentsTest { - - @Test - public void reportedComponentsListIsComplete() { - Collection<String> componentIds = JBossComponents.getComponentIds( - new IBundleGroupProvider[] { - new BundleGroupProviderFake("org.jboss.tools.gwt.feature") - , new BundleGroupProviderFake( - "rubbish", - "org.jboss.tools.seam.feature") - , new BundleGroupProviderFake("org.jboss.tools.smooks.feature") - , new BundleGroupProviderFake("org.jboss.tools.usage.feature.bandname") - }); - - assertThat(componentIds, JUnitMatchers.hasItems( - JBossComponents.JBossToolsFeatureNames.GWT.getAbbreviation(), - JBossComponents.JBossToolsFeatureNames.SEAM.getAbbreviation(), - JBossComponents.JBossToolsFeatureNames.SMOOKS.getAbbreviation())); - assertFalse(componentIds.contains(JBossComponents.JBossToolsFeatureNames.USAGE.getAbbreviation())); - } -} Copied: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsComponentsTest.java (from rev 24910, trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossComponentsTest.java) =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsComponentsTest.java (rev 0) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsComponentsTest.java 2010-09-14 11:25:25 UTC (rev 24911) @@ -0,0 +1,34 @@ +package org.jboss.tools.usage.test; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThat; + +import java.util.Collection; + +import org.eclipse.core.runtime.IBundleGroupProvider; +import org.jboss.tools.usage.reporting.JBossToolsComponents; +import org.jboss.tools.usage.test.fakes.BundleGroupProviderFake; +import org.junit.Test; +import org.junit.matchers.JUnitMatchers; + +public class JBossToolsComponentsTest { + + @Test + public void reportedComponentsListIsComplete() { + Collection<String> componentIds = JBossToolsComponents.getComponentIds( + new IBundleGroupProvider[] { + new BundleGroupProviderFake("org.jboss.tools.gwt.feature") + , new BundleGroupProviderFake( + "rubbish", + "org.jboss.tools.seam.feature") + , new BundleGroupProviderFake("org.jboss.tools.smooks.feature") + , new BundleGroupProviderFake("org.jboss.tools.usage.feature.bandname") + }); + + assertThat(componentIds, JUnitMatchers.hasItems( + JBossToolsComponents.JBossToolsFeatureNames.GWT.getAbbreviation(), + JBossToolsComponents.JBossToolsFeatureNames.SEAM.getAbbreviation(), + JBossToolsComponents.JBossToolsFeatureNames.SMOOKS.getAbbreviation())); + assertFalse(componentIds.contains(JBossToolsComponents.JBossToolsFeatureNames.USAGE.getAbbreviation())); + } +} Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsComponentsTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/ReportingEclipseEnvironmentTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/ReportingEclipseEnvironmentTest.java 2010-09-14 11:17:13 UTC (rev 24910) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/ReportingEclipseEnvironmentTest.java 2010-09-14 11:25:25 UTC (rev 24911) @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.IBundleGroupProvider; import org.jboss.tools.usage.googleanalytics.eclipse.AbstractEclipseEnvironment; -import org.jboss.tools.usage.reporting.JBossComponents; +import org.jboss.tools.usage.reporting.JBossToolsComponents; import org.jboss.tools.usage.test.fakes.BundleGroupProviderFake; import org.jboss.tools.usage.test.fakes.ReportingEclipseEnvironmentFake; import org.junit.Test; @@ -46,9 +46,9 @@ Matcher matcher = Pattern.compile("(([A-Z]+)-){3}").matcher(keyword); assertTrue(matcher.matches()); - assertTrue(keyword.indexOf(JBossComponents.JBossToolsFeatureNames.GWT.name()) >= 0); - assertTrue(keyword.indexOf(JBossComponents.JBossToolsFeatureNames.SEAM.name()) >= 0); - assertTrue(keyword.indexOf(JBossComponents.JBossToolsFeatureNames.SMOOKS.name()) >= 0); + assertTrue(keyword.indexOf(JBossToolsComponents.JBossToolsFeatureNames.GWT.name()) >= 0); + assertTrue(keyword.indexOf(JBossToolsComponents.JBossToolsFeatureNames.SEAM.name()) >= 0); + assertTrue(keyword.indexOf(JBossToolsComponents.JBossToolsFeatureNames.SMOOKS.name()) >= 0); } @Test Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java 2010-09-14 11:17:13 UTC (rev 24910) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java 2010-09-14 11:25:25 UTC (rev 24911) @@ -25,7 +25,7 @@ GoogleAnalyticsUrlStrategyTest.class, EclipseUserAgentTest.class, ReportingEclipseEnvironmentTest.class, - JBossComponentsTest.class, + JBossToolsComponentsTest.class, GlobalUsageReportingSettingsTest.class, JBossToolsUsageIntegrationTest.class }) public class UsageTestSuite {