Author: adietish Date: 2010-09-22 11:13:25 -0400 (Wed, 22 Sep 2010) New Revision: 25095 Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossToolsComponents.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsComponentsTest.java Log: [JBIDE-7035] checked against bundle-group name instead of bundle-group identifier! no components were detected and reported. Fixed now 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-22 14:16:37 UTC (rev 25094) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossToolsComponents.java 2010-09-22 15:13:25 UTC (rev 25095) @@ -40,7 +40,7 @@ * </p> * */ - public enum JBossToolsFeatureNames { + public enum JBossToolsFeatureIdentifiers { AS("org.jboss.ide.eclipse.as.feature"), ARCHIVES("org.jboss.ide.eclipse.archives.feature"), BIRT("org.jboss.tools.birt.feature"), @@ -73,10 +73,10 @@ WS("org.jboss.tools.ws.feature"), XULRUNNER("org.mozilla.xulrunner.feature"); - private String featureName; + private String featureIdentifier; - JBossToolsFeatureNames(String featureName) { - this.featureName = featureName; + JBossToolsFeatureIdentifiers(String featureIdentifier) { + this.featureIdentifier = featureIdentifier; } /** @@ -89,7 +89,7 @@ * @return <tt>true</tt>, if the given bundle */ public boolean matches(IBundleGroup bundleGroup) { - return featureName.equals(bundleGroup.getName()); + return featureIdentifier.equals(bundleGroup.getIdentifier()); } public String getComponentName() { @@ -97,7 +97,7 @@ } public String getFeatureName() { - return featureName; + return featureIdentifier; } } @@ -151,9 +151,9 @@ } public boolean matches(IBundleGroup bundleGroup) { - for (JBossToolsFeatureNames featureName : JBossToolsFeatureNames.values()) { - if (featureName.matches(bundleGroup)) { - this.componentNames.add(featureName.getComponentName()); + for (JBossToolsFeatureIdentifiers featureIdentifier : JBossToolsFeatureIdentifiers.values()) { + if (featureIdentifier.matches(bundleGroup)) { + this.componentNames.add(featureIdentifier.getComponentName()); return true; } } 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-22 14:16:37 UTC (rev 25094) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsComponentsTest.java 2010-09-22 15:13:25 UTC (rev 25095) @@ -28,56 +28,56 @@ Collection<String> componentIds = JBossToolsComponents .getComponentIds( new IBundleGroupProvider[] { - new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureNames.GWT.getFeatureName()), + new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureIdentifiers.GWT.getFeatureName()), new BundleGroupProviderFake( - JBossToolsComponents.JBossToolsFeatureNames.SEAM.getFeatureName(), "rubbish"), - new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureNames.SMOOKS.getFeatureName()), + JBossToolsComponents.JBossToolsFeatureIdentifiers.SEAM.getFeatureName(), "rubbish"), + new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureIdentifiers.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())); + JBossToolsComponents.JBossToolsFeatureIdentifiers.GWT.getComponentName(), + JBossToolsComponents.JBossToolsFeatureIdentifiers.SEAM.getComponentName(), + JBossToolsComponents.JBossToolsFeatureIdentifiers.SMOOKS.getComponentName())); + assertFalse(componentIds.contains(JBossToolsComponents.JBossToolsFeatureIdentifiers.USAGE.getComponentName())); } @Test public void reportsAS() { Collection<String> componentIds = JBossToolsComponents.getComponentIds( new IBundleGroupProvider[] { - new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureNames.GWT.getFeatureName()) + new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureIdentifiers.GWT.getFeatureName()) , new BundleGroupProviderFake( "rubbish", - JBossToolsComponents.JBossToolsFeatureNames.SEAM.getFeatureName()) + JBossToolsComponents.JBossToolsFeatureIdentifiers.SEAM.getFeatureName()) , new BundleGroupProviderFake( "org.jboss.tools.as.feature.badname") - , new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureNames.AS.getFeatureName()) + , new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureIdentifiers.AS.getFeatureName()) , new BundleGroupProviderFake("org.jboss.tools.usage.feature.bandname") }); assertThat(componentIds, JUnitMatchers.hasItems( - JBossToolsComponents.JBossToolsFeatureNames.AS.getComponentName())); + JBossToolsComponents.JBossToolsFeatureIdentifiers.AS.getComponentName())); } @Test public void reportsAllFeaturesThatDoNotStartWith_org_jboss_tools() { Collection<String> componentIds = JBossToolsComponents.getComponentIds( new IBundleGroupProvider[] { - new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureNames.GWT.getFeatureName()), + new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureIdentifiers.GWT.getFeatureName()), new BundleGroupProviderFake( "rubbish", - JBossToolsComponents.JBossToolsFeatureNames.SEAM.getFeatureName()), + JBossToolsComponents.JBossToolsFeatureIdentifiers.SEAM.getFeatureName()), new BundleGroupProviderFake("org.jboss.tools.as.feature.badname"), - new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureNames.AS.getFeatureName()), + new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureIdentifiers.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()) + new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureIdentifiers.HIBERNATETOOLS.getFeatureName()), + new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureIdentifiers.DROOLS.getFeatureName()), + new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureIdentifiers.FREEMARKER.getFeatureName()), + new BundleGroupProviderFake(JBossToolsComponents.JBossToolsFeatureIdentifiers.XULRUNNER.getFeatureName()) }); assertThat(componentIds, JUnitMatchers.hasItems( - JBossToolsComponents.JBossToolsFeatureNames.AS.getComponentName())); + JBossToolsComponents.JBossToolsFeatureIdentifiers.AS.getComponentName())); } }