[jbosstools-commits] JBoss Tools SVN: r24178 - in trunk/usage/tests/org.jboss.tools.usage.test: src/org/jboss/tools/usage/test and 1 other directory.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Mon Aug 16 07:04:21 EDT 2010
Author: adietish
Date: 2010-08-16 07:04:19 -0400 (Mon, 16 Aug 2010)
New Revision: 24178
Added:
trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentFake.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/FocusPointTest.launch
trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageRequestsTest.launch
trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageTest.launch
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/GoogleAnalyticsUrlStrategyTest.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/JBossToolsUsageTest.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/SystemOutLogger.java
Log:
[JBIDE-6376] user agent string corrected, tests added
Added: trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch 2010-08-16 11:04:19 UTC (rev 24178)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/GoogleAnalyticsUrlStrategyTest (1)"/>
+<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/EclipseEnvironmenTest.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.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.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.usage.test.EclipseEnvironmenTest"/>
+<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="javax.transaction at default:false,org.eclipse.equinox.registry at default:default,org.eclipse.equinox.p2.jarprocessor at default:default,org.hamcrest.core at default:default,org.eclipse.ecf.provider.filetransfer.ssl at default:false,org.eclipse.equinox.p2.metadata at default:default,org.eclipse.equinox.common at 2:true,org.eclipse.text at default:default,org.eclipse.core.databinding.observable at default:default,org.eclipse.core.runtime at default:true,org.eclipse.core.contenttype at default:default,org.eclipse.core.commands at default:default,org.eclipse.equinox.p2.repository at default:default,org.eclipse.ui.cocoa at default:false,org.eclipse.jface.databinding at default:default,org.eclipse.core.runtime.compatibility.auth at default:default,org.eclipse.ui.forms at default:default,org.eclipse.ecf.filetransfer at default:default,org.eclipse.core.expressions at default:default,org.junit4 at default:default,org.eclipse.ecf.provider.filetransfer at default:default,org.eclipse.ui.workb!
ench at default:default,org.eclipse.jface.text at default:default,org.eclipse.ecf.identity at default:default,org.eclipse.equinox.app at default:default,org.eclipse.ecf.ssl at default:false,org.eclipse.core.runtime.compatibility.registry at default:false,org.eclipse.equinox.preferences at default:default,org.eclipse.core.resources at default:default,org.eclipse.core.databinding.property at default:default,org.eclipse.equinox.transforms.hook at default:false,com.ibm.icu at default:default,org.eclipse.core.variables at default:default,org.eclipse.equinox.p2.artifact.repository at default:default,org.eclipse.ui.views at default:default,org.eclipse.core.resources.compatibility at default:false,org.eclipse.equinox.security.macosx at default:false,org.eclipse.swt at default:default,org.eclipse.equinox.p2.core at default:default,org.eclipse.equinox.p2.engine at default:default,org.eclipse.help at default:default,org.eclipse.osgi at -1:true,org.eclipse.equinox.p2.metadata.repository at default:default,org.eclipse.core.filesystem at default:default,o!
rg.eclipse.ecf at default:default,org.eclipse.core.databinding at de!
fault:de
fault,org.eclipse.core.jobs at default:default,org.eclipse.ant.core at default:default,org.jboss.tools.xulrunner.initializer at default:false,org.eclipse.equinox.concurrent at default:default,org.eclipse.core.filesystem.macosx at default:false,org.eclipse.swt.cocoa.macosx at default:false,org.eclipse.ui at default:default,org.eclipse.core.net at default:default,org.eclipse.equinox.security at default:default,org.eclipse.ui.ide at default:default,org.eclipse.jface at default:default,javax.servlet at default:default,org.eclipse.osgi.services at default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test at default:default,org.jboss.tools.usage at 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/EclipseEnvironmentTest.launch
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/tests/org.jboss.tools.usage.test/FocusPointTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/FocusPointTest.launch 2010-08-16 11:01:36 UTC (rev 24177)
+++ trunk/usage/tests/org.jboss.tools.usage.test/FocusPointTest.launch 2010-08-16 11:04:19 UTC (rev 24178)
@@ -35,8 +35,8 @@
<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.ecf.provider.filetransfer at default:default,org.eclipse.ecf.filetransfer at default:default,org.eclipse.equinox.p2.jarprocessor at default:default,org.eclipse.core.resources at default:default,org.eclipse.core.net at default:default,org.eclipse.equinox.p2.metadata.repository at default:default,org.eclipse.ui.ide at default:default,org.eclipse.core.commands at default:default,org.eclipse.core.databinding.property at default:default,org.eclipse.core.runtime.compatibility.registry at default:false,org.eclipse.equinox.p2.artifact.repository at default:default,org.eclipse.core.runtime at default:true,org.eclipse.ui.forms at default:default,org.eclipse.equinox.registry at default:default,org.eclipse.ui.cocoa at default:false,org.eclipse.core.filesystem.macosx at default:false,org.eclipse.osgi.services at default:default,org.eclipse.equinox.p2.repository at default:default,org.eclipse.jface.text at default:default,org.eclipse.core.databinding at default:default,org.eclipse.!
help at default:default,org.eclipse.equinox.security at default:default,org.eclipse.swt.cocoa.macosx at default:false,org.junit4 at default:default,org.eclipse.equinox.transforms.hook at default:false,org.eclipse.ui at default:default,org.eclipse.equinox.app at default:default,org.eclipse.core.variables at default:default,org.eclipse.equinox.p2.core at default:default,org.eclipse.text at default:default,org.eclipse.core.contenttype at default:default,org.eclipse.core.runtime.compatibility.auth at default:default,org.eclipse.core.filesystem at default:default,org.eclipse.core.resources.compatibility at default:false,org.eclipse.ecf.identity at default:default,org.hamcrest.core at default:default,org.eclipse.ecf.ssl at default:false,javax.servlet at default:default,org.eclipse.equinox.preferences at default:default,org.jboss.tools.xulrunner.initializer at default:false,org.eclipse.jface at default:default,com.ibm.icu at default:default,org.eclipse.equinox.concurrent at default:default,org.eclipse.ant.core at default:default,org.eclipse.ecf.provid!
er.filetransfer.ssl at default:false,javax.transaction at default:fa!
lse,org.
eclipse.core.databinding.observable at default:default,org.eclipse.ecf at default:default,org.eclipse.core.jobs at default:default,org.eclipse.ui.workbench at default:default,org.eclipse.equinox.p2.engine at default:default,org.eclipse.osgi at -1:true,org.eclipse.swt at default:default,org.eclipse.ui.views at default:default,org.eclipse.jface.databinding at default:default,org.eclipse.equinox.common at 2:true,org.eclipse.core.expressions at default:default,org.eclipse.equinox.security.macosx at default:false,org.eclipse.equinox.p2.metadata at default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test at default:default,org.jboss.tools.usage at default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.common at 2:true,org.eclipse.equinox.p2.jarprocessor at default:default,org.eclipse.core.filesystem.macosx at default:false,org.eclipse.equinox.concurrent at default:default,org.eclipse.core.filesystem at default:default,org.eclipse.equinox.p2.metadata.repository at default:default,com.ibm.icu at default:default,org.junit4 at default:default,org.eclipse.equinox.p2.engine at default:default,org.eclipse.equinox.p2.metadata at default:default,org.eclipse.equinox.app at default:default,org.eclipse.core.resources at default:default,org.eclipse.ui.ide at default:default,org.eclipse.osgi at -1:true,org.eclipse.ecf at default:default,org.hamcrest.core at default:default,org.eclipse.ui.workbench at default:default,org.eclipse.core.databinding.property at default:default,org.eclipse.help at default:default,org.eclipse.core.jobs at default:default,org.eclipse.ecf.filetransfer at default:default,org.eclipse.ecf.provider.filetransfer at default:default,org.eclipse.core.contentty!
pe at default:default,org.eclipse.equinox.transforms.hook at default:false,org.eclipse.equinox.security.macosx at default:false,org.eclipse.equinox.p2.repository at default:default,org.eclipse.ecf.ssl at default:false,org.eclipse.osgi.services at default:default,org.eclipse.core.runtime.compatibility.registry at default:false,org.eclipse.core.runtime at default:true,org.eclipse.core.commands at default:default,org.eclipse.swt at default:default,org.eclipse.ecf.identity at default:default,org.eclipse.equinox.security at default:default,org.eclipse.jface at default:default,org.eclipse.core.variables at default:default,org.eclipse.text at default:default,org.eclipse.ui.forms at default:default,org.eclipse.ui.views at default:default,org.eclipse.jface.databinding at default:default,org.eclipse.equinox.registry at default:default,org.eclipse.ecf.provider.filetransfer.ssl at default:false,org.eclipse.equinox.preferences at default:default,org.eclipse.core.databinding.observable at default:default,org.eclipse.core.expressions at default:default,org!
.eclipse.ui at default:default,org.eclipse.core.runtime.compatibi!
lity.aut
h at default:default,org.eclipse.ui.cocoa at default:false,org.eclipse.swt.cocoa.macosx at default:false,org.eclipse.core.resources.compatibility at default:false,org.eclipse.equinox.p2.artifact.repository at default:default,org.eclipse.jface.text at default:default,org.eclipse.ant.core at default:default,org.eclipse.core.databinding at default:default,org.jboss.tools.xulrunner.initializer at default:false,org.eclipse.core.net at default:default,org.eclipse.equinox.p2.core at default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage*1.0.0.qualifier at default:default,org.jboss.tools.usage.test at default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
Modified: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageRequestsTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageRequestsTest.launch 2010-08-16 11:01:36 UTC (rev 24177)
+++ trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageRequestsTest.launch 2010-08-16 11:04:19 UTC (rev 24178)
@@ -10,7 +10,7 @@
<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/JBossToolsUsageRequestsTest2"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBossToolsUsageRequestsTest"/>
<booleanAttribute key="default" value="false"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
@@ -36,7 +36,7 @@
<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.ui at default:default,org.eclipse.ecf at default:default,org.eclipse.ecf.identity at default:default,org.eclipse.core.databinding.property at default:default,org.eclipse.core.expressions at default:default,javax.servlet at default:default,org.eclipse.core.filesystem at default:default,org.eclipse.ui.cocoa at default:false,org.eclipse.osgi.services at default:default,javax.transaction at default:false,org.eclipse.ecf.provider.filetransfer at default:default,org.eclipse.core.databinding.observable at default:default,org.eclipse.ecf.filetransfer at default:default,org.eclipse.equinox.p2.artifact.repository at default:default,org.eclipse.equinox.p2.core at default:default,org.eclipse.equinox.p2.metadata.repository at default:default,org.eclipse.core.runtime.compatibility.auth at default:default,org.eclipse.ecf.ssl at default:false,org.eclipse.swt.cocoa.macosx at default:false,org.eclipse.ui.ide at default:default,org.eclipse.equinox.concurrent at default:default,org.eclipse.!
ui.forms at default:default,org.eclipse.core.runtime.compatibility.registry at default:false,org.eclipse.ecf.provider.filetransfer.ssl at default:false,org.eclipse.equinox.security at default:default,org.eclipse.core.contenttype at default:default,org.eclipse.ant.core at default:default,org.eclipse.core.net at default:default,com.ibm.icu at default:default,org.eclipse.jface.text at default:default,org.eclipse.osgi at -1:true,org.eclipse.equinox.common at 2:true,org.eclipse.equinox.p2.engine at default:default,org.eclipse.core.filesystem.macosx at default:false,org.eclipse.jface.databinding at default:default,org.eclipse.ui.workbench at default:default,org.eclipse.text at default:default,org.eclipse.core.databinding at default:default,org.eclipse.equinox.p2.jarprocessor at default:default,org.eclipse.core.resources at default:default,org.eclipse.core.jobs at default:default,org.eclipse.equinox.transforms.hook at default:false,org.junit4 at default:default,org.hamcrest.core at default:default,org.jboss.tools.xulrunner.initializer at default:false!
,org.eclipse.equinox.app at default:default,org.eclipse.swt at defau!
lt:defau
lt,org.eclipse.core.variables at default:default,org.eclipse.jface at default:default,org.eclipse.equinox.registry at default:default,org.eclipse.core.resources.compatibility at default:false,org.eclipse.core.runtime at default:true,org.eclipse.core.commands at default:default,org.eclipse.help at default:default,org.eclipse.ui.views at default:default,org.eclipse.equinox.p2.repository at default:default,org.eclipse.equinox.p2.metadata at default:default,org.eclipse.equinox.security.macosx at default:false,org.eclipse.equinox.preferences at default:default"/>
+<stringAttribute key="selected_target_plugins" value="javax.transaction at default:false,org.eclipse.equinox.registry at default:default,org.eclipse.equinox.p2.jarprocessor at default:default,org.hamcrest.core at default:default,org.eclipse.ecf.provider.filetransfer.ssl at default:false,org.eclipse.equinox.p2.metadata at default:default,org.eclipse.equinox.common at default:default,org.eclipse.text at default:default,org.eclipse.core.databinding.observable at default:default,org.eclipse.core.runtime at default:true,org.eclipse.core.contenttype at default:default,org.eclipse.core.commands at default:default,org.eclipse.equinox.p2.repository at default:default,org.eclipse.ui.cocoa at default:false,org.eclipse.jface.databinding at default:default,org.eclipse.core.runtime.compatibility.auth at default:default,org.eclipse.ui.forms at default:default,org.eclipse.ecf.filetransfer at default:default,org.eclipse.core.expressions at default:default,org.junit4 at default:default,org.eclipse.ecf.provider.filetransfer at default:default,org.eclipse!
.ui.workbench at default:default,org.eclipse.jface.text at default:default,org.eclipse.ecf.identity at default:default,org.eclipse.equinox.app at default:default,org.eclipse.ecf.ssl at default:false,org.eclipse.core.runtime.compatibility.registry at default:false,org.eclipse.equinox.preferences at default:default,org.eclipse.core.resources at default:default,org.eclipse.core.databinding.property at default:default,org.eclipse.equinox.transforms.hook at default:false,com.ibm.icu at default:default,org.eclipse.core.variables at default:default,org.eclipse.equinox.p2.artifact.repository at default:default,org.eclipse.ui.views at default:default,org.eclipse.core.resources.compatibility at default:false,org.eclipse.equinox.security.macosx at default:false,org.eclipse.swt at default:default,org.eclipse.equinox.p2.core at default:default,org.eclipse.equinox.p2.engine at default:default,org.eclipse.help at default:default,org.eclipse.osgi,org.eclipse.equinox.p2.metadata.repository at default:default,org.eclipse.core.filesystem at default:default,!
org.eclipse.ecf at default:default,org.eclipse.core.databinding at d!
efault:d
efault,org.eclipse.core.jobs at default:default,org.eclipse.ant.core at default:default,org.jboss.tools.xulrunner.initializer at default:false,org.eclipse.equinox.concurrent at default:default,org.eclipse.core.filesystem.macosx at default:false,org.eclipse.swt.cocoa.macosx at default:false,org.eclipse.ui at default:default,org.eclipse.core.net at default:default,org.eclipse.equinox.security at default:default,org.eclipse.ui.ide at default:default,org.eclipse.jface at default:default,javax.servlet at default:default,org.eclipse.osgi.services at default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test at default:default,org.jboss.tools.usage at default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
Modified: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageTest.launch 2010-08-16 11:01:36 UTC (rev 24177)
+++ trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageTest.launch 2010-08-16 11:04:19 UTC (rev 24178)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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"/>
@@ -35,8 +36,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.ui at default:default,org.eclipse.ecf at default:default,org.eclipse.ecf.identity at default:default,org.eclipse.core.databinding.property at default:default,org.eclipse.core.expressions at default:default,javax.servlet at default:default,org.eclipse.core.filesystem at default:default,org.eclipse.ui.cocoa at default:false,org.eclipse.osgi.services at default:default,javax.transaction at default:false,org.eclipse.ecf.provider.filetransfer at default:default,org.eclipse.core.databinding.observable at default:default,org.eclipse.ecf.filetransfer at default:default,org.eclipse.equinox.p2.artifact.repository at default:default,org.eclipse.equinox.p2.core at default:default,org.eclipse.equinox.p2.metadata.repository at default:default,org.eclipse.core.runtime.compatibility.auth at default:default,org.eclipse.ecf.ssl at default:false,org.eclipse.swt.cocoa.macosx at default:false,org.eclipse.ui.ide at default:default,org.eclipse.equinox.concurrent at default:default,org.eclipse.!
ui.forms at default:default,org.eclipse.core.runtime.compatibility.registry at default:false,org.eclipse.ecf.provider.filetransfer.ssl at default:false,org.eclipse.equinox.security at default:default,org.eclipse.core.contenttype at default:default,org.eclipse.ant.core at default:default,org.eclipse.core.net at default:default,com.ibm.icu at default:default,org.eclipse.jface.text at default:default,org.eclipse.osgi at -1:true,org.eclipse.equinox.common at 2:true,org.eclipse.equinox.p2.engine at default:default,org.eclipse.core.filesystem.macosx at default:false,org.eclipse.jface.databinding at default:default,org.eclipse.ui.workbench at default:default,org.eclipse.text at default:default,org.eclipse.core.databinding at default:default,org.eclipse.equinox.p2.jarprocessor at default:default,org.eclipse.core.resources at default:default,org.eclipse.core.jobs at default:default,org.eclipse.equinox.transforms.hook at default:false,org.junit4 at default:default,org.hamcrest.core at default:default,org.jboss.tools.xulrunner.initializer at default:false!
,org.eclipse.equinox.app at default:default,org.eclipse.swt at defau!
lt:defau
lt,org.eclipse.core.variables at default:default,org.eclipse.jface at default:default,org.eclipse.equinox.registry at default:default,org.eclipse.core.resources.compatibility at default:false,org.eclipse.core.runtime at default:true,org.eclipse.core.commands at default:default,org.eclipse.help at default:default,org.eclipse.ui.views at default:default,org.eclipse.equinox.p2.repository at default:default,org.eclipse.equinox.p2.metadata at default:default,org.eclipse.equinox.security.macosx at default:false,org.eclipse.equinox.preferences at default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test at default:default,org.jboss.tools.usage at default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.common at 2:true,org.eclipse.equinox.p2.jarprocessor at default:default,org.eclipse.core.filesystem.macosx at default:false,org.eclipse.equinox.concurrent at default:default,org.eclipse.core.filesystem at default:default,org.eclipse.equinox.p2.metadata.repository at default:default,com.ibm.icu at default:default,org.junit4 at default:default,org.eclipse.equinox.p2.engine at default:default,org.eclipse.equinox.p2.metadata at default:default,org.eclipse.equinox.app at default:default,org.eclipse.core.resources at default:default,org.eclipse.ui.ide at default:default,org.eclipse.osgi at -1:true,org.eclipse.ecf at default:default,org.hamcrest.core at default:default,org.eclipse.ui.workbench at default:default,org.eclipse.core.databinding.property at default:default,org.eclipse.help at default:default,org.eclipse.core.jobs at default:default,org.eclipse.ecf.filetransfer at default:default,org.eclipse.ecf.provider.filetransfer at default:default,org.eclipse.core.contentty!
pe at default:default,org.eclipse.equinox.transforms.hook at default:false,org.eclipse.equinox.security.macosx at default:false,org.eclipse.equinox.p2.repository at default:default,org.eclipse.ecf.ssl at default:false,org.eclipse.osgi.services at default:default,org.eclipse.core.runtime.compatibility.registry at default:false,javax.transaction at default:false,org.eclipse.core.runtime at default:true,org.eclipse.core.commands at default:default,org.eclipse.swt at default:default,org.eclipse.ecf.identity at default:default,org.eclipse.equinox.security at default:default,org.eclipse.jface at default:default,org.eclipse.core.variables at default:default,org.eclipse.text at default:default,org.eclipse.ui.forms at default:default,org.eclipse.ui.views at default:default,org.eclipse.jface.databinding at default:default,org.eclipse.equinox.registry at default:default,org.eclipse.ecf.provider.filetransfer.ssl at default:false,org.eclipse.equinox.preferences at default:default,org.eclipse.core.databinding.observable at default:default,org.eclipse.core!
.expressions at default:default,org.eclipse.ui at default:default,or!
g.eclips
e.core.runtime.compatibility.auth at default:default,org.eclipse.ui.cocoa at default:false,org.eclipse.swt.cocoa.macosx at default:false,org.eclipse.core.resources.compatibility at default:false,javax.servlet at default:default,org.eclipse.equinox.p2.artifact.repository at default:default,org.eclipse.jface.text at default:default,org.eclipse.ant.core at default:default,org.eclipse.core.databinding at default:default,org.jboss.tools.xulrunner.initializer at default:false,org.eclipse.core.net at default:default,org.eclipse.equinox.p2.core at default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage*1.0.0.qualifier at default:default,org.jboss.tools.usage.test at default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
Added: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java 2010-08-16 11:04:19 UTC (rev 24178)
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.UnsupportedEncodingException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.core.runtime.Platform;
+import org.jboss.tools.usage.internal.EclipseEnvironment;
+import org.junit.Test;
+
+public class EclipseEnvironmenTest {
+
+ private static final String GANALYTICS_ACCOUNTNAME = "UA-17645367-1";
+ private static final String HOSTNAME = "jboss.org";
+ private static final String REFERRAL = "0";
+ private static final String LOCALE_US = "en_US";
+
+ @Test
+ public void testMacOs() throws UnsupportedEncodingException {
+ EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL,
+ Platform.OS_MACOSX, LOCALE_US);
+ String userAgent = eclipseEnvironment.getUserAgent();
+ assertApplicationNameAndVersion("com.jboss.jbds.product", "3.0.1", userAgent);
+ assertOs("Macintosh", "Intel Mac OS X 10.5", userAgent);
+ assertLanguage("en-US", userAgent);
+ }
+
+ @Test
+ public void testLinux() throws UnsupportedEncodingException {
+ EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL,
+ Platform.OS_LINUX, LOCALE_US);
+ String userAgent = eclipseEnvironment.getUserAgent();
+ assertApplicationNameAndVersion("com.jboss.jbds.product", "3.0.1", userAgent);
+ assertOs("X11", "Linux i686", userAgent);
+ assertLanguage("en-US", userAgent);
+ }
+
+ @Test
+ public void testWindows() throws UnsupportedEncodingException {
+ EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL,
+ Platform.OS_WIN32, LOCALE_US);
+ String userAgent = eclipseEnvironment.getUserAgent();
+ assertApplicationNameAndVersion("com.jboss.jbds.product", "3.0.1", userAgent);
+ assertOs("Windows", "Windows NT 6.1", userAgent);
+ assertLanguage("en-US", userAgent);
+ }
+
+ private void assertApplicationNameAndVersion(String applicationName, String applicationVersion, String userAgent) {
+ Matcher matcher = Pattern.compile("([a-zA-Z\\.]+)/([0-9\\.]+).+").matcher(userAgent);
+ assertTrue(matcher.matches());
+ assertEquals(2, matcher.groupCount());
+ assertEquals(applicationName, matcher.group(1));
+ assertEquals(applicationVersion, matcher.group(2));
+ }
+
+ private void assertOs(String platform, String os, String userAgent) {
+ Matcher matcher = Pattern.compile(".+ \\((.+); U; (.+); .+\\)").matcher(userAgent);
+ assertTrue(matcher.matches());
+ assertEquals(2, matcher.groupCount());
+ assertEquals(platform, matcher.group(1));
+ assertEquals(os, matcher.group(2));
+ }
+
+ private void assertLanguage(String language, String userAgent) {
+ Matcher matcher = Pattern.compile(".+ \\(.+; U; .+ .+; (.+)\\)").matcher(userAgent);
+ assertTrue(matcher.matches());
+ assertEquals(1, matcher.groupCount());
+ assertEquals(language, matcher.group(1));
+ }
+}
Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentFake.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentFake.java (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentFake.java 2010-08-16 11:04:19 UTC (rev 24178)
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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 org.jboss.tools.usage.internal.EclipseEnvironment;
+
+public class EclipseEnvironmentFake extends EclipseEnvironment {
+
+ private String locale;
+ private String os;
+
+ public EclipseEnvironmentFake(String accountName, String hostName, String referral, String os, String locale) {
+ super(accountName, hostName, referral);
+ this.os = os;
+ this.locale = locale;
+ }
+
+ @Override
+ protected void initScreenSettings() {
+ // do not access swt/display
+ }
+
+ @Override
+ public String getScreenResolution() {
+ return 1920 + SCREERESOLUTION_DELIMITER + 1080;
+ }
+
+ @Override
+ public String getScreenColorDepth() {
+ return 24 + SCREENCOLORDEPTH_POSTFIX;
+ }
+
+ @Override
+ protected String getApplicationName() {
+ return "com.jboss.jbds.product";
+ }
+
+ @Override
+ protected String getNL() {
+ return locale;
+ }
+
+ @Override
+ protected String getOS() {
+ return os;
+ }
+
+ @Override
+ protected String getApplicationVersion() {
+ return "3.0.1";
+ }
+
+}
Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentFake.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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-08-16 11:01:36 UTC (rev 24177)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java 2010-08-16 11:04:19 UTC (rev 24178)
@@ -1,6 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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 org.jboss.tools.usage.jgoogleanalytics.FocusPoint;
+import org.jboss.tools.usage.googleanalytics.FocusPoint;
import org.jboss.tools.usage.util.EncodingUtils;
import junit.framework.TestCase;
@@ -8,8 +18,11 @@
public class FocusPointTest extends TestCase {
private static final String root = "root";
+
private static final String child1 = "child1";
+
private static final String URI_SEPARATOR_ENCODED = EncodingUtils.checkedEncodeUtf8(FocusPoint.URI_SEPARATOR);
+
private static final String TITLE_SEPARATOR_ENCODED = EncodingUtils.checkedEncodeUtf8(FocusPoint.TITLE_SEPARATOR);
public void testGetContentURI_Simple() throws Exception {
@@ -39,5 +52,4 @@
assertNotNull(contentTitle);
assertEquals(root + TITLE_SEPARATOR_ENCODED + child1, contentTitle);
}
-
}
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java 2010-08-16 11:01:36 UTC (rev 24177)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java 2010-08-16 11:04:19 UTC (rev 24178)
@@ -14,10 +14,10 @@
import java.io.UnsupportedEncodingException;
-import org.jboss.tools.usage.jgoogleanalytics.EclipseEnvironment;
-import org.jboss.tools.usage.jgoogleanalytics.FocusPoint;
-import org.jboss.tools.usage.jgoogleanalytics.GoogleAnalyticsUrlStrategy;
-import org.jboss.tools.usage.jgoogleanalytics.IGoogleAnalyticsParameters;
+import org.eclipse.core.runtime.Platform;
+import org.jboss.tools.usage.googleanalytics.FocusPoint;
+import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters;
+import org.jboss.tools.usage.internal.GoogleAnalyticsUrlStrategy;
import org.junit.Before;
import org.junit.Test;
@@ -25,6 +25,8 @@
private static final String GANALYTICS_ACCOUNTNAME = "UA-17645367-1";
private static final String HOSTNAME = "jboss.org";
+ private static final String REFERRAL = "0";
+ private static final String LOCALE_US = "en_US";
// private static final String COOKIE_DELIMITER = EncodingUtils.checkedEncodeUtf8(String
// .valueOf(IGoogleAnalyticsParameters.PLUS_SIGN));
@@ -37,7 +39,7 @@
}
@Test
- public void testUrlIsBuiltCorrectly() throws UnsupportedEncodingException {
+ public void testUrlIsCorrect() throws UnsupportedEncodingException {
FocusPoint focusPoint = new FocusPoint("testing").setChild(new FocusPoint("strategy"));
String url = urlStrategy.build(focusPoint);
String targetUrl = "http://www.google-analytics.com/__utm.gif?"
@@ -114,31 +116,29 @@
}
private class EclipseEnvironmentGAUrlStrategy extends GoogleAnalyticsUrlStrategy {
+
private EclipseEnvironmentGAUrlStrategy() {
- super(new EclipseEnvironmentFake());
- }
- }
+ super(new EclipseEnvironmentFake(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL, Platform.OS_LINUX, LOCALE_US) {
- private class EclipseEnvironmentFake extends EclipseEnvironment {
+ @Override
+ public String getScreenColorDepth() {
+ return "24-bit";
+ }
- public EclipseEnvironmentFake() {
- super(GANALYTICS_ACCOUNTNAME, HOSTNAME, "0");
- }
+ @Override
+ public String getScreenResolution() {
+ return "1920x1080";
+ }
- @Override
- protected void initScreenSettings() {
- // do not access swt/display
- }
+ @Override
+ public String getBrowserLanguage() {
+ return "en_us";
+ }
- @Override
- public String getScreenResolution() {
- return 1920 + SCREERESOLUTION_DELIMITER + 1080;
+ @Override
+ public String getUserId() {
+ return String.valueOf(System.currentTimeMillis());
+ }});
}
-
- @Override
- public String getScreenColorDepth() {
- return 24 + SCREENCOLORDEPTH_POSTFIX;
- }
-
}
}
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-08-16 11:01:36 UTC (rev 24177)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-16 11:04:19 UTC (rev 24178)
@@ -5,15 +5,24 @@
import java.io.IOException;
import java.net.HttpURLConnection;
-import org.jboss.tools.usage.jgoogleanalytics.HttpGetMethod;
+import org.jboss.tools.usage.googleanalytics.ILoggingAdapter;
+import org.jboss.tools.usage.internal.HttpGetMethod;
+import org.junit.Before;
import org.junit.Test;
public class JBossToolsUsageRequestsTest {
+ private ILoggingAdapter loggingAdapter;
+
+ @Before
+ public void setUp() {
+ this.loggingAdapter = new SystemOutLogger();
+ }
+
@Test
public void testUrl0() throws IOException {
String userAgent = "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.4) Gecko/20100614 Ubuntu/10.04 (lucid) Firefox/10.0.0";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent);
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
+"&utmn=338321265"
@@ -38,7 +47,7 @@
@Test
public void testUrl0_0() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent);
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
+"&utmn=338321288"
@@ -63,7 +72,7 @@
@Test
public void testUrl0_1() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US; rv:1.9.2.4) Gecko/20100614 Ubuntu/10.04 (lucid) v201006010437R-H98-GA";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent);
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
+"&utmn=3383212651"
@@ -88,7 +97,7 @@
@Test
public void testUrl0_2() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US; rv:1.9.2.4) Gecko/20100614 Ubuntu/10.04 (lucid) Eclipse/3.5.0";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent);
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
+"&utmn=3383212652"
@@ -113,7 +122,7 @@
@Test
public void testUrl0_3() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US;) Eclipse/3.5.0";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent);
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
+"&utmn=3383212651"
@@ -138,7 +147,7 @@
@Test
public void testUrl0_4() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent);
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
+"&utmn=3383212651"
@@ -163,7 +172,7 @@
@Test
public void testUrl0_5() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (Linux x86_64)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent);
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
+"&utmn=33832126513"
@@ -188,7 +197,7 @@
@Test
public void testUrl0_6() throws IOException {
String userAgent = "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.4) Gecko/20100614 Ubuntu/10.04 (lucid) com.jboss.jbds.product/3.0.1";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent);
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
+"&utmn=338321265"
@@ -213,7 +222,7 @@
@Test
public void testUrl0_7() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent);
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
+"&utmn=338321268"
@@ -238,7 +247,7 @@
@Test
public void testUrl0_7_1() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-us)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent);
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
+"&utmn=338321068"
@@ -263,7 +272,7 @@
@Test
public void testUrl0_7_2() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent);
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
+"&utmn=338333268"
@@ -277,7 +286,7 @@
+"&utmr=0"
+"&utmp=%2Ftools%2Fusage%2FtestUrl0_7_2"
+"&utmac=UA-17645367-1"
- +"&utmcc=__utma%3D156660507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+ +"&utmcc=__utma%3D156620507.1285760111.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+"&gaq=1";
method.request(url);
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
@@ -286,10 +295,10 @@
@Test
public void testUrl0_7_3() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent);
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
- +"&utmn=331333268"
+ +"&utmn=311333268"
+"&utmhn=jboss.org"
+"&utmcs=UTF-8"
+"&utmsr=1920x1080"
@@ -300,25 +309,117 @@
+"&utmr=0"
+"&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3"
+"&utmac=UA-17645367-1"
- +"&utmcc=__utma%3D116660507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+ +"&utmcc=__utma%3D112660507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+"&gaq=1";
method.request(url);
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
+
+ @Test
+ public void testUrl0_7_3_mac() throws IOException {
+ String userAgent = "com.jboss.jbds.product/3.0.1 (Macintosh; U; Intel Mac OS X 10.5; fr)";
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+ String url = "http://www.google-analytics.com/__utm.gif?"
+ +"utmwv=4.7.2"
+ +"&utmn=351333268"
+ +"&utmhn=jboss.org"
+ +"&utmcs=UTF-8"
+ +"&utmsr=1920x1080"
+ +"&utmsc=24-bit"
+ +"&utmul=en-us"
+ +"&utmdt=tools-usage-test_0_7_3"
+ +"&utmhid=1087431432"
+ +"&utmr=0"
+ +"&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_mac"
+ +"&utmac=UA-17645367-1"
+ +"&utmcc=__utma%3D133660507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+ +"&gaq=1";
+ method.request(url);
+ assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+ }
+
+ @Test
+ public void testUrl0_7_3_win() throws IOException {
+ String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+ String url = "http://www.google-analytics.com/__utm.gif?"
+ +"utmwv=4.7.2"
+ +"&utmn=351333254"
+ +"&utmhn=jboss.org"
+ +"&utmcs=UTF-8"
+ +"&utmsr=1920x1080"
+ +"&utmsc=24-bit"
+ +"&utmul=en-us"
+ +"&utmdt=tools-usage-test_0_7_3_win"
+ +"&utmhid=1087431432"
+ +"&utmr=0"
+ +"&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win"
+ +"&utmac=UA-17645367-1"
+ +"&utmcc=__utma%3D133660522.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+ +"&gaq=1";
+ method.request(url);
+ assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+ }
+
+ @Test
+ public void testUrl0_7_3_1() throws IOException {
+ String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+ String url = "http://www.google-analytics.com/__utm.gif?"
+ +"utmwv=4.7.2"
+ +"&utmn=358333254"
+ +"&utmhn=jboss.org"
+ +"&utmcs=UTF-8"
+ +"&utmsr=1920x1080"
+ +"&utmsc=24-bit"
+ +"&utmul=en-us"
+ +"&utmdt=tools-usage-test_0_7_3_1"
+ +"&utmhid=1087431432"
+ +"&utmr=smooks|seam|drools|esb"
+ +"&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_1"
+ +"&utmac=UA-17645367-1"
+ +"&utmcc=__utma%3D133860522.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+ +"&gaq=1";
+ method.request(url);
+ assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+ }
+
+ @Test
+ public void testUrl8() throws IOException {
+ String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+ String url = "http://www.google-analytics.com/__utm.gif?"
+ +"utmwv=4.7.2"
+ +"&utmn=453325272"
+ +"&utmhn=jboss.org"
+ +"&utmcs=UTF-8"
+ +"&utmsr=1920x1080"
+ +"&utmsc=24-bit"
+ +"&utmul=en-US"
+ +"&utmdt=jboss.org-tools-usage-instance"
+ +"&utmhid=1722580305"
+ +"&utmr=org.jboss.tools.usage.tests"
+ +"&utmp=%2Fjboss.org%2Ftools%2Fusage%2FtestUrl8"
+ +"&utmac=UA-17645367-1"
+ +"&utmcc=__utma%3D999.69517276658961975851281943564260.1281943564259.1281943564259.1281943564259.-1%3B%2B__utmz%3D999.1281943564259.1.1.utmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%3B"
+ +"&gaq=1";
+ method.request(url);
+ assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+ }
+
protected class TestHttpGetMethod extends HttpGetMethod {
private HttpURLConnection urlConnection;
- public TestHttpGetMethod(String userAgent) {
- super(userAgent);
+ public TestHttpGetMethod(String userAgent, ILoggingAdapter loggingAdapter) {
+ super(userAgent, loggingAdapter);
}
@Override
protected HttpURLConnection createURLConnection(String urlString,
String userAgent) throws IOException {
- this.urlConnection = super.createURLConnection(urlString, userAgent);
- return urlConnection;
+ return this.urlConnection = super.createURLConnection(urlString, userAgent);
}
public int getResponseCode() throws IOException {
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java 2010-08-16 11:01:36 UTC (rev 24177)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java 2010-08-16 11:04:19 UTC (rev 24178)
@@ -10,44 +10,45 @@
******************************************************************************/
package org.jboss.tools.usage.test;
-import org.jboss.tools.usage.IUsageTracker;
-import org.jboss.tools.usage.jgoogleanalytics.EclipseEnvironment;
-import org.jboss.tools.usage.jgoogleanalytics.FocusPoint;
-import org.jboss.tools.usage.jgoogleanalytics.IGoogleAnalyticsParameters;
-import org.jboss.tools.usage.jgoogleanalytics.Tracker;
-import org.jboss.tools.usage.jgoogleanalytics.PluginLogger;
+import org.eclipse.core.runtime.Platform;
+import org.jboss.tools.usage.ITracker;
+import org.jboss.tools.usage.googleanalytics.FocusPoint;
+import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters;
+import org.jboss.tools.usage.googleanalytics.ILoggingAdapter;
+import org.jboss.tools.usage.googleanalytics.Tracker;
+import org.jboss.tools.usage.internal.PluginLogger;
import org.jboss.tools.usage.test.internal.JBossToolsUsageTestActivator;
import org.junit.Test;
public class JBossToolsUsageTest {
private static final String HOST_NAME = "jboss.org";
-
+ private static final String LOCALE_US = "en_US";
+
private FocusPoint focusPoint = new FocusPoint("jboss.org")
.setChild(new FocusPoint("tools")
.setChild(new FocusPoint("usage")
- .setChild(new FocusPoint("instance"))));
+ .setChild(new FocusPoint("test"))));
private static final String GANALYTICS_ACCOUNTNAME = "UA-17645367-1";
@Test
public void testTrackAsynchronously() throws Exception {
- IUsageTracker tracker = getGoogleAnalyticsTracker();
+ ITracker tracker = getGoogleAnalyticsTracker();
tracker.trackAsynchronously(focusPoint);
Thread.sleep(3000);
}
@Test
public void testTrackSynchronously() throws Exception {
- IUsageTracker tracker = getGoogleAnalyticsTracker();
+ ITracker tracker = getGoogleAnalyticsTracker();
tracker.trackSynchronously(focusPoint);
}
- private IUsageTracker getGoogleAnalyticsTracker() {
- IGoogleAnalyticsParameters eclipseSettings = new EclipseEnvironment(
- GANALYTICS_ACCOUNTNAME, HOST_NAME, JBossToolsUsageTestActivator.PLUGIN_ID);
- Tracker tracker = new Tracker(eclipseSettings);
- tracker.setLoggingAdapter(new PluginLogger(JBossToolsUsageTestActivator.getDefault()));
- return tracker;
+ private ITracker getGoogleAnalyticsTracker() {
+ IGoogleAnalyticsParameters eclipseSettings = new EclipseEnvironmentFake(
+ GANALYTICS_ACCOUNTNAME, HOST_NAME, JBossToolsUsageTestActivator.PLUGIN_ID, Platform.OS_LINUX, LOCALE_US);
+ ILoggingAdapter loggingAdapter = new PluginLogger(JBossToolsUsageTestActivator.getDefault());
+ return new Tracker(eclipseSettings, loggingAdapter);
}
}
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/SystemOutLogger.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/SystemOutLogger.java 2010-08-16 11:01:36 UTC (rev 24177)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/SystemOutLogger.java 2010-08-16 11:04:19 UTC (rev 24178)
@@ -1,14 +1,14 @@
package org.jboss.tools.usage.test;
-import org.jboss.tools.usage.jgoogleanalytics.ILoggingAdapter;
+import org.jboss.tools.usage.googleanalytics.ILoggingAdapter;
public class SystemOutLogger implements ILoggingAdapter {
public void logError(String errorMessage) {
- System.out.println("errorMessage = " + errorMessage);
+ System.out.println("[DEBUG]: " + errorMessage);
}
public void logMessage(String message) {
- System.out.println("message = " + message);
+ System.out.println("[ERROR]" + message);
}
}
Added: 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 (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java 2010-08-16 11:04:19 UTC (rev 24178)
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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 org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+ at RunWith(Suite.class)
+ at Suite.SuiteClasses( {
+ FocusPointTest.class,
+ GoogleAnalyticsUrlStrategyTest.class,
+ JBossToolsUsageRequestsTest.class,
+ JBossToolsUsageTest.class,
+ EclipseEnvironmenTest.class })
+public class UsageTestSuite {
+
+}
Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
More information about the jbosstools-commits
mailing list