From 2f9e10f34eac07d95978a451e1dcea3445ca32c1 Mon Sep 17 00:00:00 2001 From: Sergey Ignatov Date: Fri, 26 Jan 2018 15:11:32 +0300 Subject: [PATCH] get rid of yellow code --- .../InternalTestDiscoveryListener.java | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/platform/testFramework/src/com/intellij/InternalTestDiscoveryListener.java b/platform/testFramework/src/com/intellij/InternalTestDiscoveryListener.java index 43262e5e96f2..ca6029a05d39 100644 --- a/platform/testFramework/src/com/intellij/InternalTestDiscoveryListener.java +++ b/platform/testFramework/src/com/intellij/InternalTestDiscoveryListener.java @@ -37,7 +37,7 @@ import java.util.zip.ZipOutputStream; /** * Used in TestAll to collect data in command line */ -@SuppressWarnings("unused") +@SuppressWarnings({"unused", "UseOfSystemOutOrSystemErr", "CallToPrintStackTrace"}) public class InternalTestDiscoveryListener implements TestListener, Closeable { private final String myModuleName; private final String myTracesDirectory; @@ -55,7 +55,7 @@ public class InternalTestDiscoveryListener implements TestListener, Closeable { private Object getIndex() { if (myDiscoveryIndex == null) { - final Project project = ProjectManager.getInstance().getDefaultProject(); + Project project = ProjectManager.getInstance().getDefaultProject(); try { myDiscoveryIndexClass = Class.forName("com.intellij.execution.testDiscovery.TestDiscoveryIndex"); myDiscoveryIndex = myDiscoveryIndexClass @@ -81,10 +81,11 @@ public class InternalTestDiscoveryListener implements TestListener, Closeable { final String methodName = getMethodName(test); try { - final Object data = getData(); - Method testEnded = data.getClass().getMethod("testDiscoveryEnded", new Class[] {String.class}); - testEnded.invoke(data, new Object[] {"j" + className + "-" + methodName}); - } catch (Throwable t) { + Object data = getData(); + Method testEnded = data.getClass().getMethod("testDiscoveryEnded", String.class); + testEnded.invoke(data, "j" + className + "-" + methodName); + } + catch (Throwable t) { t.printStackTrace(); } @@ -93,10 +94,7 @@ public class InternalTestDiscoveryListener implements TestListener, Closeable { if (myCompletedMethodNames.size() > 50) { final String[] fullTestNames = ArrayUtil.toStringArray(myCompletedMethodNames); myCompletedMethodNames.clear(); - AppExecutorUtil.getAppExecutorService().execute( - () -> { - flushCurrentTraces(fullTestNames); - }); + AppExecutorUtil.getAppExecutorService().execute(() -> flushCurrentTraces(fullTestNames)); } } @@ -104,10 +102,11 @@ public class InternalTestDiscoveryListener implements TestListener, Closeable { if (!myCompactResults) return; System.out.println("Start compacting to index"); try { - final Object index = getIndex(); - final Method method = Class.forName("com.intellij.execution.testDiscovery.TestDiscoveryExtension") - .getMethod("processAvailableTraces", fullTestNames.getClass(), myTracesDirectory.getClass(), String.class, String.class, - myDiscoveryIndexClass); + Object index = getIndex(); + Method method = Class.forName("com.intellij.execution.testDiscovery.TestDiscoveryExtension") + .getMethod("processAvailableTraces", fullTestNames.getClass(), myTracesDirectory.getClass(), String.class, + String.class, + myDiscoveryIndexClass); method.invoke(null, fullTestNames, myTracesDirectory, myModuleName, "j", index); System.out.println("Compacting done."); } @@ -131,18 +130,19 @@ public class InternalTestDiscoveryListener implements TestListener, Closeable { @Override public void startTest(Test test) { try { - final Object data = getData(); - Method testStarted = data.getClass().getMethod("testDiscoveryStarted", new Class[] {String.class}); - testStarted.invoke(data, new Object[] {getClassName(test) + "-" + getMethodName(test)}); - } catch (Throwable t) { + Object data = getData(); + Method testStarted = data.getClass().getMethod("testDiscoveryStarted", String.class); + testStarted.invoke(data, getClassName(test) + "-" + getMethodName(test)); + } + catch (Throwable t) { t.printStackTrace(); } } protected Object getData() throws Exception { return Class.forName("com.intellij.rt.coverage.data.ProjectData") - .getMethod("getProjectData", new Class[0]) - .invoke(null, new Object[0]); + .getMethod("getProjectData", ArrayUtil.EMPTY_CLASS_ARRAY) + .invoke(null, ArrayUtil.EMPTY_OBJECT_ARRAY); } @Override