[jbosstools-commits] JBoss Tools SVN: r24928 - in trunk/usage: plugins/org.jboss.tools.usage/src/org/jboss/tools/usage and 5 other directories.

Author: adietish Date: 2010-09-15 05:44:40 -0400 (Wed, 15 Sep 2010) New Revision: 24928 Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/JBossToolsFocusPoint.java trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsFocusPointTest.launch trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPointTest.java Modified: trunk/usage/plugins/org.jboss.tools.usage/build.properties trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/FocusPoint.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/HttpEncodingUtils.java trunk/usage/tests/org.jboss.tools.usage.test/FocusPointTest.launch trunk/usage/tests/org.jboss.tools.usage.test/build.properties trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsTestsFocusPoint.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java Log: [JBIDE-7041] implemented and tested, cleaned the warnings (build.properties, etc.) Modified: trunk/usage/plugins/org.jboss.tools.usage/build.properties =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/build.properties 2010-09-15 07:08:37 UTC (rev 24927) +++ trunk/usage/plugins/org.jboss.tools.usage/build.properties 2010-09-15 09:44:40 UTC (rev 24928) @@ -1,7 +1,6 @@ source.. = src/ output.. = bin/ bin.includes = .,\ - plugin.properties.bak,\ OSGI-INF/l10n/bundle.properties,\ .classpath,\ .project,\ @@ -13,16 +12,7 @@ plugin.xml,\ pom.xml,\ src/ -src.includes = .classpath,\ - .project,\ - .settings/,\ - JBoss Usage Reporter.launch,\ - META-INF/,\ +src.includes = JBoss Usage Reporter.launch,\ about.html,\ - build.properties,\ - plugin.xml,\ - src/,\ - plugin.properties.bak,\ - pom.xml,\ - plugin.properties,\ - OSGI-INF/ + pom.xml + Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/FocusPoint.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/FocusPoint.java 2010-09-15 07:08:37 UTC (rev 24927) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/FocusPoint.java 2010-09-15 09:44:40 UTC (rev 24928) @@ -45,13 +45,13 @@ return childFocusPoint; } - public String getContentURI() { + public String getURI() { StringBuilder builder = new StringBuilder(); appendContentURI(builder, this); return HttpEncodingUtils.checkedEncodeUtf8(builder.toString()); } - private void appendContentURI(StringBuilder builder, FocusPoint focusPoint) { + protected void appendContentURI(StringBuilder builder, FocusPoint focusPoint) { FocusPoint parentFocuPoint = focusPoint.getChild(); builder.append(URI_SEPARATOR); builder.append(focusPoint.getName()); @@ -60,13 +60,13 @@ } } - public String getContentTitle() { + public String getTitle() { StringBuilder builder = new StringBuilder(); appendContentTitle(builder, this); return HttpEncodingUtils.checkedEncodeUtf8(builder.toString()); } - private void appendContentTitle(StringBuilder builder, FocusPoint focusPoint) { + protected void appendContentTitle(StringBuilder builder, FocusPoint focusPoint) { FocusPoint childFocusPoint = focusPoint.getChild(); builder.append(focusPoint.getName()); if (childFocusPoint != null) { Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/JBossToolsFocusPoint.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/JBossToolsFocusPoint.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/JBossToolsFocusPoint.java 2010-09-15 09:44:40 UTC (rev 24928) @@ -0,0 +1,50 @@ +/******************************************************************************* + * 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; + +import org.jboss.tools.usage.internal.JBossToolsUsageActivator; +import org.jboss.tools.usage.util.HttpEncodingUtils; + +/** + * A focus point that always reports the current jboss tools version as last + * component. + */ +public class JBossToolsFocusPoint extends FocusPoint { + + public JBossToolsFocusPoint(String name) { + super(name); + } + + @Override + public String getURI() { + StringBuilder builder = new StringBuilder(); + appendContentURI(builder, this); + appendJBossToolsVersion(builder, URI_SEPARATOR); + return HttpEncodingUtils.checkedEncodeUtf8(builder.toString()); + } + + protected void appendJBossToolsVersion(StringBuilder builder, String separator) { + builder.append(separator); + builder.append(getJBossToolsVersion()); + } + + @Override + public String getTitle() { + StringBuilder builder = new StringBuilder(); + appendContentTitle(builder, this); + appendJBossToolsVersion(builder, TITLE_SEPARATOR); + return HttpEncodingUtils.checkedEncodeUtf8(builder.toString()); + } + + protected String getJBossToolsVersion() { + return JBossToolsUsageActivator.getDefault().getBundle().getVersion().toString(); + } +} Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/JBossToolsFocusPoint.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java 2010-09-15 07:08:37 UTC (rev 24927) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java 2010-09-15 09:44:40 UTC (rev 24928) @@ -37,7 +37,7 @@ public void trackSynchronously(FocusPoint focusPoint) { loggingAdapter - .logMessage(MessageFormat.format(UsageMessages.Tracker_Synchronous, focusPoint.getContentTitle())); + .logMessage(MessageFormat.format(UsageMessages.Tracker_Synchronous, focusPoint.getTitle())); try { httpRequest.request(getTrackingUrl(focusPoint)); } catch (Exception e) { @@ -51,7 +51,7 @@ public void trackAsynchronously(FocusPoint focusPoint) { loggingAdapter.logMessage(MessageFormat - .format(UsageMessages.Tracker_Asynchronous, focusPoint.getContentTitle())); + .format(UsageMessages.Tracker_Asynchronous, focusPoint.getTitle())); new Thread(new TrackingRunnable(focusPoint)).start(); } Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-09-15 07:08:37 UTC (rev 24927) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-09-15 09:44:40 UTC (rev 24928) @@ -109,12 +109,12 @@ builder); appendParameter(IGoogleAnalyticsParameters.PARAM_BROWSER_LANGUAGE, googleParameters.getBrowserLanguage(), builder); - appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_TITLE, focusPoint.getContentTitle(), builder); + appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_TITLE, focusPoint.getTitle(), builder); // appendParameter(IGoogleAnalyticsParameters.PARAM_HID, // getRandomNumber(), builder); appendParameter(IGoogleAnalyticsParameters.PARAM_FLASH_VERSION, googleParameters.getFlashVersion(), builder); appendParameter(IGoogleAnalyticsParameters.PARAM_REFERRAL, googleParameters.getReferral(), builder); - appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_REQUEST, focusPoint.getContentURI(), builder); + appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_REQUEST, focusPoint.getURI(), builder); appendParameter(IGoogleAnalyticsParameters.PARAM_ACCOUNT_NAME, googleParameters.getAccountName(), builder); appendParameter(IGoogleAnalyticsParameters.PARAM_COOKIES, getCookies(), builder); Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-09-15 07:08:37 UTC (rev 24927) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-09-15 09:44:40 UTC (rev 24928) @@ -23,6 +23,7 @@ import org.jboss.tools.usage.ILoggingAdapter; import org.jboss.tools.usage.ITracker; import org.jboss.tools.usage.IURLBuildingStrategy; +import org.jboss.tools.usage.JBossToolsFocusPoint; import org.jboss.tools.usage.PluginLogger; import org.jboss.tools.usage.Tracker; import org.jboss.tools.usage.googleanalytics.GoogleAnalyticsUrlStrategy; @@ -44,7 +45,7 @@ private static final String HOST_NAME = ReportingMessages.UsageReport_HostName; - private FocusPoint focusPoint = new FocusPoint("tools") //$NON-NLS-1$ + private FocusPoint focusPoint = new JBossToolsFocusPoint("tools") //$NON-NLS-1$ .setChild(new FocusPoint("usage") //$NON-NLS-1$ .setChild(new FocusPoint("action") //$NON-NLS-1$ .setChild(new FocusPoint("wsstartup")))); //$NON-NLS-1$ Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/HttpEncodingUtils.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/HttpEncodingUtils.java 2010-09-15 07:08:37 UTC (rev 24927) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/HttpEncodingUtils.java 2010-09-15 09:44:40 UTC (rev 24928) @@ -33,11 +33,11 @@ * @return the encoded string or <tt>null</tt> if an error occured while * encoding */ - public static String checkedEncodeUtf8(String aString) { + public static String checkedEncodeUtf8(String string) { try { - return URLEncoder.encode(aString, ENCODING_UTF8); + return URLEncoder.encode(string, ENCODING_UTF8); } catch (UnsupportedEncodingException e) { - return aString; + return string; } } Modified: trunk/usage/tests/org.jboss.tools.usage.test/FocusPointTest.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/FocusPointTest.launch 2010-09-15 07:08:37 UTC (rev 24927) +++ trunk/usage/tests/org.jboss.tools.usage.test/FocusPointTest.launch 2010-09-15 09:44:40 UTC (rev 24928) @@ -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,14 +21,14 @@ <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"/> <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> -<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.5"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.usage.test.FocusPointTest"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.usage.test"/> @@ -36,10 +36,11 @@ <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="com.jboss.jbds.product.product"/> <booleanAttribute key="run_in_ui_thread" value="false"/> -<stringAttribute key="selected_target_plugins" value="org.eclipse.help@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.resources@default:default,org.eclipse.ui.ide@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.ui.views@default:default,org.eclipse.core.expressions@default:default,org.eclipse.swt@default:default,org.eclipse.osgi.services@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.equinox.preferences@default:default,org.junit4@default:default,javax.servlet@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.databinding@default:default,org.hamcrest.core@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ecf.identity@default:defaul! t,org.eclipse.equinox.p2.repository@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.security.macosx@default:false,org.eclipse.ant.core@default:default,org.eclipse.ui.forms@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.variables@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.text@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.filesystem@default:default,javax.transaction@default:false,org.eclipse.ecf.ssl@default:false,com.ibm.icu@default:default,org.eclipse.ui@default:default,org.eclipse.ui.co! coa@default:false,org.eclipse.equinox.app@default:default,org.! eclipse. jface.databinding@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.jface.text@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.usage.test@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.junit4@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.net@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.swt@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ant.core@default:default,org.eclipse.ui.views@default:default,org.eclipse.text@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.equinox.common@2:true,org.eclipse.core.runtime@default:true,org.eclipse.equinox.p2.core@default:default,org.eclipse.ecf@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.! equinox.p2.metadata@default:default,javax.servlet@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.app@default:default,org.hamcrest.core@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.resources@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.help@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.ui.forms@default:default,com.ibm.icu@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.filesyste! m.macosx@default:false,org.eclipse.core.variables@default:defa! ult,org. eclipse.osgi@-1:true,org.eclipse.core.databinding@default:default,org.eclipse.jface@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.commands@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.gwt.core@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.jboss.tools.gwt.ui@default:default,org.jboss.tools.usage.test@default:default,org.jboss.tools.common@default:default,org.jboss.tools.usage@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <booleanAttribute key="tracing" value="false"/> +<booleanAttribute key="useCustomFeatures" value="false"/> <booleanAttribute key="useDefaultConfig" value="true"/> <booleanAttribute key="useDefaultConfigArea" value="true"/> <booleanAttribute key="useProduct" value="false"/> Added: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsFocusPointTest.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsFocusPointTest.launch (rev 0) +++ trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsFocusPointTest.launch 2010-09-15 09:44:40 UTC (rev 24928) @@ -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/JBossToolsFocusPointTest.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.JBossToolsFocusPointTest"/> +<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.junit4@default:default,org.eclipse.core.expressions@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.swt@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.equinox.common@2:true,org.eclipse.core.runtime@default:true,org.eclipse.ui.workbench@default:default,javax.servlet@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.app@default:default,org.hamcrest.core@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.help@default:default,org.eclipse.equinox.registry@default:default,com.ibm.icu@default:default,org.eclip! se.osgi.services@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.osgi@-1:true,org.eclipse.core.databinding@default:default,org.eclipse.jface@default:default,org.eclipse.core.commands@default:default,org.eclipse.ui@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.xulrunner.initializer@default:false,org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/> +<booleanAttribute key="show_selected_only" value="false"/> +<booleanAttribute key="tracing" value="false"/> +<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useDefaultConfig" value="true"/> +<booleanAttribute key="useDefaultConfigArea" value="false"/> +<booleanAttribute key="useProduct" value="false"/> +</launchConfiguration> Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsFocusPointTest.launch ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/tests/org.jboss.tools.usage.test/build.properties =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/build.properties 2010-09-15 07:08:37 UTC (rev 24927) +++ trunk/usage/tests/org.jboss.tools.usage.test/build.properties 2010-09-15 09:44:40 UTC (rev 24928) @@ -5,22 +5,15 @@ about.html,\ bin/,\ OSGI-INF/l10n/bundle.properties -src.includes = .settings/,\ - .project,\ - .classpath,\ - EclipseEnvironmentTest.launch,\ +src.includes = EclipseEnvironmentTest.launch,\ FocusPointTest.launch,\ GoogleAnalyticsUrlStrategyTest.launch,\ - JBossToolsUsageTest.launch,\ JBossToolsUsageRequestsTest.launch,\ - META-INF/,\ about.html,\ - build.properties,\ src/,\ GlobalUsageReportingSettingsTest.launch,\ JBossToolsUsageIntegrationTest.launch,\ UsageTestSuite.launch,\ pom.xml,\ JBossToolsComponentsTest.launch,\ - ReportingEclipseEnvironmentTest.launch,\ - OSGI-INF/ + ReportingEclipseEnvironmentTest.launch Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java 2010-09-15 07:08:37 UTC (rev 24927) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java 2010-09-15 09:44:40 UTC (rev 24928) @@ -10,49 +10,55 @@ ******************************************************************************/ package org.jboss.tools.usage.test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import org.jboss.tools.usage.FocusPoint; import org.jboss.tools.usage.util.HttpEncodingUtils; +import org.junit.Test; -import junit.framework.TestCase; - /** * @author Andre Dietisheim */ -public class FocusPointTest extends TestCase { +public class FocusPointTest { - private static final String root = "root"; + private static final String ROOT = "root"; - private static final String child1 = "child1"; + private static final String CHILD1 = "child1"; private static final String URI_SEPARATOR_ENCODED = HttpEncodingUtils.checkedEncodeUtf8(FocusPoint.URI_SEPARATOR); private static final String TITLE_SEPARATOR_ENCODED = HttpEncodingUtils.checkedEncodeUtf8(FocusPoint.TITLE_SEPARATOR); + @Test public void testGetContentURI_Simple() throws Exception { - FocusPoint focusPoint = new FocusPoint(root); - String contentURI = focusPoint.getContentURI(); + FocusPoint focusPoint = new FocusPoint(ROOT); + String contentURI = focusPoint.getURI(); assertNotNull(contentURI); - assertEquals(URI_SEPARATOR_ENCODED + root, contentURI); + assertEquals(URI_SEPARATOR_ENCODED + ROOT, contentURI); } + @Test public void testGetContentURI_OneLevel() throws Exception { - FocusPoint focusPoint = new FocusPoint(root).setChild(new FocusPoint(child1)); - String contentURI = focusPoint.getContentURI(); + FocusPoint focusPoint = new FocusPoint(ROOT).setChild(new FocusPoint(CHILD1)); + String contentURI = focusPoint.getURI(); assertNotNull(contentURI); - assertEquals(URI_SEPARATOR_ENCODED + root + URI_SEPARATOR_ENCODED + child1, contentURI); + assertEquals(URI_SEPARATOR_ENCODED + ROOT + URI_SEPARATOR_ENCODED + CHILD1, contentURI); } + @Test public void testGetContentTitle_Simple() throws Exception { - FocusPoint focusPoint = new FocusPoint(root); - String contentTitle = focusPoint.getContentTitle(); + FocusPoint focusPoint = new FocusPoint(ROOT); + String contentTitle = focusPoint.getTitle(); assertNotNull(contentTitle); - assertEquals(root, contentTitle); + assertEquals(ROOT, contentTitle); } + @Test public void testGetContentTitle_OneLevel() throws Exception { - FocusPoint focusPoint = new FocusPoint(root).setChild(new FocusPoint(child1)); - String contentTitle = focusPoint.getContentTitle(); + FocusPoint focusPoint = new FocusPoint(ROOT).setChild(new FocusPoint(CHILD1)); + String contentTitle = focusPoint.getTitle(); assertNotNull(contentTitle); - assertEquals(root + TITLE_SEPARATOR_ENCODED + child1, contentTitle); + assertEquals(ROOT + TITLE_SEPARATOR_ENCODED + CHILD1, contentTitle); } } Added: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPointTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPointTest.java (rev 0) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPointTest.java 2010-09-15 09:44:40 UTC (rev 24928) @@ -0,0 +1,71 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.usage.test; + +import static org.junit.Assert.*; + +import org.jboss.tools.usage.FocusPoint; +import org.jboss.tools.usage.JBossToolsFocusPoint; +import org.jboss.tools.usage.util.HttpEncodingUtils; +import org.junit.Test; + +/** + * @author Andre Dietisheim + */ +public class JBossToolsFocusPointTest { + + private static final String JBOSS_TOOLS_VERSION = "42.0.42"; + + private static final String ROOT = "root"; + + private static final String CHILD = "child"; + + private static final String URI_SEPARATOR_ENCODED = HttpEncodingUtils.checkedEncodeUtf8(FocusPoint.URI_SEPARATOR); + + private static final String TITLE_SEPARATOR_ENCODED = HttpEncodingUtils + .checkedEncodeUtf8(FocusPoint.TITLE_SEPARATOR); + + @Test + public void appendsJBossToolsVersionToTheEnd() throws Exception { + FocusPoint focusPoint = new JBossToolsFocusPointFake(ROOT) + .setChild(new FocusPoint(CHILD) + .setChild(new FocusPoint(CHILD))); + String contentURI = focusPoint.getURI(); + + assertNotNull(contentURI); + assertEquals( URI_SEPARATOR_ENCODED + + ROOT + + URI_SEPARATOR_ENCODED + + CHILD + URI_SEPARATOR_ENCODED + + CHILD + URI_SEPARATOR_ENCODED + + JBOSS_TOOLS_VERSION, contentURI); + + String title = focusPoint.getTitle(); + assertNotNull(title); + assertEquals(ROOT + + TITLE_SEPARATOR_ENCODED + + CHILD + TITLE_SEPARATOR_ENCODED + + CHILD + TITLE_SEPARATOR_ENCODED + + JBOSS_TOOLS_VERSION, title); + } + + private static class JBossToolsFocusPointFake extends JBossToolsFocusPoint { + + public JBossToolsFocusPointFake(String name) { + super(name); + } + + @Override + protected String getJBossToolsVersion() { + return JBOSS_TOOLS_VERSION; + } + } +} Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPointTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsTestsFocusPoint.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsTestsFocusPoint.java 2010-09-15 07:08:37 UTC (rev 24927) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsTestsFocusPoint.java 2010-09-15 09:44:40 UTC (rev 24928) @@ -11,11 +11,12 @@ package org.jboss.tools.usage.test; import org.jboss.tools.usage.FocusPoint; +import org.jboss.tools.usage.JBossToolsFocusPoint; /** * @author Andre Dietisheim */ -public class JBossToolsTestsFocusPoint extends FocusPoint { +public class JBossToolsTestsFocusPoint extends JBossToolsFocusPoint { public JBossToolsTestsFocusPoint(String childFocusPoint) { super("tools"); Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java 2010-09-15 07:08:37 UTC (rev 24927) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java 2010-09-15 09:44:40 UTC (rev 24928) @@ -78,6 +78,16 @@ assertEquals(3, eclipseEnvironment.getVisitCount()); } + @Test + public void urlEndsWithJBossToolsVersion() { + IGoogleAnalyticsParameters eclipseEnvironment = new ReportingEclipseEnvironmentFake(); + UrlRevealingTracker tracker = getTracker(eclipseEnvironment); + tracker.trackSynchronously(createFocusPoint("testJBossToolsVersion")); + assertEquals(2, eclipseEnvironment.getVisitCount()); + tracker.trackSynchronously(createFocusPoint("testVisitCount")); + assertEquals(3, eclipseEnvironment.getVisitCount()); + } + private String getUserId(String trackingUrl) { Pattern pattern = Pattern.compile(".+" + IGoogleAnalyticsParameters.PARAM_COOKIES_UNIQUE_VISITOR_ID + "%3D([0-9]+\\.[0-9]+)\\..+"); 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-15 07:08:37 UTC (rev 24927) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java 2010-09-15 09:44:40 UTC (rev 24928) @@ -19,6 +19,7 @@ @RunWith(Suite.class) @Suite.SuiteClasses({ FocusPointTest.class, + JBossToolsFocusPointTest.class, GoogleAnalyticsUrlStrategyTest.class, EclipseUserAgentTest.class, ReportingEclipseEnvironmentTest.class,