Author: adietish Date: 2010-09-14 05:37:58 -0400 (Tue, 14 Sep 2010) New Revision: 24909 Added: trunk/usage/tests/org.jboss.tools.usage.test/JBossComponentsTest.launch trunk/usage/tests/org.jboss.tools.usage.test/ReportingEclipseEnvironmentTest.launch 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/ReportingEclipseEnvironmentTest.java Modified: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageRequestsTest.launch trunk/usage/tests/org.jboss.tools.usage.test/META-INF/MANIFEST.MF trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseUserAgentTest.java Log: [JBIDE-7035] implemented & tested Added: trunk/usage/tests/org.jboss.tools.usage.test/JBossComponentsTest.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/JBossComponentsTest.launch (rev 0) +++ trunk/usage/tests/org.jboss.tools.usage.test/JBossComponentsTest.launch 2010-09-14 09:37:58 UTC (rev 24909) @@ -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/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> Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/JBossComponentsTest.launch ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageRequestsTest.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageRequestsTest.launch 2010-09-14 09:37:06 UTC (rev 24908) +++ trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageRequestsTest.launch 2010-09-14 09:37:58 UTC (rev 24909) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?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"/> @@ -21,8 +21,8 @@ <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"/> -<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> </listAttribute> <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> @@ -36,8 +36,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="javax.transaction@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.hamcrest.core@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.common@default:default,org.eclipse.text@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.contenttype@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.jface.databinding@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.expressions@default:default,org.junit4@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse! .ui.workbench@default:default,org.eclipse.jface.text@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.transforms.hook@default:false,com.ibm.icu@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.ui.views@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.equinox.security.macosx@default:false,org.eclipse.swt@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.help@default:default,org.eclipse.osgi,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.filesystem@default:default,! org.eclipse.ecf@default:default,org.eclipse.core.databinding@d! efault:d efault,org.eclipse.core.jobs@default:default,org.eclipse.ant.core@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.ui@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ui.ide@default:default,org.eclipse.jface@default:default,javax.servlet@default:default,org.eclipse.osgi.services@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.app@default:default,org.eclipse.equinox.p2.jarprocessor@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.jface.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.text@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ant.core@default:default,org.eclipse.ui@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.databinding.property@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.contenttype@default:default,org.ecli! pse.jface.text@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.help@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.hamcrest.core@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.ui.views@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.variables@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ecf.provider.filetransfer@def! ault:default,org.eclipse.core.jobs@default:default,org.eclipse! .equinox .security@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ui.cocoa@default:false,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.gwt.ui@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.common.model@default:default,org.jboss.tools.gwt.core@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.jboss.tools.common@default:default"/> <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/META-INF/MANIFEST.MF =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/META-INF/MANIFEST.MF 2010-09-14 09:37:06 UTC (rev 24908) +++ trunk/usage/tests/org.jboss.tools.usage.test/META-INF/MANIFEST.MF 2010-09-14 09:37:58 UTC (rev 24909) @@ -7,6 +7,6 @@ Require-Bundle: org.jboss.tools.usage;bundle-version="1.0.0", org.eclipse.osgi;bundle-version="3.5.2", org.eclipse.core.runtime;bundle-version="3.5.0", - org.junit4;bundle-version="4.0.0" + org.junit4;bundle-version="[4.8.1,5.0.0)" Bundle-Activator: org.jboss.tools.usage.test.JBossToolsUsageTestActivator Bundle-ActivationPolicy: lazy Added: trunk/usage/tests/org.jboss.tools.usage.test/ReportingEclipseEnvironmentTest.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/ReportingEclipseEnvironmentTest.launch (rev 0) +++ trunk/usage/tests/org.jboss.tools.usage.test/ReportingEclipseEnvironmentTest.launch 2010-09-14 09:37:58 UTC (rev 24909) @@ -0,0 +1,45 @@ +<?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/ReportingEclipseEnvironmentTest.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.ReportingEclipseEnvironmentTest"/> +<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"/> +<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/ReportingEclipseEnvironmentTest.launch ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseUserAgentTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseUserAgentTest.java 2010-09-14 09:37:06 UTC (rev 24908) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseUserAgentTest.java 2010-09-14 09:37:58 UTC (rev 24909) @@ -69,30 +69,6 @@ assertOs("Windows", "Windows NT " + EclipseUserAgentFake.WIN7_VERSION, userAgent); } - @Test - public void testKeyword() { - AbstractEclipseEnvironment eclipseEnvironment = new ReportingEclipseEnvironmentFake() { - @Override - protected Bundle[] getBundles() { - return new Bundle[] { - new BundleSymbolicNameFake("org.jboss.tools.seam.ui"), - new BundleSymbolicNameFake("org.jboss.tools.seam.core"), - new BundleSymbolicNameFake("org.jboss.tools.gwt.ui"), - new BundleSymbolicNameFake("org.jboss.tools.gwt.core"), - new BundleSymbolicNameFake("org.jboss.tools.smooks.core"), - new BundleSymbolicNameFake("org.eclipse.core.runtime"), - }; - } - }; - String keyword = eclipseEnvironment.getKeyword(); - - Matcher matcher = Pattern.compile("(([A-Z]+)-){3}").matcher(keyword); - assertTrue(matcher.matches()); - assertTrue(keyword.indexOf(JBossComponents.BundleGroup.GWT.name()) >= 0); - assertTrue(keyword.indexOf(JBossComponents.BundleGroup.SEAM.name()) >= 0); - assertTrue(keyword.indexOf(JBossComponents.BundleGroup.SMOOKS.name()) >= 0); - } - private void assertApplicationNameAndVersion(String applicationName, String applicationVersion, String userAgent) { Matcher matcher = Pattern.compile("([a-zA-Z\\.]+)/([0-9\\.]+).+").matcher(userAgent); assertTrue(matcher.matches()); @@ -116,122 +92,6 @@ assertEquals(language, matcher.group(1)); } - private class BundleSymbolicNameFake implements Bundle { - - private String symbolicName; - - public BundleSymbolicNameFake(String symbolicName) { - this.symbolicName = symbolicName; - } - - public Enumeration<?> findEntries(String path, String filePattern, boolean recurse) { - throw new UnsupportedOperationException(); - } - - public BundleContext getBundleContext() { - throw new UnsupportedOperationException(); - } - - public long getBundleId() { - throw new UnsupportedOperationException(); - } - - public URL getEntry(String path) { - throw new UnsupportedOperationException(); - } - - public Enumeration<?> getEntryPaths(String path) { - throw new UnsupportedOperationException(); - } - - public Dictionary<?, ?> getHeaders() { - throw new UnsupportedOperationException(); - } - - public Dictionary<?, ?> getHeaders(String locale) { - throw new UnsupportedOperationException(); - } - - public long getLastModified() { - throw new UnsupportedOperationException(); - } - - public String getLocation() { - throw new UnsupportedOperationException(); - } - - public ServiceReference[] getRegisteredServices() { - throw new UnsupportedOperationException(); - } - - public URL getResource(String name) { - throw new UnsupportedOperationException(); - } - - public Enumeration<?> getResources(String name) throws IOException { - throw new UnsupportedOperationException(); - } - - public ServiceReference[] getServicesInUse() { - throw new UnsupportedOperationException(); - } - - public Map<?, ?> getSignerCertificates(int signersType) { - throw new UnsupportedOperationException(); - } - - public int getState() { - throw new UnsupportedOperationException(); - } - - public String getSymbolicName() { - return this.symbolicName; - } - - public Version getVersion() { - throw new UnsupportedOperationException(); - - } - - public boolean hasPermission(Object permission) { - throw new UnsupportedOperationException(); - - } - - public Class<?> loadClass(String name) throws ClassNotFoundException { - throw new UnsupportedOperationException(); - } - - public void start() throws BundleException { - throw new UnsupportedOperationException(); - - } - - public void start(int options) throws BundleException { - throw new UnsupportedOperationException(); - } - - public void stop() throws BundleException { - throw new UnsupportedOperationException(); - } - - public void stop(int options) throws BundleException { - throw new UnsupportedOperationException(); - } - - public void uninstall() throws BundleException { - throw new UnsupportedOperationException(); - } - - public void update() throws BundleException { - throw new UnsupportedOperationException(); - } - - public void update(InputStream input) throws BundleException { - throw new UnsupportedOperationException(); - } - } - @Test public void testVisitsOnFirstVisit() { EclipsePreferencesFake preferences = new EclipsePreferencesFake(); Added: 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 (rev 0) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossComponentsTest.java 2010-09-14 09:37:58 UTC (rev 24909) @@ -0,0 +1,78 @@ +package org.jboss.tools.usage.test; + +import static org.junit.Assert.assertThat; + +import java.util.Collection; + +import org.eclipse.core.runtime.IBundleGroup; +import org.eclipse.core.runtime.IBundleGroupProvider; +import org.jboss.tools.usage.reporting.JBossComponents; +import org.junit.Test; +import org.junit.matchers.JUnitMatchers; +import org.osgi.framework.Bundle; + +public class JBossComponentsTest { + + @Test + public void reportedComponentsListIsComplete() { + Collection<String> componentIds = JBossComponents.getComponentIds(getBundleGroupProviders()); + + assertThat(componentIds, JUnitMatchers.hasItems( + JBossComponents.JBossToolsFeatureNames.GWT.name(), + JBossComponents.JBossToolsFeatureNames.SEAM.name(), + JBossComponents.JBossToolsFeatureNames.SMOOKS.name())); + } + + protected IBundleGroupProvider[] getBundleGroupProviders() { + return new IBundleGroupProvider[] { new IBundleGroupProvider() { + + public String getName() { + return "bundleGroupProviderFake"; + } + + public IBundleGroup[] getBundleGroups() { + return new IBundleGroup[] { + new BundleGroupFake("org.jboss.tools.usage") + }; + } + } + }; + } + + + private class BundleGroupFake implements IBundleGroup { + private String name; + + private BundleGroupFake(String name) { + this.name = name; + } + + public String getIdentifier() { + throw new UnsupportedOperationException(); + } + + public String getName() { + return name; + } + + public String getVersion() { + throw new UnsupportedOperationException(); + } + + public String getDescription() { + throw new UnsupportedOperationException(); + } + + public String getProviderName() { + throw new UnsupportedOperationException(); + } + + public Bundle[] getBundles() { + throw new UnsupportedOperationException(); + } + + public String getProperty(String key) { + throw new UnsupportedOperationException(); + } + } +} Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossComponentsTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: 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 (rev 0) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/ReportingEclipseEnvironmentTest.java 2010-09-14 09:37:58 UTC (rev 24909) @@ -0,0 +1,114 @@ +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.IBundleGroup; +import org.eclipse.core.runtime.IBundleGroupProvider; +import org.jboss.tools.usage.googleanalytics.eclipse.AbstractEclipseEnvironment; +import org.jboss.tools.usage.reporting.JBossComponents; +import org.junit.Test; +import org.osgi.framework.Bundle; + +public class ReportingEclipseEnvironmentTest { + + @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(JBossComponents.JBossToolsFeatureNames.GWT.name()) >= 0); + assertTrue(keyword.indexOf(JBossComponents.JBossToolsFeatureNames.SEAM.name()) >= 0); + assertTrue(keyword.indexOf(JBossComponents.JBossToolsFeatureNames.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); + } + + private static class BundleGroupProviderFake implements IBundleGroupProvider { + + private String[] featureNames; + + public BundleGroupProviderFake(String... featureNames) { + this.featureNames = featureNames; + } + + public String getName() { + throw new UnsupportedOperationException(); + } + + public IBundleGroup[] getBundleGroups() { + IBundleGroup[] bundleGroups = new IBundleGroup[featureNames.length]; + for (int i = 0; i < featureNames.length; i++) { + bundleGroups[i] = createBundleGroup(featureNames[i]); + } + return bundleGroups; + } + + private IBundleGroup createBundleGroup(final String name) { + return new IBundleGroup() { + + public String getVersion() { + throw new UnsupportedOperationException(); + } + + public String getProviderName() { + throw new UnsupportedOperationException(); + } + + public String getProperty(String key) { + throw new UnsupportedOperationException(); + } + + public String getName() { + return name; + } + + public String getIdentifier() { + throw new UnsupportedOperationException(); + } + + public String getDescription() { + throw new UnsupportedOperationException(); + + } + + public Bundle[] getBundles() { + throw new UnsupportedOperationException(); + } + }; + } + + } +} Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/ReportingEclipseEnvironmentTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain