From 539ab3a4ee782878b571185e6ba11427075354ec Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Thu, 8 Aug 2013 17:21:25 +0400 Subject: [PATCH] cleanup --- .../execution/junit2/segments/Extractor.java | 4 ++-- .../intellij/execution/junit/TestObject.java | 24 ++++++++++--------- .../junit2/ui/TestsPacketsReceiver.java | 21 ++++++++++------ 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/java/execution/impl/src/com/intellij/execution/junit2/segments/Extractor.java b/java/execution/impl/src/com/intellij/execution/junit2/segments/Extractor.java index 0cb5b117817c..508f8e6ecb14 100644 --- a/java/execution/impl/src/com/intellij/execution/junit2/segments/Extractor.java +++ b/java/execution/impl/src/com/intellij/execution/junit2/segments/Extractor.java @@ -63,7 +63,7 @@ public class Extractor implements Disposable { myFulfilledWorkGate.setDispactchListener(listener); } - public void setPacketDispatcher(final PacketProcessor packetProcessor, final DeferredActionsQueue queue) { + public void setPacketDispatcher(@NotNull final PacketProcessor packetProcessor, final DeferredActionsQueue queue) { myFulfilledWorkGate = new DeferredActionsQueue() { //todo make it all later @Override public void addLast(final Runnable runnable) { @@ -111,7 +111,7 @@ public class Extractor implements Disposable { public void addRequest(Runnable runnable, final DeferredActionsQueue queue) { myQueue.queue(new MyUpdate(runnable, queue, myOrder.incrementAndGet())); } - + private static class MyUpdate extends Update { private final Runnable myRunnable; private final DeferredActionsQueue myQueue; diff --git a/plugins/junit/src/com/intellij/execution/junit/TestObject.java b/plugins/junit/src/com/intellij/execution/junit/TestObject.java index 071429050545..cdd5ad02b84f 100644 --- a/plugins/junit/src/com/intellij/execution/junit/TestObject.java +++ b/plugins/junit/src/com/intellij/execution/junit/TestObject.java @@ -61,6 +61,7 @@ import com.intellij.openapi.util.Getter; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.registry.Registry; +import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiMethod; @@ -71,6 +72,7 @@ import com.intellij.rt.execution.junit.JUnitStarter; import com.intellij.util.Function; import com.intellij.util.PathUtil; import jetbrains.buildServer.messages.serviceMessages.ServiceMessageTypes; +import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.jps.model.serialization.PathMacroUtil; @@ -83,7 +85,7 @@ public abstract class TestObject implements JavaCommandLine { protected static final Logger LOG = Logger.getInstance("#com.intellij.execution.junit.TestObject"); private static final String MESSAGE = ExecutionBundle.message("configuration.not.speficied.message"); - private static final String JUNIT_TEST_FRAMEWORK_NAME = "JUnit"; + @NonNls private static final String JUNIT_TEST_FRAMEWORK_NAME = "JUnit"; protected JavaParameters myJavaParameters; private final Project myProject; @@ -230,7 +232,7 @@ public abstract class TestObject implements JavaCommandLine { myListenersFile = FileUtil.createTempFile("junit_listeners_", ""); myListenersFile.deleteOnExit(); myJavaParameters.getProgramParametersList().add("@@" + myListenersFile.getPath()); - FileUtil.writeToFile(myListenersFile, buf.toString().getBytes()); + FileUtil.writeToFile(myListenersFile, buf.toString().getBytes(CharsetToolkit.UTF8_CHARSET)); } catch (IOException e) { LOG.error(e); @@ -416,17 +418,17 @@ public abstract class TestObject implements JavaCommandLine { private boolean forkPerModule() { final String workingDirectory = myConfiguration.getWorkingDirectory(); - return JUnitConfiguration.TEST_PACKAGE.equals(myConfiguration.getPersistentData().TEST_OBJECT) && - myConfiguration.getPersistentData().getScope() != TestSearchScope.SINGLE_MODULE && + return JUnitConfiguration.TEST_PACKAGE.equals(myConfiguration.getPersistentData().TEST_OBJECT) && + myConfiguration.getPersistentData().getScope() != TestSearchScope.SINGLE_MODULE && ("$" + PathMacroUtil.MODULE_DIR_MACRO_NAME + "$").equals(workingDirectory); } - + private void appendForkInfo(Executor executor) throws ExecutionException { final String forkMode = myConfiguration.getForkMode(); if (Comparing.strEqual(forkMode, "none")) { final String workingDirectory = myConfiguration.getWorkingDirectory(); - if (!JUnitConfiguration.TEST_PACKAGE.equals(myConfiguration.getPersistentData().TEST_OBJECT) || - myConfiguration.getPersistentData().getScope() == TestSearchScope.SINGLE_MODULE || + if (!JUnitConfiguration.TEST_PACKAGE.equals(myConfiguration.getPersistentData().TEST_OBJECT) || + myConfiguration.getPersistentData().getScope() == TestSearchScope.SINGLE_MODULE || !("$" + PathMacroUtil.MODULE_DIR_MACRO_NAME + "$").equals(workingDirectory)) { return; } @@ -445,7 +447,7 @@ public abstract class TestObject implements JavaCommandLine { try { final File tempFile = FileUtil.createTempFile("command.line", "", true); - final PrintWriter writer = new PrintWriter(tempFile, "UTF-8"); + final PrintWriter writer = new PrintWriter(tempFile, CharsetToolkit.UTF8); try { writer.println(((JavaSdkType)jdk.getSdkType()).getVMExecutablePath(jdk)); for (String vmParameter : javaParameters.getVMParametersList().getList()) { @@ -457,7 +459,7 @@ public abstract class TestObject implements JavaCommandLine { finally { writer.close(); } - + myJavaParameters.getProgramParametersList().add("@@@" + forkMode + ',' + tempFile.getAbsolutePath()); } catch (Exception e) { @@ -476,7 +478,7 @@ public abstract class TestObject implements JavaCommandLine { } final Map> perModule = forkPerModule() ? new TreeMap>() : null; - final PrintWriter writer = new PrintWriter(myTempFile, "UTF-8"); + final PrintWriter writer = new PrintWriter(myTempFile, CharsetToolkit.UTF8); try { writer.println(packageName); final List testNames = new ArrayList(); @@ -519,7 +521,7 @@ public abstract class TestObject implements JavaCommandLine { } if (perModule != null && perModule.size() > 1) { - final PrintWriter wWriter = new PrintWriter(myWorkingDirsFile, "UTF-8"); + final PrintWriter wWriter = new PrintWriter(myWorkingDirsFile, CharsetToolkit.UTF8); try { wWriter.println(packageName); for (String workingDir : perModule.keySet()) { diff --git a/plugins/junit/src/com/intellij/execution/junit2/ui/TestsPacketsReceiver.java b/plugins/junit/src/com/intellij/execution/junit2/ui/TestsPacketsReceiver.java index f91cedd49688..b6c1257a4b6c 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/ui/TestsPacketsReceiver.java +++ b/plugins/junit/src/com/intellij/execution/junit2/ui/TestsPacketsReceiver.java @@ -42,6 +42,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.rt.execution.junit.segments.PoolOfDelimiters; import com.intellij.rt.execution.junit.states.PoolOfTestStates; import com.intellij.util.containers.HashMap; +import gnu.trove.TIntObjectHashMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -51,10 +52,9 @@ import java.util.Map; import java.util.Set; public class TestsPacketsReceiver implements OutputPacketProcessor, Disposable { - - public static final Map STATE_CLASSES = new HashMap(); + private static final TIntObjectHashMap STATE_CLASSES = new TIntObjectHashMap(); private Map myKnownDynamicParents; - private TestProxy myUnboundOutput; + private final TestProxy myUnboundOutput; static { mapClass(PoolOfTestStates.RUNNING_INDEX, new RunningStateSetter()); @@ -66,9 +66,9 @@ public class TestsPacketsReceiver implements OutputPacketProcessor, Disposable { mapClass(PoolOfTestStates.COMPARISON_FAILURE, new StateReader(ComparisonFailureState.class)); } - public static void mapClass(final int magnitude, final StateChanger factory) { + public static void mapClass(final int magnitude, @NotNull StateChanger factory) { factory.setMagnitude(magnitude); - STATE_CLASSES.put(new Integer(magnitude), factory); + STATE_CLASSES.put(magnitude, factory); } private final InputObjectRegistry myObjectRegistry; @@ -86,6 +86,7 @@ public class TestsPacketsReceiver implements OutputPacketProcessor, Disposable { Disposer.register(consoleView, this); } + @Override public void processPacket(final String packet) { ApplicationManager.getApplication().assertIsDispatchThread(); @@ -162,6 +163,7 @@ public class TestsPacketsReceiver implements OutputPacketProcessor, Disposable { setClassName(parentClass); } + @Override public void readFrom(ObjectReader reader) { } }); @@ -180,7 +182,7 @@ public class TestsPacketsReceiver implements OutputPacketProcessor, Disposable { } final int state = reader.readInt(); - final StateChanger stateChanger = STATE_CLASSES.get(new Integer(state)); + final StateChanger stateChanger = STATE_CLASSES.get(state); stateChanger.changeStateOf(testProxy, reader); synchronized (myCurrentTests) { if (stateChanger instanceof RunningStateSetter) { @@ -217,6 +219,7 @@ public class TestsPacketsReceiver implements OutputPacketProcessor, Disposable { return myModel; } + @Override public void dispose() { myModel = null; } @@ -252,7 +255,7 @@ public class TestsPacketsReceiver implements OutputPacketProcessor, Disposable { } } - private static abstract class StateChanger { + private abstract static class StateChanger { static final Logger LOG = Logger.getInstance("#" + StateChanger.class.getName()); abstract void changeStateOf(TestProxy testProxy, ObjectReader reader); @@ -283,6 +286,7 @@ public class TestsPacketsReceiver implements OutputPacketProcessor, Disposable { } private static class RunningStateSetter extends StateChanger { + @Override public void changeStateOf(final TestProxy testProxy, final ObjectReader reader) { testProxy.setState(TestState.RUNNING_STATE); TestProxy parent = testProxy.getParent(); @@ -304,6 +308,7 @@ public class TestsPacketsReceiver implements OutputPacketProcessor, Disposable { myStateClass = stateClass; } + @Override public void changeStateOf(final TestProxy testProxy, final ObjectReader reader) { final ReadableState state; try { @@ -319,12 +324,14 @@ public class TestsPacketsReceiver implements OutputPacketProcessor, Disposable { complete(testProxy); } + @Override public void setMagnitude(final int magnitude) { myInstanceMagnitude = magnitude; } } private static class TestCompleter extends StateChanger { + @Override public void changeStateOf(final TestProxy testProxy, final ObjectReader reader) { TestState state = testProxy.getState(); if (!testProxy.getState().isFinal()) {