Author: adietish Date: 2010-09-29 13:29:19 -0400 (Wed, 29 Sep 2010) New Revision: 25299 Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/ILinuxDistro.java trunk/usage/tests/org.jboss.tools.usage.test/EclipseUserAgentTest.launch trunk/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage Reporter.launch trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/LinuxDistroTest.java Removed: trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/EclipseUserAgent.java trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsComponentsTest.launch 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/JBossToolsUsageRequestsTest.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/EclipseUserAgentFake.java Log: [JBIDE-7208] linux distribution detection added Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/EclipseUserAgent.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/EclipseUserAgent.java 2010-09-29 13:48:41 UTC (rev 25298) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/EclipseUserAgent.java 2010-09-29 17:29:19 UTC (rev 25299) @@ -95,14 +95,24 @@ } public String getOSVersion() { - return System.getProperty(PROP_OS_VERSION); + if (!Platform.OS_LINUX.equals(getOS())) { + return System.getProperty(PROP_OS_VERSION); + } else { + return getLinuxDistro(); + } } + protected String getLinuxDistro() { + for (ILinuxDistro distro : ILinuxDistro.ALL) { + if (distro.isDistro()) { + return distro.getNameAndVersion(); + } + } + return ""; + } + private String getUserAgentPattern(String os) { String userAgentPattern = ""; //$NON-NLS-1$ - /* - * TODO: implement architecture (i686, x86_64 etc.), Windows version, MacOS version etc. - */ if (Platform.OS_LINUX.equals(os)) { return USERAGENT_LINUX; //$NON-NLS-1$ } else if (Platform.OS_MACOSX.equals(os)) { @@ -140,4 +150,6 @@ return Platform.getBundle(ECLIPSE_RUNTIME_BULDEID); } } + + } Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/ILinuxDistro.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/ILinuxDistro.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/ILinuxDistro.java 2010-09-29 17:29:19 UTC (rev 25299) @@ -0,0 +1,104 @@ +/******************************************************************************* + * 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.googleanalytics.eclipse; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public interface ILinuxDistro { + + public static final ILinuxDistro DEBIAN = new LinuxDistro("Debian", "/etc/debian_version"); + public static final ILinuxDistro FEDORA = new LinuxDistro("Fedora", "/etc/fedora-release"); + public static final ILinuxDistro GENTOO = new LinuxDistro("Gentoo", "/etc/gentoo-release"); + public static final ILinuxDistro KNOPPIX = new LinuxDistro("Knoppix", "knoppix_version"); + public static final ILinuxDistro MANDRAKE = new LinuxDistro("Mandrake", "/etc/mandrake-release"); + public static final ILinuxDistro MANDRIVA = new LinuxDistro("Mandriva", "/etc/mandriva-release"); + public static final ILinuxDistro PLD = new LinuxDistro("PLD", "/etc/pld-release"); + public static final ILinuxDistro REDHAT = new LinuxDistro("RedHat", "/etc/redhat-release"); + public static final ILinuxDistro SLACKWARE = new LinuxDistro("Slackware", "/etc/slackware-version"); + public static final ILinuxDistro SUSE = new LinuxDistro("SUSE", "/etc/SuSE-release"); + public static final ILinuxDistro UBUNTU = new LinuxDistro("Ubuntu", "/etc/lsb-release"); + public static final ILinuxDistro YELLOWDOG = new LinuxDistro("YellowDog", "/etc/yellowdog-release"); + + public static final ILinuxDistro[] ALL = new ILinuxDistro[]{ + DEBIAN, + FEDORA, + GENTOO, + KNOPPIX, + MANDRAKE, + MANDRIVA, + PLD, + REDHAT, + SLACKWARE, + SUSE, + UBUNTU, + YELLOWDOG + }; + + public boolean isDistro(); + public String getName(); + public String getVersion(); + public String getNameAndVersion(); + + public class LinuxDistro implements ILinuxDistro { + + private final Pattern VERSION_REGEX = Pattern.compile("[^0-9]+([0-9.]+).*"); + + private final String releaseFilePath; + private String name; + + protected LinuxDistro(String name, String releaseFilePath) { + this.name = name; + this.releaseFilePath = releaseFilePath; + } + + public boolean isDistro() { + return new File(releaseFilePath).exists(); + } + + public String getName() { + return name; + } + + public String getVersion() { + try { + String distroString = getDistroFileContent(releaseFilePath); + Matcher matcher = VERSION_REGEX.matcher(distroString); + if (matcher.matches()) { + return matcher.group(1); + } + } catch (IOException e) { + } + return ""; + } + + public String getNameAndVersion() { + return new StringBuilder().append(getName()).append(getVersion()).toString(); + } + + protected String getDistroFileContent(String filePath) throws IOException { + int charachtersToRead = 1024; + StringBuilder builder = new StringBuilder(charachtersToRead); + BufferedReader reader = new BufferedReader(new FileReader(filePath)); + char[] buf = new char[charachtersToRead]; + int charRead = 0; + while ((charRead = reader.read(buf)) != -1 && builder.length() < charachtersToRead) { + String readData = String.valueOf(buf, 0, charRead); + builder.append(readData); + } + reader.close(); + return builder.toString(); + } + } +} Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/ILinuxDistro.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch 2010-09-29 13:48:41 UTC (rev 25298) +++ trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch 2010-09-29 17:29:19 UTC (rev 25299) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> -<booleanAttribute key="append.args" value="true"/> -<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> -<booleanAttribute key="askclear" value="false"/> -<booleanAttribute key="automaticAdd" value="true"/> -<booleanAttribute key="automaticValidate" value="false"/> -<stringAttribute key="bootstrap" value=""/> -<stringAttribute key="checked" value="[NONE]"/> -<booleanAttribute key="clearConfig" value="true"/> -<booleanAttribute key="clearws" value="true"/> -<booleanAttribute key="clearwslog" value="false"/> -<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/EclipseEnvironmentTest"/> -<booleanAttribute key="default" value="false"/> -<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/EclipseUserAgentTest.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.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.usage.test.EclipseUserAgentTest"/> -<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"/> -<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<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="org.eclipse.equinox.app@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.hamcrest.core@default:default,org.eclipse.jface@default:default,org.eclipse.ui.views@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.ui@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.ecf.identity@default:default,org.eclipse.core.net@default:default,org.eclipse.ant.core@default:default,org.eclipse.ecf@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.p2.repository@default:de! fault,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.registry@default:default,org.eclipse.ui.ide@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.variables@default:default,org.eclipse.ui.forms@default:default,javax.servlet@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding.observable@default:default,org.junit4@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.swt@default:default,org.eclipse.text@default:default,org.eclipse.jface.text@default:defaul! t,org.eclipse.ecf.provider.filetransfer@default:default,org.ec! lipse.ec f.filetransfer@default:default,com.ibm.icu@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.help@default:default,org.eclipse.equinox.p2.metadata@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.common.model@default:default,org.jboss.tools.usage.test@default:default,org.jboss.tools.common@default:default,org.eclipse.jst.j2ee.core@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.gwt.ui@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"/> -</launchConfiguration> Added: trunk/usage/tests/org.jboss.tools.usage.test/EclipseUserAgentTest.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/EclipseUserAgentTest.launch (rev 0) +++ trunk/usage/tests/org.jboss.tools.usage.test/EclipseUserAgentTest.launch 2010-09-29 17:29:19 UTC (rev 25299) @@ -0,0 +1,47 @@ +<?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/EclipseEnvironmentTest"/> +<booleanAttribute key="default" value="false"/> +<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/EclipseUserAgentTest.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.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.usage.test.EclipseUserAgentTest"/> +<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"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<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="org.eclipse.equinox.common@2:true,org.eclipse.core.commands@default:default,org.eclipse.core.databinding@default:default,org.eclipse.help@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.jface.text@default:default,org.eclipse.core.databinding.property@default:default,org.hamcrest.core@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.p2.engine@default:! default,org.eclipse.equinox.app@default:default,org.eclipse.jface@default:default,org.eclipse.swt@default:default,org.eclipse.ui.views@default:default,org.eclipse.ant.core@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.net@default:default,org.eclipse.ecf.identity@default:default,com.ibm.icu@default:default,org.eclipse.core.databinding.observable@default:default,javax.servlet@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.ide@default:default,org.eclipse.osgi.services@default:default,org.eclipse.core.variables@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.registry@default:default,org.junit4@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.expressions@default:default,org.eclipse.core.runtime@default:true,org.eclipse.text@default:default,org.eclipse.ui.forms@default:default! ,org.eclipse.core.resources@default:default,org.eclipse.equino! x.p2.art ifact.repository@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.concurrent@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.common@default:default,org.jboss.tools.common.ui@default:default,org.jboss.tools.common.text.xml@default:default,org.mozilla.xulrunner.gtk.linux.x86_64@default:default,org.jboss.tools.common.model.ui.capabilities@default:default,org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.common.model.ui.test@default:default,org.jboss.tools.common.verification.ui@default:default,org.jboss.tools.common.resref.ui@default:default,org.jboss.tools.common.meta.ui@default:default,org.jboss.tools.common.model.ui@default:default,org.jboss.tools.gwt.ui@default:default,org.jboss.tools.common.model@default:default,org.jboss.tools.common.gef@default:default,org.jboss.tools.common.el.core@default:default,org.mozilla.xpcom@default:default,org.jboss.tools.common.verification@default:default,org.jboss.tools.common.el.ui@default:default,org.jboss.tools.common.text.ext@default:default,! org.mozilla.xulrunner.carbon.macosx@default:default,org.jboss.tools.tests@default:default,org.jboss.tools.common.verification.test@default:default,org.jboss.tools.common.resref.core@default:default,org.mozilla.xulrunner.gtk.linux.x86@default:default,org.mozilla.xulrunner.win32.win32.x86@default:default,org.jboss.tools.gwt.core@default:default,org.jboss.tools.common.el.core.test@default:default,org.jboss.tools.common.test@default:default,org.jboss.tools.common.model.test@default:default,org.jboss.tools.common.verification.ui.test@default:default,org.mozilla.xulrunner.cocoa.macosx@default:default,org.jboss.tools.common.projecttemplates@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"/> +</launchConfiguration> Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/EclipseUserAgentTest.launch ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage Reporter.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage Reporter.launch (rev 0) +++ trunk/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage Reporter.launch 2010-09-29 17:29:19 UTC (rev 25299) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench"> +<booleanAttribute key="append.args" value="true"/> +<booleanAttribute key="askclear" value="true"/> +<booleanAttribute key="automaticAdd" value="true"/> +<booleanAttribute key="automaticValidate" value="false"/> +<stringAttribute key="bootstrap" value=""/> +<stringAttribute key="checked" value="[NONE]"/> +<booleanAttribute key="clearConfig" value="false"/> +<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearwslog" value="false"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Developer Studio Usage Reporter"/> +<booleanAttribute key="default" value="false"/> +<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.common.text.xml,org.jboss.tools.common.meta.ui,org.jboss.tools.common,org.jboss.tools.common.verification.ui.test,org.jboss.tools.common.projecttemplates,org.jboss.tools.common.el.core,org.jboss.tools.common.verification.ui,org.jboss.tools.common.gef,org.jboss.tools.common.test,org.jboss.tools.common.verification.test,org.jboss.tools.common.verification,org.jboss.tools.common.model,org.jboss.tools.gwt.ui,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.common.resref.core,org.jboss.tools.common.ui,org.jboss.tools.common.el.ui,org.jboss.tools.usage.test,org.jboss.tools.common.text.ext,org.jboss.tools.gwt.core,org.jboss.tools.common.resref.ui,org.jboss.tools.common.model.ui.test,org.jboss.tools.common.el.core.test,org.jboss.tools.common.model.ui,org.jboss.tools.tests,org.jboss.tools.common.model.test"/> +<booleanAttribute key="includeOptional" value="true"/> +<stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration(1)"/> +<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.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> +<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 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/> +<stringAttribute key="pde.version" value="3.3"/> +<stringAttribute key="product" value="com.jboss.jbds.product.product"/> +<stringAttribute key="selected_target_plugins" value="javax.activation@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.net.linux.x86_64@default:false,com.springsource.javax.servlet.jsp@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.p2.repository@default:default,javax.mail@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.common@default:default,org.eclipse.core.contenttype@default:default,org.apache.lucene@default:default,org.eclipse.core.net@default:default,org.eclipse.core.variables@default:default,com.springsource.javax.jms@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.expressions@default:default,org.eclipse.help.base@default:default,org.apache.jasper@default:default,org.eclipse.ui@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:fa! lse,ch.qos.logback.slf4j@default:false,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.jface@default:default,org.slf4j.api@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.runtime@default:true,org.eclipse.help.ui@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.osgi,org.eclipse.help@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.text@default:default,org.eclipse.core.commands@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.databinding.observable@default:default,javax.transaction@default:false,org.eclipse.ui.forms@default:default,org.eclipse.equinox.p2.metadata.r! epository@default:default,com.springsource.javax.el@default:de! fault,ch .qos.logback.core@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.preferences@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.apache.lucene.analysis@default:default,org.apache.commons.el@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.ui.workbench@default:default,com.jboss.jbds.product@default:default,org.eclipse.jface.text@default:default,org.eclipse.swt@default:default,javax.servlet.jsp@default:default,org.eclipse.ecf@default:default,ch.qos.logback.classic@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.p2.metadata@defa! ult:default,com.springsource.javax.servlet@default:default,org.eclipse.equinox.transforms.hook@default:false,org.apache.ant@default:default,com.ibm.icu@default:default,org.eclipse.equinox.http.jetty@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ui.intro@default:default,org.eclipse.jface.databinding@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default"/> +<booleanAttribute key="show_selected_only" value="false"/> +<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/> +<booleanAttribute key="tracing" value="false"/> +<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useDefaultConfig" value="true"/> +<booleanAttribute key="useDefaultConfigArea" value="true"/> +<booleanAttribute key="useProduct" value="true"/> +</launchConfiguration> Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage Reporter.launch ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch 2010-09-29 13:48:41 UTC (rev 25298) +++ trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch 2010-09-29 17:29:19 UTC (rev 25299) @@ -11,7 +11,7 @@ <booleanAttribute key="clearwslog" value="false"/> <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Tools Usage Reporter"/> <booleanAttribute key="default" value="false"/> -<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.common.text.xml,org.jboss.tools.common.meta.ui,org.jboss.tools.common,org.jboss.tools.ui.bot.ext,org.jboss.tools.common.verification.ui.test,org.jboss.tools.common.projecttemplates,org.jboss.tools.common.el.core,org.jboss.tools.common.verification.ui,org.jboss.tools.common.gef,org.jboss.tools.common.verification.test,org.jboss.tools.common.test,org.jboss.tools.common.verification,org.jboss.tools.common.model,org.jboss.tools.gwt.ui,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.common.resref.core,org.jboss.tools.common.ui,org.jboss.tools.common.el.ui,org.jboss.tools.usage.test,org.jboss.tools.common.text.ext,org.jboss.tools.gwt.core,org.jboss.tools.common.resref.ui,org.jboss.tools.common.el.core.test,org.jboss.tools.ui.bot.ext.test,org.jboss.tools.common.model.ui.test,org.jboss.tools.tests,org.jboss.tools.common.model.ui,org.jboss.tools.common.model.test"/> +<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.common.text.xml,org.jboss.tools.common.meta.ui,org.jboss.tools.ui.bot.ext,org.jboss.tools.common,org.jboss.tools.common.verification.ui.test,org.jboss.tools.common.projecttemplates,org.jboss.tools.common.el.core,org.jboss.tools.common.verification.ui,org.jboss.tools.common.gef,org.jboss.tools.common.test,org.jboss.tools.common.verification.test,org.jboss.tools.common.verification,org.jboss.tools.common.model,org.jboss.tools.gwt.ui,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.common.resref.core,org.jboss.tools.common.ui,org.jboss.tools.common.el.ui,org.jboss.tools.usage.test,org.jboss.tools.common.text.ext,org.jboss.tools.gwt.core,org.jboss.tools.common.resref.ui,org.jboss.tools.ui.bot.ext.test,org.jboss.tools.common.model.ui.test,org.jboss.tools.common.el.core.test,org.jboss.tools.common.model.ui,org.jboss.tools.tests,org.jboss.tools.common.model.test"/> <booleanAttribute key="includeOptional" value="true"/> <stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration(1)"/> <listAttribute key="org.eclipse.debug.ui.favoriteGroups"> @@ -23,7 +23,7 @@ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/> <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.sdk.ide"/> -<stringAttribute key="selected_target_plugins" value="org.eclipse.swt@default:default,org.eclipse.core.databinding.property@default:default,org.apache.commons.el@default:default,org.eclipse.jface.text@default:default,org.eclipse.help.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.sdk@default:default,org.apache.lucene@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ui.forms@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui.ide@default:default,org.eclipse.jface@default:default,org.eclipse.core.contenttype@default:default,org.junit4@default:default,org.eclipse.equinox.security@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false! ,org.eclipse.update.configurator@3:true,org.eclipse.equinox.http.servlet@default:default,org.apache.ant@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ui.views@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ui@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.osgi@-1:true,org.eclipse.core.runtime.compatibility@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.ecf.ssl@default:false,org.eclipse.osgi.services@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.mortbay.jetty.util@default:default,javax.servlet@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.preferences@default:defaul! t,org.eclipse.core.filesystem.linux.x86_64@default:false,org.e! clipse.c ore.runtime.compatibility.auth@default:default,org.apache.jasper@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.variables@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.hamcrest.core@default:default,org.eclipse.core.expressions@default:default,org.eclipse.help@default:default,org.apache.lucene.analysis@default:default,org.eclipse.core.resources@default:default,org.eclipse.help.base@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.runtime@default:true,javax.servlet.jsp@default:default,org.eclipse.ecf@default:default,org.eclipse.equin! ox.p2.metadata@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,com.ibm.icu@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.hamcrest.core@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.mortbay.jetty.server@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.contenttype@default:default,org.apache.lucene@default:default,org.eclipse.core.net@default:default,org.eclipse.core.variables@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.expressions@default:default,org.eclipse.help.base@default:default,org.apache.jasper@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.runtime.compati! bility.auth@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.jface@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.runtime@default:true,org.eclipse.help.ui@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.osgi@-1:true,org.eclipse.help@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.text@default:default,org.eclipse.core.commands@default:default,org.eclipse.osgi.services@default:default,javax.servlet@default:default,org.junit4@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ui.forms@default:default,org.eclipse.equinox.p2.metadat! a.repository@default:default,org.eclipse.sdk@default:default,o! rg.eclip se.ui.cheatsheets@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.preferences@default:default,org.apache.lucene.analysis@default:default,org.apache.commons.el@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.jface.text@default:default,org.eclipse.swt@default:default,javax.servlet.jsp@default:default,org.eclipse.ecf@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.p2.metadata@default:default,org.apache.ant@default:default,com.ibm.icu@default:default,org.eclipse.equinox.http.jetty@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.app@default:default,org.eclipse.jface.databinding@default:d! efault"/> <stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/> Modified: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsComponentsTest.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsComponentsTest.launch 2010-09-29 13:48:41 UTC (rev 25298) +++ trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsComponentsTest.launch 2010-09-29 17:29:19 UTC (rev 25299) @@ -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"/> +<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.common,org.jboss.tools.gwt.ui,org.jboss.tools.gwt.core"/> <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="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"/> +<stringAttribute key="selected_target_plugins" value="org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,javax.activation@default:default,org.hamcrest.core@default:default,org.eclipse.core.databinding@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.p2.repository@default:default,javax.mail@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.contenttype@default:default,org.apache.lucene@default:default,org.eclipse.core.net@default:default,org.eclipse.core.variables@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.expressions@default:default,org.eclipse.help.base@default:default,org.apache.jasper@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.ecf.provider.filetransfer.ssl@default:false,ch.qos.logback.slf4j! @default:false,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.jface@default:default,org.slf4j.api@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.runtime@default:true,org.eclipse.help.ui@default:default,org.eclipse.osgi@-1:true,org.eclipse.help@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.text@default:default,org.eclipse.core.commands@default:default,org.eclipse.osgi.services@default:default,javax.servlet@default:default,org.junit4@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ui.forms@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.sdk@default:default,ch.qos.logback.core@default! :default,org.eclipse.ui.cheatsheets@default:default,org.eclips! e.equino x.p2.engine@default:default,org.eclipse.equinox.preferences@default:default,org.apache.lucene.analysis@default:default,org.apache.commons.el@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.jface.text@default:default,org.eclipse.swt@default:default,javax.servlet.jsp@default:default,org.eclipse.ecf@default:default,ch.qos.logback.classic@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.p2.metadata@default:default,org.apache.ant@default:default,com.ibm.icu@default:default,org.eclipse.equinox.http.jetty@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.app@defau! lt:default,org.eclipse.jface.databinding@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.common.resref.core@default:default,org.jboss.tools.common.model@default:default,org.jboss.tools.common.verification.ui@default:default,org.jboss.tools.common.gef@default:default,org.jboss.tools.common.text.ext@default:default,org.jboss.tools.common.projecttemplates@default:default,org.jboss.tools.common.verification.test@default:default,org.jboss.tools.common.test@default:default,org.jboss.tools.common.model.test@default:default,org.jboss.tools.common.el.core@default:default,org.jboss.tools.common.el.core.test@default:default,org.jboss.tools.common.model.ui.capabilities@default:default,org.jboss.tools.common.model.ui@default:default,org.jboss.tools.common.text.xml@default:default,org.jboss.tools.common.verification@default:default,org.jboss.tools.common.model.ui.test@default:default,org.jboss.tools.common.verification.ui.t! est@default:default,org.jboss.tools.common.resref.ui@default:default,org.jboss.tools.tests@default:default,org.jboss.tools.ui.bot.ext@default:default,org.jboss.tools.common.ui@default:default,org.jboss.tools.common.meta.ui@default:default,org.jboss.tools.common.el.ui@default:default,org.jboss.tools.ui.bot.ext.test@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/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-29 13:48:41 UTC (rev 25298) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseUserAgentTest.java 2010-09-29 17:29:19 UTC (rev 25299) @@ -50,7 +50,7 @@ @Test public void testLinux() { - String userAgent = new EclipseUserAgentFake(EclipseUserAgentFake.LOCALE_US, Platform.OS_LINUX, EclipseUserAgentFake.WIN7_VERSION).toString(); + String userAgent = new EclipseUserAgentFake(EclipseUserAgentFake.LOCALE_US, Platform.OS_LINUX, EclipseUserAgentFake.LINUX_FEDORA13_VERSION).toString(); assertOs("X11", "Linux i686", userAgent); } Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-09-29 13:48:41 UTC (rev 25298) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-09-29 17:29:19 UTC (rev 25299) @@ -1193,140 +1193,339 @@ // assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); // } - @Test - public void testLinuxFedoraUserAgent() throws IOException { - TestHttpGetMethod method = new TestHttpGetMethod( - "Mozilla/5.0 (X11; U; Linux i686; th-TH; rv:1.8.1.14) Gecko/20080612 Fedora/2.0.0.14-20080612.fc8.acer Firefox/2.0.0.14"); - String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2" - + "&utmn=95830066444" - + "&utmhn=jboss.org" - + "&utmcs=UTF-8" - + "&utmsr=1920x1080" - + "&utmsc=24-bit" - + "&utmul=th-TH" - + "&utmdt=testLinuxFedoraUserAgent" - + "&utmfl=1.6.0_20" - + "&utmr=1.0.0.qualifier" - + "&utmp=" - + new JBossToolsTestsFocusPoint("testLinuxFedoraUserAgent").getURI() - + "&utmac=UA-17645367-1" - + "&utmcc=__utma%3D999.43297292388397333777722108766778.1284108997725.1284198794990.1284108794995.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B" - + "&gaq=1"; - method.request(url); - assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); - } +// @Test +// public void testLinuxFedoraUserAgent() throws IOException { +// TestHttpGetMethod method = new TestHttpGetMethod( +// "Mozilla/5.0 (X11; U; Linux i686; th-TH; rv:1.8.1.14) Gecko/20080612 Fedora/2.0.0.14-20080612.fc8.acer Firefox/2.0.0.14"); +// String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2" +// + "&utmn=95830066444" +// + "&utmhn=jboss.org" +// + "&utmcs=UTF-8" +// + "&utmsr=1920x1080" +// + "&utmsc=24-bit" +// + "&utmul=th-TH" +// + "&utmdt=testLinuxFedoraUserAgent" +// + "&utmfl=1.6.0_20" +// + "&utmr=1.0.0.qualifier" +// + "&utmp=" +// + new JBossToolsTestsFocusPoint("testLinuxFedoraUserAgent").getURI() +// + "&utmac=UA-17645367-1" +// + "&utmcc=__utma%3D999.43297292388397333777722108766778.1284108997725.1284198794990.1284108794995.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B" +// + "&gaq=1"; +// method.request(url); +// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); +// } - @Test - public void testLinuxUbuntuUserAgent() throws IOException { - TestHttpGetMethod method = new TestHttpGetMethod( - "Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) Gecko/20121223 Ubuntu/9.25 (jaunty) Firefox/3.8"); - String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2" - + "&utmn=958990044" - + "&utmhn=jboss.org" - + "&utmcs=UTF-8" - + "&utmsr=1920x1080" - + "&utmsc=24-bit" - + "&utmul=th-TH" - + "&utmdt=testLinuxUbuntuUserAgent" - + "&utmfl=1.6.0_20" - + "&utmr=1.0.0.qualifier" - + "&utmp=" - + new JBossToolsTestsFocusPoint("testLinuxUbuntuUserAgent").getURI() - + "&utmac=UA-17645367-1" - + "&utmcc=__utma%3D999.46667292388397333777722108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794225.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B" - + "&gaq=1"; - method.request(url); - assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); - } +// @Test +// public void testLinuxUbuntuUserAgent() throws IOException { +// TestHttpGetMethod method = new TestHttpGetMethod( +// "Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) Gecko/20121223 Ubuntu/9.25 (jaunty) Firefox/3.8"); +// String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2" +// + "&utmn=958990044" +// + "&utmhn=jboss.org" +// + "&utmcs=UTF-8" +// + "&utmsr=1920x1080" +// + "&utmsc=24-bit" +// + "&utmul=th-TH" +// + "&utmdt=testLinuxUbuntuUserAgent" +// + "&utmfl=1.6.0_20" +// + "&utmr=1.0.0.qualifier" +// + "&utmp=" +// + new JBossToolsTestsFocusPoint("testLinuxUbuntuUserAgent").getURI() +// + "&utmac=UA-17645367-1" +// + "&utmcc=__utma%3D999.46667292388397333777722108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794225.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B" +// + "&gaq=1"; +// method.request(url); +// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); +// } - @Test - public void testLinuxSUSEUserAgent() throws IOException { - TestHttpGetMethod method = new TestHttpGetMethod( - "Mozilla/5.0 (X11; U; Linux x86_64; th-TH; rv:1.9.2.8) Gecko/20100723 SUSE/3.6.8-0.1.1 Firefox/3.6.8"); - String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2" - + "&utmn=957000994" - + "&utmhn=jboss.org" - + "&utmcs=UTF-8" - + "&utmsr=1920x1080" - + "&utmsc=24-bit" - + "&utmul=th-TH" - + "&utmdt=testLinuxSUSEUserAgent" - + "&utmfl=1.6.0_20" - + "&utmr=1.0.0.qualifier" - + "&utmp=" - + new JBossToolsTestsFocusPoint("testLinuxSUSEUserAgent").getURI() - + "&utmac=UA-17645367-1" - + "&utmcc=__utma%3D999.46667292388397333777722108798936.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794225.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B" - + "&gaq=1"; - method.request(url); - assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); - } +// @Test +// public void testLinuxSUSEUserAgent() throws IOException { +// TestHttpGetMethod method = new TestHttpGetMethod( +// "Mozilla/5.0 (X11; U; Linux x86_64; th-TH; rv:1.9.2.8) Gecko/20100723 SUSE/3.6.8-0.1.1 Firefox/3.6.8"); +// String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2" +// + "&utmn=957000994" +// + "&utmhn=jboss.org" +// + "&utmcs=UTF-8" +// + "&utmsr=1920x1080" +// + "&utmsc=24-bit" +// + "&utmul=th-TH" +// + "&utmdt=testLinuxSUSEUserAgent" +// + "&utmfl=1.6.0_20" +// + "&utmr=1.0.0.qualifier" +// + "&utmp=" +// + new JBossToolsTestsFocusPoint("testLinuxSUSEUserAgent").getURI() +// + "&utmac=UA-17645367-1" +// + "&utmcc=__utma%3D999.46667292388397333777722108798936.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794225.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B" +// + "&gaq=1"; +// method.request(url); +// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); +// } +// @Test +// public void testLinuxSlackwareUserAgent() throws IOException { +// TestHttpGetMethod method = new TestHttpGetMethod( +// "Mozilla/5.0 (X11; U; Linux x86_64; th-TH; rv:1.9.1.3) Gecko/20090914 Slackware/13.0_stable Firefox/3.5.3"); +// String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2" +// + "&utmn=98888444" +// + "&utmhn=jboss.org" +// + "&utmcs=UTF-8" +// + "&utmsr=1920x1080" +// + "&utmsc=24-bit" +// + "&utmul=th-TH" +// + "&utmdt=testLinuxSlackwareUserAgent" +// + "&utmfl=1.6.0_20" +// + "&utmr=1.0.0.qualifier" +// + "&utmp=" +// + new JBossToolsTestsFocusPoint("testLinuxSlackwareUserAgent").getURI() +// + "&utmac=UA-17645367-1" +// + "&utmcc=__utma%3D999.46667292388397333777722108798936.1284108996025.1284197794025.1284108794025.1%3B%2B__utmz%3D999.1284108794225.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B" +// + "&gaq=1"; +// method.request(url); +// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); +// } + +// @Test +// public void testLinuxGentooUserAgent() throws IOException { +// TestHttpGetMethod method = new TestHttpGetMethod( +// "Mozilla/5.0 (X11; U; Linux i686; th-TH; rv:1.9.1.3) Gecko/20090912 Gentoo Firefox/3.5.3 FirePHP/0.3"); +// String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2" +// + "&utmn=957077444" +// + "&utmhn=jboss.org" +// + "&utmcs=UTF-8" +// + "&utmsr=1920x1080" +// + "&utmsc=24-bit" +// + "&utmul=th-TH" +// + "&utmdt=testLinuxGentooUserAgent" +// + "&utmfl=1.6.0_20" +// + "&utmr=1.0.0.qualifier" +// + "&utmp=" +// + new JBossToolsTestsFocusPoint("testLinuxGentooUserAgent").getURI() +// + "&utmac=UA-17645367-1" +// + "&utmcc=__utma%3D999.46667292388397333777722108798936.1284108794025.1284108788442.1284108880025.1%3B%2B__utmz%3D999.1284108794225.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B" +// + "&gaq=1"; +// method.request(url); +// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); +// } + +// @Test +// public void testLinuxSimplifiedGentooUserAgent1() throws IOException { +// TestHttpGetMethod method = new TestHttpGetMethod( +// "Mozilla/5.0 (X11; U; Linux i686; th-TH; rv:1.9.1.3) Gecko/20090912 Gentoo Firefox/3.5.3"); +// String url = "http://www.google-analytics.com/__utm.gif?" +// + "utmwv=4.7.2" +// + "&utmn=22172214" +// + "&utmhn=jboss.org" +// + "&utmcs=UTF-8" +// + "&utmsr=1920x1080" +// + "&utmsc=24-bit" +// + "&utmul=th-TH" +// + "&utmdt=testLinuxSimplifiedGentooUserAgent1" +// + "&utmhid=1087431432" +// + "&utmp=" +// + new JBossToolsTestsFocusPoint("testLinuxSimplifiedGentooUserAgent1").getURI() +// + "&utmac=UA-17645367-1" +// + "&utmcc=" +// + "__utma%3D999.44677790471263281282924103927.1282924103925.1282924103925.1282924103925.1%3B%2B" +// + "__utmb%3D1%3B%2B" +// + "__utmc%3D1%3B%2B" +// + "__utmz%3D156030500.1281430767.1.1." +// + "utmcsr%3D(direct)%7C" +// + "utmccn%3D(direct)%7C" +// + "utmcmd%3D(none)%7C" +// + +// "utmctr%3Dtest1%7Ctest2%7Ctest3%7Ctest4%7Ctest5%7Ctest6%7Ctest7%7Ctest8%7Ctest8%7Ctest9%7Ctest10%7Ctest11%7Ctest12%7Ctest13%7Ctest514%7Ctest14%7Ctest15%7Ctest16%7Ctest17%7Ctest18%7Ctest19%7Ctest20%7Ctest20%7Ctest21%7Ctest22%7Ctest23%7Ctest514%7Ctest24%7Ctest25%7Ctest26%7Ctest27%7Ctest28%7Ctest29%7Ctest30%7Ctest31%3B" +// + "&gaq=1"; +// method.request(url); +// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); +// } + +// @Test +// public void testLinuxSimplifiedGentooUserAgent2() throws IOException { +// TestHttpGetMethod method = new TestHttpGetMethod( +// "Mozilla/5.0 (X11; U; Linux i686; th-TH; rv:1.9.1.3) Gecko/20090912 Gentoo"); +// String url = "http://www.google-analytics.com/__utm.gif?" +// + "utmwv=4.7.2" +// + "&utmn=1517776694" +// + "&utmhn=jboss.org" +// + "&utmcs=UTF-8" +// + "&utmsr=1920x1080" +// + "&utmsc=24-bit" +// + "&utmul=th-TH" +// + "&utmdt=testLinuxSimplifiedGentooUserAgent2" +// + "&utmhid=1087431432" +// + "&utmp=" +// + new JBossToolsTestsFocusPoint("testLinuxSimplifiedGentooUserAgent2").getURI() +// + "&utmac=UA-17645367-1" +// + "&utmcc=" +// + +// "__utma%3D999.3332224690471263281282924103927.1282924103925.1282924103925.1282924103925.1%3B%2B" +// + "__utmb%3D1%3B%2B" +// + "__utmc%3D1%3B%2B" +// + "__utmz%3D156030500.1281430767.1.1." +// + "utmcsr%3D(direct)%7C" +// + "utmccn%3D(direct)%7C" +// + "utmcmd%3D(none)%7C" +// + +// "utmctr%3Dtest1%7Ctest2%7Ctest3%7Ctest4%7Ctest5%7Ctest6%7Ctest7%7Ctest8%7Ctest8%7Ctest9%7Ctest10%7Ctest11%7Ctest12%7Ctest13%7Ctest514%7Ctest14%7Ctest15%7Ctest16%7Ctest17%7Ctest18%7Ctest19%7Ctest20%7Ctest20%7Ctest21%7Ctest22%7Ctest23%7Ctest514%7Ctest24%7Ctest25%7Ctest26%7Ctest27%7Ctest28%7Ctest29%7Ctest30%7Ctest31%3B" +// + "&gaq=1"; +// method.request(url); +// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); +// } + +// @Test +// public void testLinuxSimplifiedGentooUserAgent3() throws IOException { +// TestHttpGetMethod method = new TestHttpGetMethod( +// "Mozilla/5.0 (X11; U; Linux i686; th-TH; rv:1.9.1.3) Gentoo"); +// String url = "http://www.google-analytics.com/__utm.gif?" +// + "utmwv=4.7.2" +// + "&utmn=66543336546694" +// + "&utmhn=jboss.org" +// + "&utmcs=UTF-8" +// + "&utmsr=1920x1080" +// + "&utmsc=24-bit" +// + "&utmul=th-TH" +// + "&utmdt=testLinuxSimplifiedGentooUserAgent3" +// + "&utmhid=1087431432" +// + "&utmp=" +// + new JBossToolsTestsFocusPoint("testLinuxSimplifiedGentooUserAgent3").getURI() +// + "&utmac=UA-17645367-1" +// + "&utmcc=" +// + +// "__utma%3D999.333222469055434512381282924103927.1282924103925.1282924103925.1282924103925.1%3B%2B" +// + "__utmb%3D1%3B%2B" +// + "__utmc%3D1%3B%2B" +// + "__utmz%3D156030500.1281430767.1.1." +// + "utmcsr%3D(direct)%7C" +// + "utmccn%3D(direct)%7C" +// + "utmcmd%3D(none)%7C" +// + +// "utmctr%3Dtest1%7Ctest2%7Ctest3%7Ctest4%7Ctest5%7Ctest6%7Ctest7%7Ctest8%7Ctest8%7Ctest9%7Ctest10%7Ctest11%7Ctest12%7Ctest13%7Ctest514%7Ctest14%7Ctest15%7Ctest16%7Ctest17%7Ctest18%7Ctest19%7Ctest20%7Ctest20%7Ctest21%7Ctest22%7Ctest23%7Ctest514%7Ctest24%7Ctest25%7Ctest26%7Ctest27%7Ctest28%7Ctest29%7Ctest30%7Ctest31%3B" +// + "&gaq=1"; +// method.request(url); +// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); +// } + + +// @Test +// public void testLinuxSimplifiedFedoraUserAgent1() throws IOException { +// TestHttpGetMethod method = new TestHttpGetMethod( +// "Mozilla/5.0 (X11; U; Linux i686; th-TH; rv:1.9.1.3) Gecko/20090912 Fedora release 13 (Goddard)"); +// String url = "http://www.google-analytics.com/__utm.gif?" +// + "utmwv=4.7.2" +// + "&utmn=1517779994" +// + "&utmhn=jboss.org" +// + "&utmcs=UTF-8" +// + "&utmsr=1920x1080" +// + "&utmsc=24-bit" +// + "&utmul=th-TH" +// + "&utmdt=testLinuxSimplifiedFedoraUserAgent1" +// + "&utmhid=1087431432" +// + "&utmp=" +// + new JBossToolsTestsFocusPoint("testLinuxSimplifiedFedoraUserAgent1").getURI() +// + "&utmac=UA-17645367-1" +// + "&utmcc=" +// + +// "__utma%3D999.3332224690455442812829241027.1282924103925.1282924103925.1282924103925.1%3B%2B" +// + "__utmb%3D1%3B%2B" +// + "__utmc%3D1%3B%2B" +// + "__utmz%3D156030500.1281430767.1.1." +// + "utmcsr%3D(direct)%7C" +// + "utmccn%3D(direct)%7C" +// + "utmcmd%3D(none)%7C" +// + +// "utmctr%3Dtest1%7Ctest2%7Ctest3%7Ctest4%7Ctest5%7Ctest6%7Ctest7%7Ctest8%7Ctest8%7Ctest9%7Ctest10%7Ctest11%7Ctest12%7Ctest13%7Ctest514%7Ctest14%7Ctest15%7Ctest16%7Ctest17%7Ctest18%7Ctest19%7Ctest20%7Ctest20%7Ctest21%7Ctest22%7Ctest23%7Ctest514%7Ctest24%7Ctest25%7Ctest26%7Ctest27%7Ctest28%7Ctest29%7Ctest30%7Ctest31%3B" +// + "&gaq=1"; +// method.request(url); +// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); +// } + @Test - public void testLinuxSlackwareUserAgent() throws IOException { + public void testKonquerorUserAgent1() throws IOException { TestHttpGetMethod method = new TestHttpGetMethod( - "Mozilla/5.0 (X11; U; Linux x86_64; th-TH; rv:1.9.1.3) Gecko/20090914 Slackware/13.0_stable Firefox/3.5.3"); - String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2" - + "&utmn=98888444" + "Mozilla/5.0 (compatible; Konqueror/3.5; Linux 2.6.14-kanotix-6; X11) KHTML/3.5.3 (like Gecko) (Debian package 4:3.5.3-1)"); + String url = "http://www.google-analytics.com/__utm.gif?" + + "utmwv=4.7.2" + + "&utmn=1223329994" + "&utmhn=jboss.org" + "&utmcs=UTF-8" + "&utmsr=1920x1080" + "&utmsc=24-bit" + "&utmul=th-TH" - + "&utmdt=testLinuxSlackwareUserAgent" - + "&utmfl=1.6.0_20" - + "&utmr=1.0.0.qualifier" + + "&utmdt=testKonquerorUserAgent1" + + "&utmhid=1087431432" + "&utmp=" - + new JBossToolsTestsFocusPoint("testLinuxSlackwareUserAgent").getURI() + + new JBossToolsTestsFocusPoint("testKonquerorUserAgent1").getURI() + "&utmac=UA-17645367-1" - + "&utmcc=__utma%3D999.46667292388397333777722108798936.1284108996025.1284197794025.1284108794025.1%3B%2B__utmz%3D999.1284108794225.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B" + + "&utmcc=" + + + "__utma%3D999.33322242235555442812829241027.1282924103925.1282924103925.1282924103925.1%3B%2B" + + "__utmb%3D1%3B%2B" + + "__utmc%3D1%3B%2B" + + "__utmz%3D156030500.1281430767.1.1." + + "utmcsr%3D(direct)%7C" + + "utmccn%3D(direct)%7C" + + "utmcmd%3D(none)%7C" + + + "utmctr%3Dtest1%7Ctest2%7Ctest3%7Ctest4%7Ctest5%7Ctest6%7Ctest7%7Ctest8%7Ctest8%7Ctest9%7Ctest10%7Ctest11%7Ctest12%7Ctest13%7Ctest514%7Ctest14%7Ctest15%7Ctest16%7Ctest17%7Ctest18%7Ctest19%7Ctest20%7Ctest20%7Ctest21%7Ctest22%7Ctest23%7Ctest514%7Ctest24%7Ctest25%7Ctest26%7Ctest27%7Ctest28%7Ctest29%7Ctest30%7Ctest31%3B" + "&gaq=1"; method.request(url); assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); } @Test - public void testLinuxGentooUserAgent() throws IOException { + public void testKonquerorUserAgent1B() throws IOException { TestHttpGetMethod method = new TestHttpGetMethod( - "Mozilla/5.0 (X11; U; Linux i686; th-TH; rv:1.9.1.3) Gecko/20090912 Gentoo Firefox/3.5.3 FirePHP/0.3"); - String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2" - + "&utmn=957077444" + "Mozilla/5.0 (compatible; Konqueror/3.5; Linux Fedora13; X11) KHTML/3.5.3 (like Gecko) (Debian package 4:3.5.3-1)"); + String url = "http://www.google-analytics.com/__utm.gif?" + + "utmwv=4.7.2" + + "&utmn=1223329994" + "&utmhn=jboss.org" + "&utmcs=UTF-8" + "&utmsr=1920x1080" + "&utmsc=24-bit" + "&utmul=th-TH" - + "&utmdt=testLinuxGentooUserAgent" - + "&utmfl=1.6.0_20" - + "&utmr=1.0.0.qualifier" + + "&utmdt=testKonquerorUserAgent1B" + + "&utmhid=1087431432" + "&utmp=" - + new JBossToolsTestsFocusPoint("testLinuxGentooUserAgent").getURI() + + new JBossToolsTestsFocusPoint("testKonquerorUserAgent1B").getURI() + "&utmac=UA-17645367-1" - + "&utmcc=__utma%3D999.46667292388397333777722108798936.1284108794025.1284108788442.1284108880025.1%3B%2B__utmz%3D999.1284108794225.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B" + + "&utmcc=" + + + "__utma%3D999.33322242235555442812829241027.1282924103925.1282924103925.1282924103925.1%3B%2B" + + "__utmb%3D1%3B%2B" + + "__utmc%3D1%3B%2B" + + "__utmz%3D156030500.1281430767.1.1." + + "utmcsr%3D(direct)%7C" + + "utmccn%3D(direct)%7C" + + "utmcmd%3D(none)%7C" + + + "utmctr%3Dtest1%7Ctest2%7Ctest3%7Ctest4%7Ctest5%7Ctest6%7Ctest7%7Ctest8%7Ctest8%7Ctest9%7Ctest10%7Ctest11%7Ctest12%7Ctest13%7Ctest514%7Ctest14%7Ctest15%7Ctest16%7Ctest17%7Ctest18%7Ctest19%7Ctest20%7Ctest20%7Ctest21%7Ctest22%7Ctest23%7Ctest514%7Ctest24%7Ctest25%7Ctest26%7Ctest27%7Ctest28%7Ctest29%7Ctest30%7Ctest31%3B" + "&gaq=1"; method.request(url); assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); } @Test - public void testLinuxSimplifiedGentooUserAgent1() throws IOException { + public void testKonquerorUserAgent1C() throws IOException { TestHttpGetMethod method = new TestHttpGetMethod( - "Mozilla/5.0 (X11; U; Linux i686; th-TH; rv:1.9.1.3) Gecko/20090912 Gentoo Firefox/3.5.3"); + "JBossToolsTest/5.0 (compatible; Konqueror/3.5; Linux 2.6.14-kanotix-6; X11) KHTML/3.5.3 (like Gecko) (Debian package 4:3.5.3-1)"); String url = "http://www.google-analytics.com/__utm.gif?" + "utmwv=4.7.2" - + "&utmn=22172214" + + "&utmn=1213328994" + "&utmhn=jboss.org" + "&utmcs=UTF-8" + "&utmsr=1920x1080" + "&utmsc=24-bit" + "&utmul=th-TH" - + "&utmdt=testLinuxSimplifiedGentooUserAgent1" + + "&utmdt=testKonquerorUserAgent1C" + "&utmhid=1087431432" + "&utmp=" - + new JBossToolsTestsFocusPoint("testLinuxSimplifiedGentooUserAgent1").getURI() + + new JBossToolsTestsFocusPoint("testKonquerorUserAgent1C").getURI() + "&utmac=UA-17645367-1" + "&utmcc=" - + "__utma%3D999.44677790471263281282924103927.1282924103925.1282924103925.1282924103925.1%3B%2B" + + + "__utma%3D999.33554422242235555442817769241027.1282924103925.1282924103925.1282924103925.1%3B%2B" + "__utmb%3D1%3B%2B" + "__utmc%3D1%3B%2B" + "__utmz%3D156030500.1281430767.1.1." @@ -1339,27 +1538,26 @@ method.request(url); assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); } - @Test - public void testLinuxSimplifiedGentooUserAgent2() throws IOException { + public void testKonquerorUserAgent2() throws IOException { TestHttpGetMethod method = new TestHttpGetMethod( - "Mozilla/5.0 (X11; U; Linux i686; th-TH; rv:1.9.1.3) Gecko/20090912 Gentoo"); + "Mozilla/5.0 (compatible; Konqueror/3.5; Linux Fedora13; X11) KHTML/3.5.3 (like Gecko) (Debian package 4:3.5.3-1)"); String url = "http://www.google-analytics.com/__utm.gif?" + "utmwv=4.7.2" - + "&utmn=1517776694" + + "&utmn=122366977894" + "&utmhn=jboss.org" + "&utmcs=UTF-8" + "&utmsr=1920x1080" + "&utmsc=24-bit" + "&utmul=th-TH" - + "&utmdt=testLinuxSimplifiedGentooUserAgent2" + + "&utmdt=testKonquerorUserAgent2" + "&utmhid=1087431432" + "&utmp=" - + new JBossToolsTestsFocusPoint("testLinuxSimplifiedGentooUserAgent2").getURI() + + new JBossToolsTestsFocusPoint("testKonquerorUserAgent2").getURI() + "&utmac=UA-17645367-1" + "&utmcc=" + - "__utma%3D999.3332224690471263281282924103927.1282924103925.1282924103925.1282924103925.1%3B%2B" + "__utma%3D999.33327772235565334281282977327.1282924103925.1282924103925.1282924103925.1%3B%2B" + "__utmb%3D1%3B%2B" + "__utmc%3D1%3B%2B" + "__utmz%3D156030500.1281430767.1.1." @@ -1372,27 +1570,27 @@ method.request(url); assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); } - + @Test - public void testLinuxSimplifiedGentooUserAgent3() throws IOException { + public void testKonquerorUserAgent3() throws IOException { TestHttpGetMethod method = new TestHttpGetMethod( - "Mozilla/5.0 (X11; U; Linux i686; th-TH; rv:1.9.1.3) Gentoo"); + "Mozilla/5.0 (compatible; Konqueror/3.5; Linux Fedora13; X11) KHTML/3.5.3 (like Gecko)"); String url = "http://www.google-analytics.com/__utm.gif?" + "utmwv=4.7.2" - + "&utmn=66543336546694" + + "&utmn=126732977894" + "&utmhn=jboss.org" + "&utmcs=UTF-8" + "&utmsr=1920x1080" + "&utmsc=24-bit" + "&utmul=th-TH" - + "&utmdt=testLinuxSimplifiedGentooUserAgent3" + + "&utmdt=testKonquerorUserAgent3" + "&utmhid=1087431432" + "&utmp=" - + new JBossToolsTestsFocusPoint("testLinuxSimplifiedGentooUserAgent3").getURI() + + new JBossToolsTestsFocusPoint("testKonquerorUserAgent3").getURI() + "&utmac=UA-17645367-1" + "&utmcc=" + - "__utma%3D999.333222469055434512381282924103927.1282924103925.1282924103925.1282924103925.1%3B%2B" + "__utma%3D999.33322242235565388981282924327.1282924103925.1282924103925.1282924103925.1%3B%2B" + "__utmb%3D1%3B%2B" + "__utmc%3D1%3B%2B" + "__utmz%3D156030500.1281430767.1.1." Added: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/LinuxDistroTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/LinuxDistroTest.java (rev 0) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/LinuxDistroTest.java 2010-09-29 17:29:19 UTC (rev 25299) @@ -0,0 +1,39 @@ +/******************************************************************************* + * 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.assertEquals; + +import java.io.IOException; + +import org.jboss.tools.usage.googleanalytics.eclipse.ILinuxDistro; +import org.jboss.tools.usage.googleanalytics.eclipse.ILinuxDistro.LinuxDistro; +import org.junit.Test; + +public class LinuxDistroTest { + + @Test + public void canExtractFedoraVersion() { + ILinuxDistro distro = new FedoraLinuxDistroFake(); + assertEquals("13", distro.getVersion()); + } + + public class FedoraLinuxDistroFake extends LinuxDistro { + + public FedoraLinuxDistroFake() { + super(ILinuxDistro.FEDORA.getName(), "dummy"); + } + + @Override + protected String getDistroFileContent(String filePath) throws IOException { + return "Fedora release 13 (Goddard)"; + } + } +} Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/LinuxDistroTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/EclipseUserAgentFake.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/EclipseUserAgentFake.java 2010-09-29 13:48:41 UTC (rev 25298) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/EclipseUserAgentFake.java 2010-09-29 17:29:19 UTC (rev 25299) @@ -29,6 +29,8 @@ public static final String WIN7_VERSION = "6.1"; public static final String MACLEOPARD_VERSION = "10.5"; public static final String MACSNOWLEOPARD_VERSION = "10.6"; + public static final String LINUX_FEDORA13_VERSION = "13"; + private String applicationName; private String applicationVersion; @@ -39,7 +41,7 @@ public EclipseUserAgentFake() { this(APPLICATION_NAME, APPLICATION_VERSION, LOCALE_US, Platform.OS_WIN32, WIN7_VERSION); } - + public EclipseUserAgentFake(String nl) { this(APPLICATION_NAME, APPLICATION_VERSION, nl, Platform.OS_WIN32, WIN7_VERSION); } @@ -51,18 +53,27 @@ /** * Instantiates a fake of the EclipseUserAgent class * - * @param applicationName the name of the applicaiton - * @param applicationVersion the version of the application - * @param nl the platform locale as returned from <code>Platform.getNL()</code> - * @param os the os name as return from <code>Platform.getOS()</code> - * @param osVersion the version of the os as returned from <code>System.getProperty("os.name")</code> + * @param applicationName + * the name of the applicaiton + * @param applicationVersion + * the version of the application + * @param nl + * the platform locale as returned from + * <code>Platform.getNL()</code> + * @param os + * the os name as return from <code>Platform.getOS()</code> + * @param osVersion + * the version of the os as returned from + * <code>System.getProperty("os.name")</code> * * @see Platform#getNL() * @see Platform#getOS() * @see System#getProperty("os.version") */ - public EclipseUserAgentFake(String applicationName, String applicationVersion, String nl, String os, String osVersion) { - Assert.isTrue(nl != null && nl.indexOf(JAVA_LOCALE_DELIMITER) >= 0, "nl parameter must for a java locale string <xx_XX>"); + public EclipseUserAgentFake(String applicationName, String applicationVersion, String nl, String os, + String osVersion) { + Assert.isTrue(nl != null && nl.indexOf(JAVA_LOCALE_DELIMITER) >= 0, + "nl parameter must for a java locale string <xx_XX>"); this.applicationName = applicationName; this.applicationVersion = applicationVersion; this.nl = nl; @@ -89,7 +100,7 @@ public String getOSVersion() { return osVersion; } - + @Override public String getApplicationVersion() { return applicationVersion;