This commit was manufactured by cvs2svn to create tag 'I20080121-051'.
diff --git a/test/org.eclipse.epp.usagedata.recording.tests/.classpath b/test/org.eclipse.epp.usagedata.recording.tests/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/test/org.eclipse.epp.usagedata.recording.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/test/org.eclipse.epp.usagedata.recording.tests/.project b/test/org.eclipse.epp.usagedata.recording.tests/.project
deleted file mode 100644
index a9802b0..0000000
--- a/test/org.eclipse.epp.usagedata.recording.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.epp.usagedata.recording.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/test/org.eclipse.epp.usagedata.recording.tests/BasicUploaderTests.launch b/test/org.eclipse.epp.usagedata.recording.tests/BasicUploaderTests.launch
deleted file mode 100644
index cec35bb..0000000
--- a/test/org.eclipse.epp.usagedata.recording.tests/BasicUploaderTests.launch
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.mylyn.monitor.core,org.eclipse.mylyn.tasks.core,org.eclipse.mylyn.context.tests,org.eclipse.epp.usagedata.ui,org.eclipse.mylyn.monitor.ui,org.eclipse.mylyn.monitor.tests,org.apache.harmony.eclipse.jdt.launching,org.eclipse.mylyn,org.eclipse.mylyn.monitor.usage,org.eclipse.mylyn.context.ui,org.eclipse.mylyn.tasks.ui,org.eclipse.mylyn.web.core,org.eclipse.monitor.bundles,org.eclipse.mylyn.context.core"/>
-<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.eclipse.epp.usagedata.recording.tests/src/org/eclipse/epp/usagedata/internal/recording/uploading/BasicUploaderTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<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/J2SE-1.5"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.epp.usagedata.internal.recording.uploading.BasicUploaderTests"/>
-<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.eclipse.epp.usagedata.recording.tests"/>
-<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="org.eclipse.sdk.ide"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu,com.ibm.icu.source,com.jcraft.jsch,javax.servlet,javax.servlet.jsp,javax.servlet.jsp.source,javax.servlet.source,org.apache.ant,org.apache.ant.source,org.apache.commons.el,org.apache.commons.el.source,org.apache.commons.logging,org.apache.commons.logging.source,org.apache.jasper,org.apache.jasper.source,org.apache.lucene,org.apache.lucene.analysis,org.apache.lucene.analysis.source,org.apache.lucene.source,org.eclipse.ant.core,org.eclipse.ant.ui,org.eclipse.compare,org.eclipse.core.boot,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.databinding,org.eclipse.core.databinding.beans,org.eclipse.core.expressions,org.eclipse.core.filebuffers,org.eclipse.core.filesystem,org.eclipse.core.filesystem.linux.x86,org.eclipse.core.jobs,org.eclipse.core.net,org.eclipse.core.resources,org.eclipse.core.resources.compatibility,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.core.variables,org.eclipse.cvs,org.eclipse.cvs.source,org.eclipse.debug.core,org.eclipse.debug.ui,org.eclipse.equinox.app,org.eclipse.equinox.common,org.eclipse.equinox.http.jetty,org.eclipse.equinox.http.registry,org.eclipse.equinox.http.servlet,org.eclipse.equinox.jsp.jasper,org.eclipse.equinox.jsp.jasper.registry,org.eclipse.equinox.launcher,org.eclipse.equinox.launcher.gtk.linux.x86,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.help.appserver,org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.help.webapp,org.eclipse.jdt,org.eclipse.jdt.apt.core,org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.ui,org.eclipse.jdt.compiler.apt,org.eclipse.jdt.compiler.tool,org.eclipse.jdt.core,org.eclipse.jdt.core.manipulation,org.eclipse.jdt.debug,org.eclipse.jdt.debug.ui,org.eclipse.jdt.doc.isv,org.eclipse.jdt.doc.user,org.eclipse.jdt.junit,org.eclipse.jdt.junit.runtime,org.eclipse.jdt.junit4.runtime,org.eclipse.jdt.launching,org.eclipse.jdt.source,org.eclipse.jdt.ui,org.eclipse.jface,org.eclipse.jface.databinding,org.eclipse.jface.text,org.eclipse.jsch.core,org.eclipse.jsch.ui,org.eclipse.ltk.core.refactoring,org.eclipse.ltk.ui.refactoring,org.eclipse.osgi,org.eclipse.osgi.services,org.eclipse.osgi.util,org.eclipse.pde,org.eclipse.pde.build,org.eclipse.pde.core,org.eclipse.pde.doc.user,org.eclipse.pde.junit.runtime,org.eclipse.pde.runtime,org.eclipse.pde.source,org.eclipse.pde.ui,org.eclipse.pde.ui.templates,org.eclipse.platform,org.eclipse.platform.doc.isv,org.eclipse.platform.doc.user,org.eclipse.platform.source,org.eclipse.rcp,org.eclipse.rcp.source,org.eclipse.sdk,org.eclipse.search,org.eclipse.swt,org.eclipse.swt.gtk.linux.x86,org.eclipse.team.core,org.eclipse.team.cvs.core,org.eclipse.team.cvs.ssh,org.eclipse.team.cvs.ssh2,org.eclipse.team.cvs.ui,org.eclipse.team.ui,org.eclipse.text,org.eclipse.ui,org.eclipse.ui.browser,org.eclipse.ui.cheatsheets,org.eclipse.ui.console,org.eclipse.ui.editors,org.eclipse.ui.externaltools,org.eclipse.ui.forms,org.eclipse.ui.ide,org.eclipse.ui.ide.application,org.eclipse.ui.intro,org.eclipse.ui.intro.universal,org.eclipse.ui.navigator,org.eclipse.ui.navigator.resources,org.eclipse.ui.net,org.eclipse.ui.presentations.r21,org.eclipse.ui.views,org.eclipse.ui.views.log,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.workbench,org.eclipse.ui.workbench.compatibility,org.eclipse.ui.workbench.texteditor,org.eclipse.update.configurator,org.eclipse.update.core,org.eclipse.update.core.linux,org.eclipse.update.scheduler,org.eclipse.update.ui,org.junit,org.junit.source,org.junit4,org.mortbay.jetty,org.mortbay.jetty.source"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.epp.usagedata.gathering.tests,org.eclipse.epp.usagedata.recording,org.apache.commons.codec,org.eclipse.epp.usagedata.recording.tests,org.eclipse.epp.usagedata.gathering,org.apache.commons.httpclient"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useNamedJRE" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>
diff --git a/test/org.eclipse.epp.usagedata.recording.tests/META-INF/MANIFEST.MF b/test/org.eclipse.epp.usagedata.recording.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index b6aeb98..0000000
--- a/test/org.eclipse.epp.usagedata.recording.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Usage Data Recording Tests Fragment
-Bundle-SymbolicName: org.eclipse.epp.usagedata.recording.tests;singleton:=true
-Bundle-Version: 1.0.0
-Fragment-Host: org.eclipse.epp.usagedata.recording;bundle-version="[0.1.5,0.2.0)"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.junit4,
- javax.servlet,
- org.eclipse.equinox.http.jetty,
- org.eclipse.osgi.services
diff --git a/test/org.eclipse.epp.usagedata.recording.tests/build.properties b/test/org.eclipse.epp.usagedata.recording.tests/build.properties
deleted file mode 100644
index e3023e1..0000000
--- a/test/org.eclipse.epp.usagedata.recording.tests/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- fragment.xml
diff --git a/test/org.eclipse.epp.usagedata.recording.tests/fragment.xml b/test/org.eclipse.epp.usagedata.recording.tests/fragment.xml
deleted file mode 100644
index 9441a04..0000000
--- a/test/org.eclipse.epp.usagedata.recording.tests/fragment.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<fragment>
-
-</fragment>
diff --git a/test/org.eclipse.epp.usagedata.recording.tests/src/org/eclipse/epp/usagedata/internal/recording/uploading/BasicUploaderTests.java b/test/org.eclipse.epp.usagedata.recording.tests/src/org/eclipse/epp/usagedata/internal/recording/uploading/BasicUploaderTests.java
deleted file mode 100644
index 4fe4add..0000000
--- a/test/org.eclipse.epp.usagedata.recording.tests/src/org/eclipse/epp/usagedata/internal/recording/uploading/BasicUploaderTests.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package org.eclipse.epp.usagedata.internal.recording.uploading;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.util.Dictionary;
-import java.util.Hashtable;
-
-import org.eclipse.epp.usagedata.internal.recording.Activator;
-import org.eclipse.epp.usagedata.internal.recording.settings.UsageDataRecordingSettings;
-import org.eclipse.epp.usagedata.internal.recording.uploading.util.UploadGoodServlet;
-import org.eclipse.epp.usagedata.internal.recording.uploading.util.UploaderTestUtils;
-import org.eclipse.epp.usagedata.internal.recording.uploading.util.UsageDataRecordingSettingsMock;
-import org.eclipse.equinox.http.jetty.JettyConfigurator;
-import org.eclipse.equinox.http.jetty.JettyConstants;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.http.HttpService;
-import org.osgi.util.tracker.ServiceTracker;
-
-public class BasicUploaderTests {
- private static final String GOOD_SERVLET_NAME = "/upload_good";
- private static final String SERVER_NAME = "usagedata.upload.tests";
-
- private static int port;
- private static ServiceTracker tracker;
-
- @BeforeClass
- public static void startServer() throws Exception {
- Dictionary<String, Object> settings = new Hashtable<String, Object>();
- settings.put(JettyConstants.OTHER_INFO, SERVER_NAME);
- settings.put("http.port", 0);
- JettyConfigurator.startServer(SERVER_NAME, settings);
-
- ServiceReference[] reference = Activator.getDefault().getBundle().getBundleContext().getServiceReferences("org.osgi.service.http.HttpService", "(other.info=usagedata.upload.tests)");
- Object assignedPort = reference[0].getProperty("http.port");
- port = Integer.parseInt((String)assignedPort);
-
- tracker = new ServiceTracker(Activator.getDefault().getBundle().getBundleContext(), reference[0], null);
- tracker.open();
- HttpService server = (HttpService)tracker.getService();
- server.registerServlet(GOOD_SERVLET_NAME, new UploadGoodServlet(), null, null);
- }
-
- @AfterClass
- public static void stopServer() throws Exception {
- tracker.close();
- JettyConfigurator.stopServer(SERVER_NAME);
- }
-
- @Test
- public void testBigUpload() throws Exception {
- UsageDataRecordingSettingsMock settings = UploaderTestUtils.getSettings();
- settings.setUploadUrl("http://localhost:" + port + GOOD_SERVLET_NAME);
-
- File file = UploaderTestUtils.createBogusUploadDataFile(settings, 90);
-
- UploadParameters uploadParameters = new UploadParameters(null);
- uploadParameters.setSettings(settings);
- uploadParameters.setFiles(new File[] {file});
-
- UploadResult result = new BasicUploader(uploadParameters).doUpload(null);
-
- assertEquals(200, result.getReturnCode());
- assertFalse(file.exists());
- }
-
- @Test
- public void testInvalidUrl() throws Exception {
- UsageDataRecordingSettingsMock settings = UploaderTestUtils.getSettings();
- settings.setUploadUrl("httpx://localhost:" + port + GOOD_SERVLET_NAME);
-
- File file = UploaderTestUtils.createBogusUploadDataFile(settings, 1);
-
- UploadParameters uploadParameters = new UploadParameters(null);
- uploadParameters.setSettings(settings);
- uploadParameters.setFiles(new File[] {file});
-
- try {
- new BasicUploader(uploadParameters).doUpload(null);
-
- fail("IllegalStateException expected.");
- } catch (IllegalStateException e) {
- // Expected
- }
- assertTrue(file.exists());
- }
-
- @Test
- public void testUnknownHost() throws Exception {
- UsageDataRecordingSettingsMock settings = UploaderTestUtils.getSettings();
- settings.setUploadUrl("http://localhost:" + port + "/Non-existent-path");
-
- File file = UploaderTestUtils.createBogusUploadDataFile(settings, 1);
-
- UploadParameters uploadParameters = new UploadParameters(null);
- uploadParameters.setSettings(settings);
- uploadParameters.setFiles(new File[] {file});
-
- UploadResult result = new BasicUploader(uploadParameters).doUpload(null);
-
- assertEquals(404, result.getReturnCode());
- assertTrue(file.exists());
- }
-
- @Test
- public void testTermsOfUseNotAccepted() {
- UsageDataRecordingSettings settings = new UsageDataRecordingSettings() {
- @Override
- public boolean isEnabled() {
- return true;
- }
-
- @Override
- public boolean hasUserAcceptedTermsOfUse() {
- return false;
- }
- };
- UploadParameters uploadParameters = new UploadParameters(null);
- uploadParameters.setSettings(settings);
-
- assertFalse(new BasicUploader(uploadParameters).hasUserAuthorizedUpload());
- }
-
- @Test
- public void testNotEnabled() {
- UsageDataRecordingSettings settings = new UsageDataRecordingSettings() {
- @Override
- public boolean isEnabled() {
- return false;
- }
-
- @Override
- public boolean hasUserAcceptedTermsOfUse() {
- return true;
- }
- };
- UploadParameters uploadParameters = new UploadParameters(null);
- uploadParameters.setSettings(settings);
-
- assertFalse(new BasicUploader(uploadParameters).hasUserAuthorizedUpload());
- }
-}
\ No newline at end of file
diff --git a/test/org.eclipse.epp.usagedata.recording.tests/src/org/eclipse/epp/usagedata/internal/recording/uploading/UsageDataFileReaderTests.java b/test/org.eclipse.epp.usagedata.recording.tests/src/org/eclipse/epp/usagedata/internal/recording/uploading/UsageDataFileReaderTests.java
deleted file mode 100644
index d981991..0000000
--- a/test/org.eclipse.epp.usagedata.recording.tests/src/org/eclipse/epp/usagedata/internal/recording/uploading/UsageDataFileReaderTests.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eclipse.epp.usagedata.internal.recording.uploading;
-
-import java.io.StringReader;
-
-import org.eclipse.epp.usagedata.internal.gathering.events.UsageDataEvent;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class UsageDataFileReaderTests {
- @Test
- public void testIterate() throws Exception {
- String content = "what,kind,bundleId,bundleVersion,description,time\n"
- + "what,kind,bundleId,bundleVersion,description,123456\n"
- + "what,kind,bundleId,bundleVersion,description,123456\n"
- + "what,kind,bundleId,bundleVersion,description,123456\n";
-
- final StringBuilder builder = new StringBuilder();
-
- UsageDataFileReader reader = new UsageDataFileReader(new StringReader(content));
- reader.iterate(new UsageDataFileReader.Iterator() {
-
- public void event(String line, UsageDataEvent event) {
- builder.append(line);
- builder.append("\n");
- }
-
- public void header(String header) {
- builder.append(header);
- builder.append("\n");
- }
- });
- assertEquals(content, builder.toString());
- }
-}
diff --git a/test/org.eclipse.epp.usagedata.recording.tests/src/org/eclipse/epp/usagedata/internal/recording/uploading/util/UploadGoodServlet.java b/test/org.eclipse.epp.usagedata.recording.tests/src/org/eclipse/epp/usagedata/internal/recording/uploading/util/UploadGoodServlet.java
deleted file mode 100644
index b94513a..0000000
--- a/test/org.eclipse.epp.usagedata.recording.tests/src/org/eclipse/epp/usagedata/internal/recording/uploading/util/UploadGoodServlet.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.eclipse.epp.usagedata.internal.recording.uploading.util;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class UploadGoodServlet extends HttpServlet {
- private static final long serialVersionUID = 863695768810232317L;
-
- @Override
- protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
- response.setStatus(HttpServletResponse.SC_OK);
- response.setContentType("text/plain");
- PrintWriter writer = response.getWriter();
- writer.println("log:received!");
- }
-}
diff --git a/test/org.eclipse.epp.usagedata.recording.tests/src/org/eclipse/epp/usagedata/internal/recording/uploading/util/UploaderTestUtils.java b/test/org.eclipse.epp.usagedata.recording.tests/src/org/eclipse/epp/usagedata/internal/recording/uploading/util/UploaderTestUtils.java
deleted file mode 100644
index b8dfa57..0000000
--- a/test/org.eclipse.epp.usagedata.recording.tests/src/org/eclipse/epp/usagedata/internal/recording/uploading/util/UploaderTestUtils.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.eclipse.epp.usagedata.internal.recording.uploading.util;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.eclipse.epp.usagedata.internal.gathering.events.UsageDataEvent;
-import org.eclipse.epp.usagedata.internal.recording.UsageDataRecorder;
-import org.eclipse.epp.usagedata.internal.recording.settings.UsageDataRecordingSettings;
-
-public class UploaderTestUtils {
-
-
- private static final int NUMBER_OF_ENTRIES_PER_DAY = 500;
-
- public UploaderTestUtils() throws IOException {
- }
-
- public static File createBogusUploadDataFile(UsageDataRecordingSettings settings, int days) throws Exception {
- DumbedDownUsageDataRecorder recorder = new DumbedDownUsageDataRecorder(settings);
- recorder.start();
- for(int index=0;index<days*NUMBER_OF_ENTRIES_PER_DAY;index++) {
- recorder.accept(new UsageDataEvent("bogus", "bogus", "bogus", "bogus","bogus",System.currentTimeMillis()));
- }
- recorder.dumpEvents();
-
- return settings.getEventFile();
- }
-
- public static UsageDataRecordingSettingsMock getSettings() throws Exception {
-
- File file = File.createTempFile("bogusUploadData", "csv");
- file.delete();
-
- return new UsageDataRecordingSettingsMock(file);
- }
-}
-
-class DumbedDownUsageDataRecorder extends UsageDataRecorder {
-
- private final UsageDataRecordingSettings settings;
-
- public DumbedDownUsageDataRecorder(UsageDataRecordingSettings settings) {
- this.settings = settings;
- }
-
- @Override
- protected UsageDataRecordingSettings getSettings() {
- return settings;
- }
-
- @Override
- protected void uploadDataIfNecessary() {
- }
-
- @Override
- public void dumpEvents() {
- super.dumpEvents();
- }
-}
diff --git a/test/org.eclipse.epp.usagedata.recording.tests/src/org/eclipse/epp/usagedata/internal/recording/uploading/util/UsageDataRecordingSettingsMock.java b/test/org.eclipse.epp.usagedata.recording.tests/src/org/eclipse/epp/usagedata/internal/recording/uploading/util/UsageDataRecordingSettingsMock.java
deleted file mode 100644
index 3c99a53..0000000
--- a/test/org.eclipse.epp.usagedata.recording.tests/src/org/eclipse/epp/usagedata/internal/recording/uploading/util/UsageDataRecordingSettingsMock.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- *
- */
-package org.eclipse.epp.usagedata.internal.recording.uploading.util;
-
-import java.io.File;
-
-import org.eclipse.epp.usagedata.internal.recording.settings.UsageDataRecordingSettings;
-
-public class UsageDataRecordingSettingsMock extends UsageDataRecordingSettings {
- private final File file;
- private String uploadUrl;
-
- UsageDataRecordingSettingsMock(File file) {
- this.file = file;
- }
-
- @Override
- public File getEventFile() {
- return file;
- }
-
- @Override
- public String getUserId() {
- return "bogus";
- }
-
- @Override
- public String getWorkspaceId() {
- return "bogus";
- }
-
- @Override
- public boolean isLoggingServerActivity() {
- return false;
- }
-
- public void setUploadUrl(String uploadUrl) {
- this.uploadUrl = uploadUrl;
- }
-
- @Override
- public String getUploadUrl() {
- return uploadUrl;
- }
-
- @Override
- public boolean hasUserAcceptedTermsOfUse() {
- return true;
- }
-
- @Override
- public boolean isEnabled() {
- return true;
- }
-}
\ No newline at end of file
