mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
rerun java test configuration on make completed without errors
(cherry picked from commit 7058066)
This commit is contained in:
@@ -23,8 +23,11 @@ import com.intellij.execution.process.OSProcessHandler;
|
||||
import com.intellij.execution.process.ProcessAdapter;
|
||||
import com.intellij.execution.process.ProcessEvent;
|
||||
import com.intellij.execution.runners.ExecutionEnvironment;
|
||||
import com.intellij.execution.testDiscovery.JavaAutoRunManager;
|
||||
import com.intellij.execution.testframework.*;
|
||||
import com.intellij.execution.testframework.actions.AbstractRerunFailedTestsAction;
|
||||
import com.intellij.execution.testframework.autotest.AbstractAutoTestManager;
|
||||
import com.intellij.execution.testframework.autotest.ToggleAutoTestAction;
|
||||
import com.intellij.execution.testframework.sm.SMTestRunnerConnectionUtil;
|
||||
import com.intellij.execution.testframework.sm.runner.SMRunnerConsolePropertiesProvider;
|
||||
import com.intellij.execution.testframework.sm.runner.SMTRunnerConsoleProperties;
|
||||
@@ -167,7 +170,12 @@ public abstract class JavaTestFrameworkRunnableState<T extends
|
||||
rerunFailedTestsAction.setModelProvider(() -> viewer);
|
||||
|
||||
final DefaultExecutionResult result = new DefaultExecutionResult(consoleView, handler);
|
||||
result.setRestartActions(rerunFailedTestsAction);
|
||||
result.setRestartActions(rerunFailedTestsAction, new ToggleAutoTestAction() {
|
||||
@Override
|
||||
public AbstractAutoTestManager getAutoTestManager(Project project) {
|
||||
return JavaAutoRunManager.getInstance(project);
|
||||
}
|
||||
});
|
||||
|
||||
JavaRunConfigurationExtensionManager.getInstance().attachExtensionsToProcess(getConfiguration(), handler, runnerSettings);
|
||||
return result;
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
/*
|
||||
* Copyright 2000-2016 JetBrains s.r.o.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package com.intellij.execution.testDiscovery;
|
||||
|
||||
import com.intellij.execution.testframework.autotest.AbstractAutoTestManager;
|
||||
import com.intellij.execution.testframework.autotest.AutoTestWatcher;
|
||||
import com.intellij.openapi.compiler.CompilationStatusListener;
|
||||
import com.intellij.openapi.compiler.CompileContext;
|
||||
import com.intellij.openapi.compiler.CompilerManager;
|
||||
import com.intellij.openapi.components.ServiceManager;
|
||||
import com.intellij.openapi.components.State;
|
||||
import com.intellij.openapi.components.Storage;
|
||||
import com.intellij.openapi.components.StoragePathMacros;
|
||||
import com.intellij.openapi.project.Project;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
@State(
|
||||
name = "JavaAutoRunManager",
|
||||
storages = {@Storage(StoragePathMacros.WORKSPACE_FILE)}
|
||||
)
|
||||
public class JavaAutoRunManager extends AbstractAutoTestManager {
|
||||
@NotNull
|
||||
public static JavaAutoRunManager getInstance(Project project) {
|
||||
return ServiceManager.getService(project, JavaAutoRunManager.class);
|
||||
}
|
||||
|
||||
public JavaAutoRunManager(@NotNull Project project) {
|
||||
super(project);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
protected AutoTestWatcher createWatcher(Project project) {
|
||||
return new AutoTestWatcher() {
|
||||
private boolean myHasErrors = false;
|
||||
|
||||
private CompilationStatusListener myStatusListener;
|
||||
|
||||
|
||||
@Override
|
||||
public void activate() {
|
||||
if (myStatusListener == null) {
|
||||
myStatusListener = new CompilationStatusListener() {
|
||||
@Override
|
||||
public void compilationFinished(boolean aborted, int errors, int warnings, CompileContext compileContext) {
|
||||
if (errors == 0) {
|
||||
restartAllAutoTests(0);
|
||||
}
|
||||
myHasErrors = errors == 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void automakeCompilationFinished(int errors, int warnings, CompileContext compileContext) {
|
||||
compilationFinished(false, errors, warnings, compileContext);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fileGenerated(String outputRoot, String relativePath) {
|
||||
int a = 1;
|
||||
}
|
||||
};
|
||||
|
||||
CompilerManager.getInstance(project).addCompilationStatusListener(myStatusListener, project);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deactivate() {
|
||||
if (myStatusListener != null) {
|
||||
CompilerManager.getInstance(project).removeCompilationStatusListener(myStatusListener);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isUpToDate(int modificationStamp) {
|
||||
return !myHasErrors;
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user