[jbosstools-commits] JBoss Tools SVN: r24605 - in trunk/usage/tests/org.jboss.tools.usage.test: src/org/jboss/tools/usage/test and 1 other directory.

Author: adietish Date: 2010-09-01 09:31:27 -0400 (Wed, 01 Sep 2010) New Revision: 24605 Modified: trunk/usage/tests/org.jboss.tools.usage.test/GlobalUsageReportingSettingsTest.launch trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java Log: [JBIDE-6880] Switching to properties file Modified: trunk/usage/tests/org.jboss.tools.usage.test/GlobalUsageReportingSettingsTest.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/GlobalUsageReportingSettingsTest.launch 2010-09-01 13:29:40 UTC (rev 24604) +++ trunk/usage/tests/org.jboss.tools.usage.test/GlobalUsageReportingSettingsTest.launch 2010-09-01 13:31:27 UTC (rev 24605) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> <booleanAttribute key="append.args" value="true"/> <stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> @@ -12,6 +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.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.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}/../junit-workspace"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> @@ -36,10 +37,11 @@ <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.swt@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.resources@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.help.base@default:default,org.eclipse.core.databinding.property@default:default,com.springsource.org.apache.commons.logging@default:default,org.mortbay.jetty.util@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ecf@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.jobs@default:default,org.apache.jasper@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.help.ui@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.databinding@default:default,com.springsource.javax.! el@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.osgi@-1:true,org.eclipse.ui.ide@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.equinox.preferences@default:default,org.apache.lucene@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.equinox.security@default:default,org.eclipse.text@default:default,org.eclipse.core.variables@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.app@default:default,org.eclipse.osgi.services@default:default,org.junit4@default:default,org.apache.lucene.analysis@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.core.resources.compatibility@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.expressions@default:default,org.ec! lipse.equinox.http.jetty@default:default,org.eclipse.jface@def! ault:def ault,org.eclipse.equinox.common@2:true,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.databinding.observable@default:default,com.springsource.javax.servlet.jsp@default:default,org.eclipse.compare.core@default:default,org.eclipse.ui.intro@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,javax.servlet@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.commands@default:default,org.apache.commons.el@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ui.views@default:default,com.ibm.icu@default:default,com.jboss.jbds.product@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ui.cocoa@default:false,org.eclipse.ant.core@default! :default,org.eclipse.ui.intro.universal@default:default,org.apache.ant@default:default,org.eclipse.equinox.transforms.hook@default:false,org.hamcrest.core@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.help@default:default,com.springsource.javax.servlet@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.registry@default:default,javax.transaction@default:false,org.eclipse.equinox.p2.repository@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui@default:default,org.eclipse.ui.cheatsheets@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.jface.text@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.help@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ltk.ui.refactoring@default:default,com.ibm.icu@default:default,ch.qos.logback.classic@default:default,org.eclipse.ui.editors@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.junit4@default:default,javax.mail@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.ui.intro@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.team.ui@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ui.navigator.resources@default:default,org.eclipse.help.base@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse! .swt@default:default,org.eclipse.equinox.common@2:true,org.eclipse.net4j.jms.api@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.expressions@default:default,org.apache.lucene.analysis@default:default,org.eclipse.jface@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf@default:default,org.eclipse.update.configurator@default:default,org.eclipse.equinox.p2.repository@default:default,org.apache.jasper@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.p2.metadata@default:default,org.mortbay.jetty.server@default:default,javax.servlet.jsp@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.variables@default:default,org.eclipse.help.ui@default:default,org.eclipse.equinox.htt! p.servlet@default:default,org.eclipse.core.filesystem@default:! default, org.mortbay.jetty.util@default:default,org.eclipse.ui.ide@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.ltk.core.refactoring@default:default,org.apache.commons.el@default:default,org.eclipse.equinox.app@default:default,org.eclipse.osgi@-1:true,org.eclipse.ui.views@default:default,org.eclipse.team.core@default:default,javax.activation@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,javax.servlet@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.p2.engine@default:default,org.slf4j.api@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.hamcrest.core@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,ch.qos.logback.slf4j@default:false,org.eclipse.equinox.security.macosx@def! ault:false,org.eclipse.ecf.identity@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ecf.ssl@default:false,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.osgi.services@default:default,org.eclipse.ui@default:default,org.eclipse.ui.forms@default:default,org.eclipse.compare@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.text@default:default,org.eclipse.core.databinding.property@default:default,ch.qos.logback.core@default:default,org.eclipse.core.net@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.apache.lucene@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.apache.ant@default:default,org.eclipse.core.jobs@default:default,org.! eclipse.ecf.provider.filetransfer@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.usage.test@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <booleanAttribute key="tracing" value="false"/> +<booleanAttribute key="useCustomFeatures" value="false"/> <booleanAttribute key="useDefaultConfig" value="true"/> <booleanAttribute key="useDefaultConfigArea" value="false"/> <booleanAttribute key="useProduct" value="false"/> Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java 2010-09-01 13:29:40 UTC (rev 24604) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java 2010-09-01 13:31:27 UTC (rev 24605) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.usage.test; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -31,13 +30,13 @@ @Test public void canExtractEnabledValue() throws IOException { - GlobalReportingSettingsFake reportSettings = new GlobalReportingSettingsFake("ENABLED", "", ""); + GlobalReportingSettingsFake reportSettings = new GlobalReportingSettingsFake("true", "", ""); assertTrue(reportSettings.isEnabled()); } @Test public void canExtractDisabledValue() throws IOException { - GlobalReportingSettingsFake reportSettings = new GlobalReportingSettingsFake("DISABLED", "", ""); + GlobalReportingSettingsFake reportSettings = new GlobalReportingSettingsFake("false", "", ""); assertFalse(reportSettings.isEnabled()); } @@ -47,18 +46,6 @@ assertFalse(reportEnablement.isEnabled()); } - @Test - public void canExtractStringValue() throws IOException { - GlobalReportingSettingsFake reportSettings = new GlobalReportingSettingsFake("", "dummy", ""); - assertEquals("dummy", reportSettings.getStringValue()); - } - - @Test - public void canExtractIntegerValue() throws IOException { - GlobalReportingSettingsFake reportSettings = new GlobalReportingSettingsFake("", "", "42"); - assertEquals(Integer.valueOf(42), reportSettings.getIntegerValue()); - } - private class GlobalReportingSettingsFake extends GlobalUsageReportingSettings { private String enablementValue; @@ -74,7 +61,7 @@ } @Override - protected InputStreamReader request(HttpURLConnection urlConnection) throws UnsupportedEncodingException { + protected InputStreamReader request(HttpURLConnection urlConnection) throws UnsupportedEncodingException { return new InputStreamReader(new ByteArrayInputStream(getEnablementPageContent(enablementValue, stringValue, integerValue).getBytes()), "UTF-8"); } @@ -82,122 +69,13 @@ private String getEnablementPageContent(String enablementValue, String dummyValue, String integerValue) { - return -// "Dummy Value would be cool but here follows the Boolean Value for the Report Enablement: " -// + "<h1>" + GlobalUsageReportingSettings.KEY_REPORT_ENABLEMENT -// + enablementValue -// + "</h1>" -// -// + "The Dummy Value in this Resource is set to " -// + "<h1>" + GlobalUsageReportingSettings.KEY_DUMMY_VALUE -// + dummyValue -// + "</h1>" -// -// + "Boolean Usage Reporting is set to:" -// + "<h1>" + GlobalUsageReportingSettings.KEY_REPORT_ENABLEMENT -// + enablementValue -// + "</h1>" -// -// + "And the value of type Integer is " -// + "<h1>" + GlobalUsageReportingSettings.KEY_INTEGER_VALUE -// + integerValue -// + "</h1>" -// + " is the Value that is a String"; - "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"" - + "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\"> " - + " " - + " " - + - "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\"> " - + "<head> " - + - " <title> JBoss Tools / JBoss Developer Studio Usage Reporting Enablement - JBoss Community</title> " - + " " - + - " <meta http-equiv=\"X-UA-Compatible\" content=\"IE=EmulateIE7\" /> " - + " " - + " <script type=\"text/javascript\"> " - + " var javascriptIsCool = false;" - + " </script> " - + " " - + "</head> " - + "<body class=\"jive-body-content jive-body-content-document\" > " - + " <div id=\"jive-body\"> " - + " " - + "<div class=\"jive-content\"> " - + " <div class=\"jive-content-header\"> " - + - " <div class=\"jive-wiki-post-moderating jive-content-header-moderating\"> " - + - " <span class=\"jive-icon-med jive-icon-moderation\"></span>Currently Being Moderated" - + " </div> " - + " <div class=\"jive-content-title\"> " - + - " <h2><span class=\"jive-icon-big jive-icon-document\"></span> JBoss Tools / JBoss Developer Studio Usage Reporting Enablement</h2> " - + " </div> " - + " <div class=\"jive-content-header-version\"> " - + " VERSION 5&nbsp;" - + - " <a href=\"/wiki/JBossToolsJBossDeveloperStudioUsageReportingEnablement/diff?secondVersionNumber=5\" title=\"Click to view article history\"><img class=\"jive-icon-sml jive-icon-search\" src=\"/4.0.5/images/transparent.png\" alt=\"Click to view article history\" /></a> " - + " </div> " - + " <div class=\"jive-content-header-details\"> " - + " " - + "Created on: Aug 24, 2010 5:39 AM by" - + "<a href=\"/people/adietish\"" - + "id=\"jive-72036899,987,346,482,238\"" - + "onmouseover=\"quickuserprofile.getUserProfileTooltip(72036);\"" - + "onmouseout=\"quickuserprofile.cancelTooltip();\"" - + "class=\"jiveTT-hover-user jive-username-link\"" - + ">Andre Dietisheim</a> <span>-</span> " - + "Last Modified:&nbsp;" - + "Aug 24, 2010 5:53 AM" - + "by <a href=\"/people/adietish\"" - + "id=\"jive-72036899,987,347,353,238\"" - + "onmouseover=\"quickuserprofile.getUserProfileTooltip(72036);\"" - + "onmouseout=\"quickuserprofile.cancelTooltip();\"" - + "class=\"jiveTT-hover-user jive-username-link\"" - + ">Andre Dietisheim</a> </div> " - + " " - + " </div> " - + " <div class=\"jive-content-body\"> " - + " " - + - "<!-- [DocumentBodyStart:e26c60c0-cb73-47b7-bded-f4eb7320305b] --><div class=\"jive-rendered-content\"><p>This article is queried by the JBoss Tools / JBoss Developer Studio usage reporting plugin. It implements a global kill-switch that allows us to disable usage reporting stats. The plugin looks for a string of the format:</p><p style=\"min-height: 8pt; height: 8pt; padding: 0px;\">&#160;</p><p><strong>Usage&#160; Reporting&#160; is &lt;" - + - "ENABLED&gt;</strong>. Any value that differs from ENABLED is interpreted as DISABLED.</p><p style=\"min-height: 8pt; height: 8pt; padding: 0px;\">&#160;</p><h1>Usage Reporting is " - - + enablementValue - - + "</h1>" - + "<h1>Dummy Value is " - - + dummyValue - - + "</h1>" - - + "<h1>Integer Value is " - - + integerValue - - + "</h1>" - - + - "</div><!-- [DocumentBodyEnd:e26c60c0-cb73-47b7-bded-f4eb7320305b] --> " - + " " - + " </div> " - + " <div class=\"jive-content-footer\"> " - + " " - + " " - + " <!-- BEGIN content details --> " - + " <span class=\"jive-content-footer-item\"> " - + " 18&nbsp;Views</a> " - + " </span> " - + " " - + " " - + " </div> " - + "</div> " - + "</body> " - + "</html> "; + return "some rubbish at the beginning..." + + GlobalUsageReportingSettings.REPORT_ENABLEMENT_KEY + + enablementValue + + "\n" + + "#" + + "some rubbish at the end"; + } @Test