Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Waibel2015-06-01 15:45:00 -0400
committerFlorian Waibel2015-06-01 15:45:00 -0400
commit121031ee95abef9c0f56289960fa695f4b3ba2a6 (patch)
tree8940c25c4ee184809bab9bae8131f0f3f3c101a3
parentd6196cba9568085a6d74f3de327fdebd8c217360 (diff)
downloadorg.eclipse.virgo.kernel-121031ee95abef9c0f56289960fa695f4b3ba2a6.tar.gz
org.eclipse.virgo.kernel-121031ee95abef9c0f56289960fa695f4b3ba2a6.tar.xz
org.eclipse.virgo.kernel-121031ee95abef9c0f56289960fa695f4b3ba2a6.zip
Reworks inner test classes to static inner classes
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/AbstractInstallArtifactTests.java2
-rw-r--r--org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/concurrent/KernelScheduledThreadPoolExecutorTests.java2
-rw-r--r--org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/concurrent/KernelThreadPoolExecutorTests.java2
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/InitialArtifactDeployerTests.java2
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/ServiceScopingStrategyTests.java2
-rw-r--r--org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/formatting/ConfigInstallArtifactCommandFormatterTests.java2
-rw-r--r--org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/help/SimpleFileHelpAccessorTests.java10
7 files changed, 11 insertions, 11 deletions
diff --git a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/AbstractInstallArtifactTests.java b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/AbstractInstallArtifactTests.java
index f2563e2e..93b5aa11 100644
--- a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/AbstractInstallArtifactTests.java
+++ b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/AbstractInstallArtifactTests.java
@@ -150,7 +150,7 @@ public class AbstractInstallArtifactTests {
assertEquals(1, this.installArtifact.doUninstallCount);
}
- private final class StubInstallArtifact extends AbstractInstallArtifact {
+ private static final class StubInstallArtifact extends AbstractInstallArtifact {
public StubInstallArtifact(ArtifactStateMonitor artifactStateMonitor) {
super(new ArtifactIdentity("type", "name", Version.emptyVersion, null), new StubArtifactStorage(), artifactStateMonitor, null, new MockEventLogger());
diff --git a/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/concurrent/KernelScheduledThreadPoolExecutorTests.java b/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/concurrent/KernelScheduledThreadPoolExecutorTests.java
index 56087083..edf50bb8 100644
--- a/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/concurrent/KernelScheduledThreadPoolExecutorTests.java
+++ b/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/concurrent/KernelScheduledThreadPoolExecutorTests.java
@@ -37,7 +37,7 @@ public class KernelScheduledThreadPoolExecutorTests extends AbstractExecutorTest
return new KernelScheduledThreadPoolExecutor(1, name, new StubTracingService());
}
- private final class StubTracingService implements TracingService {
+ private static final class StubTracingService implements TracingService {
public String getCurrentApplicationName() {
return null;
diff --git a/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/concurrent/KernelThreadPoolExecutorTests.java b/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/concurrent/KernelThreadPoolExecutorTests.java
index 9f0aba11..44faa0a3 100644
--- a/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/concurrent/KernelThreadPoolExecutorTests.java
+++ b/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/concurrent/KernelThreadPoolExecutorTests.java
@@ -94,7 +94,7 @@ public class KernelThreadPoolExecutorTests extends AbstractExecutorTests {
assertTrue(result);
}
- private final class StubTracingService implements TracingService {
+ private static final class StubTracingService implements TracingService {
private String applicationName;
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/InitialArtifactDeployerTests.java b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/InitialArtifactDeployerTests.java
index 89208d28..71bf3178 100644
--- a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/InitialArtifactDeployerTests.java
+++ b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/InitialArtifactDeployerTests.java
@@ -151,7 +151,7 @@ public class InitialArtifactDeployerTests {
}
}
- private final class StubDeployUriNormaliser implements DeployUriNormaliser {
+ private static final class StubDeployUriNormaliser implements DeployUriNormaliser {
public URI normalise(URI uri) throws DeploymentException {
return uri;
}
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/ServiceScopingStrategyTests.java b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/ServiceScopingStrategyTests.java
index 56a80d59..db56c75f 100644
--- a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/ServiceScopingStrategyTests.java
+++ b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/ServiceScopingStrategyTests.java
@@ -229,7 +229,7 @@ public class ServiceScopingStrategyTests {
* This test uses a collection that does not support addition in order to place the
* same constraints on the implementation as the service registry find hook.
*/
- private final class ShrinkableSet extends HashSet<ServiceReference<?>> {
+ private static final class ShrinkableSet extends HashSet<ServiceReference<?>> {
private static final long serialVersionUID = 1L;
diff --git a/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/formatting/ConfigInstallArtifactCommandFormatterTests.java b/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/formatting/ConfigInstallArtifactCommandFormatterTests.java
index 3a258ba0..04a3046d 100644
--- a/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/formatting/ConfigInstallArtifactCommandFormatterTests.java
+++ b/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/formatting/ConfigInstallArtifactCommandFormatterTests.java
@@ -45,7 +45,7 @@ public class ConfigInstallArtifactCommandFormatterTests {
assertOutputEquals(new File("src/test/resources/org/eclipse/virgo/kernel/shell/internal/formatting/config-examine.txt"), lines);
}
- public class StubManageableArtifact implements ManageableArtifact {
+ private static class StubManageableArtifact implements ManageableArtifact {
public ObjectName[] getDependents() {
throw new UnsupportedOperationException();
diff --git a/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/help/SimpleFileHelpAccessorTests.java b/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/help/SimpleFileHelpAccessorTests.java
index 2f107731..88d6936f 100644
--- a/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/help/SimpleFileHelpAccessorTests.java
+++ b/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/help/SimpleFileHelpAccessorTests.java
@@ -35,10 +35,10 @@ import org.junit.Test;
*/
public class SimpleFileHelpAccessorTests {
- private final static String HELP_ACCESSOR_TEST_FILE_NAME = "org.eclipse.virgo.shell.internal.help.SimpleFileHelpAccessorTests.help";
+ private static final String HELP_ACCESSOR_TEST_FILE_NAME = "org.eclipse.virgo.shell.internal.help.SimpleFileHelpAccessorTests.help";
- private final URL HELP_ACCESSOR_TEST_HELP_FILE_URL;
- {
+ private static final URL HELP_ACCESSOR_TEST_HELP_FILE_URL;
+ static {
URL url = null;
try {
url = new File("src/test/resources/helpAccessorTests.help").toURI().toURL();
@@ -48,7 +48,7 @@ public class SimpleFileHelpAccessorTests {
HELP_ACCESSOR_TEST_HELP_FILE_URL = url;
}
- private class AccessorTestClass extends SimpleFileHelpAccessor {
+ private static class AccessorTestClass extends SimpleFileHelpAccessor {
protected URL helpResourceUrl(Class<?> clazz, String fileResourceName) {
assertEquals("File resource name not correctly formed from classname", HELP_ACCESSOR_TEST_FILE_NAME, fileResourceName);
@@ -56,7 +56,7 @@ public class SimpleFileHelpAccessorTests {
}
}
- private class NoHelpAccessorTestClass extends SimpleFileHelpAccessor {
+ private static class NoHelpAccessorTestClass extends SimpleFileHelpAccessor {
protected URL helpResourceUrl(Class<?> clazz, String fileResourceName) {
return null;

Back to the top