Author: adietish Date: 2010-09-10 08:46:43 -0400 (Fri, 10 Sep 2010) New Revision: 24863 Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingEclipseEnvironment.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 Log: [JBIDE-7041] put jboss tools version into ad content (utm_content), test triggered, waiting for results Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-09-10 12:34:31 UTC (rev 24862) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-09-10 12:46:43 UTC (rev 24863) @@ -118,10 +118,11 @@ appendParameter(IGoogleAnalyticsParameters.PARAM_ACCOUNT_NAME, googleParameters.getAccountName(), builder); appendParameter(IGoogleAnalyticsParameters.PARAM_COOKIES, getCookies(), builder); + appendParameter(IGoogleAnalyticsParameters.PARAM_AD_CONTENT, googleParameters.getAdContent(), builder); appendParameter(IGoogleAnalyticsParameters.PARAM_GAQ, "1", false, builder); + + googleParameters.visit(); // update visit timestamps and count - googleParameters.visit(); - return builder.toString(); } Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java 2010-09-10 12:34:31 UTC (rev 24862) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java 2010-09-10 12:46:43 UTC (rev 24863) @@ -56,7 +56,8 @@ public static final String PARAM_COOKIES_UTMCCN = "utmccn"; public static final String PARAM_COOKIES_UTMCMD = "utmcmd"; public static final String PARAM_COOKIES_KEYWORD = "utmctr"; - + public static final String PARAM_AD_CONTENT = "utm_content"; + public static final String VALUE_TRACKING_CODE_VERSION = "4.7.2"; public static final String VALUE_NO_REFERRAL = "0"; public static final String VALUE_ENCODING_UTF8 = "UTF-8"; @@ -101,4 +102,6 @@ public void visit(); public String getFlashVersion(); + + public String getAdContent(); } Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingEclipseEnvironment.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingEclipseEnvironment.java 2010-09-10 12:34:31 UTC (rev 24862) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingEclipseEnvironment.java 2010-09-10 12:46:43 UTC (rev 24863) @@ -54,4 +54,12 @@ } return builder.toString(); } + + public String getAdContent() { + return getBundleVersion(); + } + + private String getBundleVersion() { + return JBossToolsUsageActivator.getDefault().getBundle().getVersion().toString(); + } } 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-09-10 12:34:31 UTC (rev 24862) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java 2010-09-10 12:46:43 UTC (rev 24863) @@ -55,7 +55,9 @@ + ReportingEclipseEnvironmentFake.JAVA_VERSION + "&utmac=UA-17645367-1" + "&utmcc=__utma%3D156030503.195542053.1281528584.1281528584.1281528584.1%3B%2B__utmz%3D156030500.1281528584.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B" + + "&utm_content=" + JBossToolsUsageActivator.getDefault().getBundle().getVersion() + "&gaq=1"; + assertTrue(areEqualParameterValues(IGoogleAnalyticsParameters.PARAM_TRACKING_CODE_VERSION, url, targetUrl)); assertTrue(areEqualParameterValues(IGoogleAnalyticsParameters.PARAM_HOST_NAME, url, targetUrl)); assertTrue(areEqualParameterValues(IGoogleAnalyticsParameters.PARAM_LANGUAGE_ENCODING, url, targetUrl)); @@ -66,6 +68,7 @@ assertTrue(areEqualParameterValues(IGoogleAnalyticsParameters.PARAM_PAGE_REQUEST, url, targetUrl)); assertTrue(areEqualParameterValues(IGoogleAnalyticsParameters.PARAM_ACCOUNT_NAME, url, targetUrl)); assertTrue(areEqualParameterValues(IGoogleAnalyticsParameters.PARAM_FLASH_VERSION, url, targetUrl)); + assertTrue(areEqualParameterValues(IGoogleAnalyticsParameters.PARAM_AD_CONTENT, url, targetUrl)); assertTrue(hasCookieValue("__utma", url)); assertTrue(hasCookieValue("__utmz", url)); 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-10 12:34:31 UTC (rev 24862) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-09-10 12:46:43 UTC (rev 24863) @@ -932,6 +932,9 @@ // assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); // } + /** + * FAILED + */ @Test public void testJBossToolsVersionInRefererrer() throws IOException { TestHttpGetMethod method = new TestHttpGetMethod(); @@ -953,6 +956,28 @@ assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); } + @Test + public void testJBossToolsVersionInAdContent() throws IOException { + TestHttpGetMethod method = new TestHttpGetMethod(); + String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2" + + "&utmn=818594305" + + "&utmhn=jboss.org" + + "&utmcs=UTF-8" + + "&utmsr=1920x1080" + + "&utmsc=24-bit" + + "&utmul=en-US" + + "&utmdt=testJBossToolsVersionInRefererrer" + + "&utmfl=1.6.0_20" + + "&utmr=0" + + "&utm_content=1.0.0.qualifier" + + "&utmp=testJBossToolsVersionInRefererrer" + + "&utmac=UA-17645367-1" + + "&utmcc=__utma%3D999.43297294488397354581284108794036.1284108794025.1284108794025.1284108794025.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()); + } + enum UserAgentString { DEFAULT("com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)"), @@ -975,27 +1000,48 @@ } @Test - public void testWin7UserAgent() throws IOException { - TestHttpGetMethod method = new TestHttpGetMethod(UserAgentString.WIN7); + public void testWinWin7UserAgent() throws IOException { + TestHttpGetMethod method = new TestHttpGetMethod(UserAgentString.WINXP); String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2" - + "&utmn=958594305" + + "&utmn=911593326" + "&utmhn=jboss.org" + "&utmcs=UTF-8" + "&utmsr=1920x1080" + "&utmsc=24-bit" + "&utmul=en-US" - + "&utmdt=testWin7UserAgent" + + "&utmdt=testWinWin7UserAgent" + "&utmfl=1.6.0_20" + "&utmr=1.0.0.qualifier" - + "&utmp=testWin7UserAgent" + + "&utmp=testWinWin7UserAgent" + "&utmac=UA-17645367-1" - + "&utmcc=__utma%3D999.43297292388397354581284108794036.1284108794025.1284108794025.1284108794025.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" + + "&utmcc=__utma%3D999.43297885388356354581284108794036.1284108794025.1284108794025.1284108794025.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 testWinVistaUserAgent() throws IOException { + TestHttpGetMethod method = new TestHttpGetMethod(UserAgentString.WINXP); + String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2" + + "&utmn=958593326" + + "&utmhn=jboss.org" + + "&utmcs=UTF-8" + + "&utmsr=1920x1080" + + "&utmsc=24-bit" + + "&utmul=en-US" + + "&utmdt=testWinVistaUserAgent" + + "&utmfl=1.6.0_20" + + "&utmr=1.0.0.qualifier" + + "&utmp=testWinVistaUserAgent" + + "&utmac=UA-17645367-1" + + "&utmcc=__utma%3D999.43297885388397354581284108794036.1284108794025.1284108794025.1284108794025.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 testWinXPUserAgent() throws IOException { TestHttpGetMethod method = new TestHttpGetMethod(UserAgentString.WINXP); String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2"