Merge "Remove junit and unused dependencies from tests fragment"
diff --git a/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/filters/EclipseBuildIdFilterTest.java b/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/filters/EclipseBuildIdFilterTest.java
index 87bb716..dd917c4 100644
--- a/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/filters/EclipseBuildIdFilterTest.java
+++ b/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/filters/EclipseBuildIdFilterTest.java
@@ -15,7 +15,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.epp.logging.aeri.tests.util.RetainSystemProperties;
+import org.eclipse.epp.logging.aeri.core.tests.util.RetainSystemProperties;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/filters/RecentlySeenFilterTest.java b/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/filters/RecentlySeenFilterTest.java
index 1247954..c5ad062 100644
--- a/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/filters/RecentlySeenFilterTest.java
+++ b/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/filters/RecentlySeenFilterTest.java
@@ -16,7 +16,7 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.epp.logging.aeri.core.ISystemSettings;
import org.eclipse.epp.logging.aeri.core.SystemControl;
-import org.eclipse.epp.logging.aeri.tests.util.RetainSystemProperties;
+import org.eclipse.epp.logging.aeri.core.tests.util.RetainSystemProperties;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/filters/StatusFiltersTest.java b/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/filters/StatusFiltersTest.java
index 10338c1..a057dbd 100644
--- a/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/filters/StatusFiltersTest.java
+++ b/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/filters/StatusFiltersTest.java
@@ -20,7 +20,7 @@
import org.eclipse.epp.logging.aeri.core.ISystemSettings;
import org.eclipse.epp.logging.aeri.core.SendMode;
import org.eclipse.epp.logging.aeri.core.SystemControl;
-import org.eclipse.epp.logging.aeri.tests.util.RetainSystemProperties;
+import org.eclipse.epp.logging.aeri.core.tests.util.RetainSystemProperties;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/filters/SystemEnabledFilterTest.java b/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/filters/SystemEnabledFilterTest.java
index 4b32324..a8c3604 100644
--- a/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/filters/SystemEnabledFilterTest.java
+++ b/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/filters/SystemEnabledFilterTest.java
@@ -15,7 +15,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.epp.logging.aeri.tests.util.RetainSystemProperties;
+import org.eclipse.epp.logging.aeri.core.tests.util.RetainSystemProperties;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/org.eclipse.epp.logging.aeri.tests/src/org/eclipse/epp/logging/aeri/tests/util/RetainSystemProperties.java b/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/tests/util/RetainSystemProperties.java
similarity index 92%
rename from tests/org.eclipse.epp.logging.aeri.tests/src/org/eclipse/epp/logging/aeri/tests/util/RetainSystemProperties.java
rename to tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/tests/util/RetainSystemProperties.java
index b0a7293..3312282 100644
--- a/tests/org.eclipse.epp.logging.aeri.tests/src/org/eclipse/epp/logging/aeri/tests/util/RetainSystemProperties.java
+++ b/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/tests/util/RetainSystemProperties.java
@@ -8,7 +8,7 @@
* Contributors:
* Marcel Bruch - initial API and implementation.
*/
-package org.eclipse.epp.logging.aeri.tests.util;
+package org.eclipse.epp.logging.aeri.core.tests.util;
import java.util.Properties;
diff --git a/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/util/LogListenerTest.java b/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/util/LogListenerTest.java
index 238d7ba..b73d9ff 100644
--- a/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/util/LogListenerTest.java
+++ b/tests/org.eclipse.epp.logging.aeri.core.tests/src/org/eclipse/epp/logging/aeri/core/util/LogListenerTest.java
@@ -20,7 +20,7 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.e4.core.services.events.IEventBroker;
import org.eclipse.epp.logging.aeri.core.Constants;
-import org.eclipse.epp.logging.aeri.tests.util.RetainSystemProperties;
+import org.eclipse.epp.logging.aeri.core.tests.util.RetainSystemProperties;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
diff --git a/tests/org.eclipse.epp.logging.aeri.ide.manual/src/org/eclipse/epp/logging/aeri/ide/manual/TestScenariosContribution.java b/tests/org.eclipse.epp.logging.aeri.ide.manual/src/org/eclipse/epp/logging/aeri/ide/manual/TestScenariosContribution.java
index aab52e3..1e85e84 100644
--- a/tests/org.eclipse.epp.logging.aeri.ide.manual/src/org/eclipse/epp/logging/aeri/ide/manual/TestScenariosContribution.java
+++ b/tests/org.eclipse.epp.logging.aeri.ide.manual/src/org/eclipse/epp/logging/aeri/ide/manual/TestScenariosContribution.java
@@ -2,6 +2,7 @@
import java.io.File;
import java.io.IOException;
+import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.text.MessageFormat;
@@ -160,9 +161,11 @@
Enumeration<String> entryPaths = bundle.getEntryPaths("/resources/");
while (entryPaths.hasMoreElements()) {
String entryPath = entryPaths.nextElement();
- URL fileUrl = bundle.getEntry(entryPath);
+ URL entryUrl = bundle.getEntry(entryPath);
try {
- File file = new File(FileLocator.resolve(fileUrl).toURI());
+ URL fileUrl = FileLocator.toFileURL(entryUrl);
+ URI resolved = new URI(fileUrl.getProtocol(), fileUrl.getPath(), null);
+ File file = new File(resolved);
Files.copy(file, new File(toDirectory, file.getName()));
} catch (URISyntaxException e) {
e.printStackTrace();
diff --git a/tests/org.eclipse.epp.logging.aeri.ide.tests/src/org/eclipse/epp/internal/logging/aeri/ide/filters/ActiveWorkbenchStatusFilterTest.java b/tests/org.eclipse.epp.logging.aeri.ide.tests/src/org/eclipse/epp/internal/logging/aeri/ide/filters/ActiveWorkbenchStatusFilterTest.java
index bc1474c..08e2bba 100644
--- a/tests/org.eclipse.epp.logging.aeri.ide.tests/src/org/eclipse/epp/internal/logging/aeri/ide/filters/ActiveWorkbenchStatusFilterTest.java
+++ b/tests/org.eclipse.epp.logging.aeri.ide.tests/src/org/eclipse/epp/internal/logging/aeri/ide/filters/ActiveWorkbenchStatusFilterTest.java
@@ -15,10 +15,8 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.epp.logging.aeri.tests.util.RetainSystemProperties;
import org.eclipse.ui.IWorkbench;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
import com.google.common.base.Predicate;
@@ -28,9 +26,6 @@
private IStatus status;
private Predicate<IStatus> sut;
- @Rule
- public RetainSystemProperties retainSystemProperties = new RetainSystemProperties();
-
@Before
public void setUp() {
status = mock(Status.class);
diff --git a/tests/org.eclipse.epp.logging.aeri.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.epp.logging.aeri.tests/META-INF/MANIFEST.MF
index 624e5f9..0eb65bc 100644
--- a/tests/org.eclipse.epp.logging.aeri.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.epp.logging.aeri.tests/META-INF/MANIFEST.MF
@@ -6,13 +6,9 @@
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.junit,
- org.eclipse.epp.logging.aeri.core,
+Require-Bundle: org.eclipse.epp.logging.aeri.core,
org.eclipse.core.runtime,
- org.eclipse.emf.ecore,
- org.eclipse.jdt.annotation;bundle-version="[1.0.0,2.0.0)",
- org.yaml.snakeyaml,
- org.mockito
+ org.yaml.snakeyaml
Export-Package: org.eclipse.epp.logging.aeri.tests,
org.eclipse.epp.logging.aeri.tests.scenarios,
org.eclipse.epp.logging.aeri.tests.util,
