Author: adietish Date: 2010-09-16 04:21:56 -0400 (Thu, 16 Sep 2010) New Revision: 24955 Added: trunk/usage/tests/org.jboss.tools.usage.test/HttpRemotePropertiesTest.launch Modified: 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 Log: [JBIDE-7082] removed org.jboss.tools filter, added tests Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossToolsComponents.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossToolsComponents.java 2010-09-16 07:34:34 UTC (rev 24954) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossToolsComponents.java 2010-09-16 08:21:56 UTC (rev 24955) @@ -13,12 +13,10 @@ 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; /** @@ -26,6 +24,22 @@ */ public class JBossToolsComponents { + /** + * The jboss tools features to check and report. + * <p> + * ATTENTION: the following features do not start with org.jboss.tools + * </p> + * <p> + * <ul> + * <li>org.hibernate.eclipse.feature</li> + * <li>org.jboss.ide.eclipse.freemarker.feature</li> + * <li>org.drools.eclipse.feature</li> + * <li>org.jboss.ide.eclipse.as.feature</li> + * <li>org.mozilla.xulrunner.feature</li> + * </ul> + * </p> + * + */ public enum JBossToolsFeatureNames { AS("org.jboss.ide.eclipse.as.feature"), ARCHIVES("org.jboss.ide.eclipse.archives.feature"), @@ -78,47 +92,56 @@ return featureName.equals(bundleGroup.getName()); } - public String getAbbreviation() { + public String getComponentName() { return name(); } + + public String getFeatureName() { + return featureName; + } } - 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 + * 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( + /* not all jboss tools features start with org.jboss.tools. @see https://jira.jboss.org/browse/JBIDE-7082 + * new CompositeCollectionFilter<IBundleGroup>( new JBossToolsNameFilter() - , new JBossToolsFeaturesFilter(componentNames)) + , new JBossToolsFeaturesFilter(componentNames)) */ + new JBossToolsFeaturesFilter(componentNames) , bundleGroupProvider.getBundleGroups(), null); } return componentNames; } - private static class JBossToolsNameFilter implements ICollectionFilter<IBundleGroup> { + /* not all jboss tools features start with org.jboss.tools. @see https://jira.jboss.org/browse/JBIDE-7082 + * + private static class JBossToolsNameFilter implements + ICollectionFilter<IBundleGroup> { + + private static final String JBOSS_TOOLS_FEATURES_PREFIX = "org\\.jboss.+"; //$NON-NLS-1$ + Pattern pattern = Pattern.compile(JBOSS_TOOLS_FEATURES_PREFIX); + + public boolean matches(IBundleGroup bundleGroup) { + return pattern.matcher(bundleGroup.getName()).matches(); + } + } + */ - 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; @@ -130,7 +153,7 @@ public boolean matches(IBundleGroup bundleGroup) { for (JBossToolsFeatureNames featureName : JBossToolsFeatureNames.values()) { if (featureName.matches(bundleGroup)) { - this.componentNames.add(featureName.getAbbreviation()); + this.componentNames.add(featureName.getComponentName()); return true; } } Added: trunk/usage/tests/org.jboss.tools.usage.test/HttpRemotePropertiesTest.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/HttpRemotePropertiesTest.launch (rev 0) +++ trunk/usage/tests/org.jboss.tools.usage.test/HttpRemotePropertiesTest.launch 2010-09-16 08:21:56 UTC (rev 24955) @@ -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"/> +<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/HttpRemotePropertiesTest.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.HttpRemotePropertiesTest"/> +<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="org.eclipse.ui.cocoa@default:false,org.eclipse.ui@default:default,org.eclipse.core.commands@default:default,com.ibm.icu@default:default,org.eclipse.ecf@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.p2.engine@default:default,org.apache.lucene@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.ui.views@default:default,javax.activation@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.apache.ant@default:default,org.eclipse.text@default:default,javax.mail@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.jface.text@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.update.configurator@3:t! rue,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,javax.servlet@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ui.cheatsheets@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.app@default:default,org.eclipse.help.ui@default:default,org.mortbay.jetty.server@default:default,ch.qos.logback.core@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.sdk@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.junit4@default:default,org.eclipse.core.jobs@default:default,org.eclipse.osgi.services@default:default,org.eclipse.help@default:default,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@de! fault:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:de! fault,or g.eclipse.ui.ide@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.preferences@default:default,ch.qos.logback.classic@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ant.core@default:default,javax.servlet.jsp@default:default,org.eclipse.net4j.jms.api@default:default,org.eclipse.jface@default:default,org.slf4j.api@default:default,org.apache.lucene.analysis@default:default,org.eclipse.equinox.security.macosx@default:false,org.mortbay.jetty.util@default:default,org.eclipse.ui.forms@default:default,org.eclipse.help.base@default:default,org.eclipse.core.resources@default:default,org.eclipse.ecf.provider.filetransfer@default:default,ch.qos.logback.slf4j@default:false,org.eclipse.ecf.ssl@default:false,org.hamcrest.core@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.apache.jasper@default:! default,org.apache.commons.el@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.security@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.usage.test@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/HttpRemotePropertiesTest.launch ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsComponentsTest.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsComponentsTest.launch 2010-09-16 07:34:34 UTC (rev 24954) +++ trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsComponentsTest.launch 2010-09-16 08:21:56 UTC (rev 24955) @@ -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.jboss.tools.gwt.core,org.jboss.tools.gwt.ui,org.jboss.tools.common,org.jboss.tools.common.model"/> +<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.gwt.core,org.jboss.tools.gwt.ui,org.jboss.tools.common"/> <booleanAttribute key="includeOptional" value="true"/> <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> @@ -37,8 +37,8 @@ <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"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.ui.cocoa@default:false,org.eclipse.ui@default:default,org.eclipse.core.commands@default:default,com.ibm.icu@default:default,org.eclipse.ecf@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.p2.engine@default:default,org.apache.lucene@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.ui.views@default:default,javax.activation@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.apache.ant@default:default,org.eclipse.text@default:default,javax.mail@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.jface.text@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.update.configurator@3:t! rue,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,javax.servlet@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ui.cheatsheets@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.app@default:default,org.eclipse.help.ui@default:default,org.mortbay.jetty.server@default:default,ch.qos.logback.core@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.sdk@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.junit4@default:default,org.eclipse.core.jobs@default:default,org.eclipse.osgi.services@default:default,org.eclipse.help@default:default,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@de! fault:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:de! fault,or g.eclipse.ui.ide@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.preferences@default:default,ch.qos.logback.classic@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ant.core@default:default,javax.servlet.jsp@default:default,org.eclipse.net4j.jms.api@default:default,org.eclipse.jface@default:default,org.slf4j.api@default:default,org.apache.lucene.analysis@default:default,org.eclipse.equinox.security.macosx@default:false,org.mortbay.jetty.util@default:default,org.eclipse.ui.forms@default:default,org.eclipse.help.base@default:default,org.eclipse.core.resources@default:default,org.eclipse.ecf.provider.filetransfer@default:default,ch.qos.logback.slf4j@default:false,org.eclipse.ecf.ssl@default:false,org.hamcrest.core@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.apache.jasper@default:! default,org.apache.commons.el@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.security@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.usage.test@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"/> Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsComponentsTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsComponentsTest.java 2010-09-16 07:34:34 UTC (rev 24954) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsComponentsTest.java 2010-09-16 08:21:56 UTC (rev 24955) @@ -25,20 +25,59 @@ @Test public void reportedComponentsListIsComplete() { + Collection<String> componentIds = JBossToolsComponents + .getComponentIds( + new IBundleGroupProvider[] { + new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureNames.GWT.getFeatureName()), + new BundleGroupProviderFake( + JBossToolsComponents.JBossToolsFeatureNames.SEAM.getFeatureName(), "rubbish"), + new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureNames.SMOOKS.getFeatureName()), + new BundleGroupProviderFake("org.jboss.tools.usage.feature.badname") + }); + + assertThat(componentIds, JUnitMatchers.hasItems( + JBossToolsComponents.JBossToolsFeatureNames.GWT.getComponentName(), + JBossToolsComponents.JBossToolsFeatureNames.SEAM.getComponentName(), + JBossToolsComponents.JBossToolsFeatureNames.SMOOKS.getComponentName())); + assertFalse(componentIds.contains(JBossToolsComponents.JBossToolsFeatureNames.USAGE.getComponentName())); + } + + @Test + public void reportsAS() { Collection<String> componentIds = JBossToolsComponents.getComponentIds( new IBundleGroupProvider[] { - new BundleGroupProviderFake("org.jboss.tools.gwt.feature") + new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureNames.GWT.getFeatureName()) , new BundleGroupProviderFake( "rubbish", - "org.jboss.tools.seam.feature") - , new BundleGroupProviderFake("org.jboss.tools.smooks.feature") + JBossToolsComponents.JBossToolsFeatureNames.SEAM.getFeatureName()) + , new BundleGroupProviderFake( + "org.jboss.tools.as.feature.badname") + , new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureNames.AS.getFeatureName()) , 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())); + JBossToolsComponents.JBossToolsFeatureNames.AS.getComponentName())); } + + @Test + public void reportsAllFeaturesThatDoNotStartWith_org_jboss_tools() { + Collection<String> componentIds = JBossToolsComponents.getComponentIds( + new IBundleGroupProvider[] { + new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureNames.GWT.getFeatureName()), + new BundleGroupProviderFake( + "rubbish", + JBossToolsComponents.JBossToolsFeatureNames.SEAM.getFeatureName()), + new BundleGroupProviderFake("org.jboss.tools.as.feature.badname"), + new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureNames.AS.getFeatureName()), + new BundleGroupProviderFake("org.jboss.tools.usage.feature.bandname"), + new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureNames.HIBERNATETOOLS.getFeatureName()), + new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureNames.DROOLS.getFeatureName()), + new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureNames.FREEMARKER.getFeatureName()), + new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureNames.XULRUNNER.getFeatureName()) + }); + + assertThat(componentIds, JUnitMatchers.hasItems( + JBossToolsComponents.JBossToolsFeatureNames.AS.getComponentName())); + } }