Skip to content

Commit 01be721

Browse files
committed
fix tests not showing in C projects
1 parent 41efbf1 commit 01be721

File tree

2 files changed

+29
-9
lines changed

2 files changed

+29
-9
lines changed

tmc-plugin/src/fi/helsinki/cs/tmc/actions/RefreshCoursesAction.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ public void onSuccess(final List<Course> courses) {
128128
createSystemHandle("Loading course");
129129
loadingCourse.start();
130130
URI uri = new URI(currentCourse.getDetailsUrl());
131-
System.out.println(uri + " here we go!\n\n\n\n\n\n\n\n\n\n");
132131
ListenableFuture<Course> courseFuture = tmcCore.getCourse(uri);
133132

134133
Futures.addCallback(courseFuture, new UpdateCourse(courses, loadingCourse));

tmc-plugin/src/fi/helsinki/cs/tmc/runners/CheckstyleRunHandler.java

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,18 @@
66
import fi.helsinki.cs.tmc.data.ResultCollector;
77
import fi.helsinki.cs.tmc.model.ProjectMediator;
88
import fi.helsinki.cs.tmc.model.TmcProjectInfo;
9-
import fi.helsinki.cs.tmc.model.NBTmcSettings;
109
import fi.helsinki.cs.tmc.model.TmcCoreSingleton;
1110
import fi.helsinki.cs.tmc.stylerunner.validation.CheckstyleResult;
1211
import fi.helsinki.cs.tmc.stylerunner.validation.ValidationResult;
1312
import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
1413
import fi.helsinki.cs.tmc.core.exceptions.TmcCoreException;
14+
import fi.helsinki.cs.tmc.stylerunner.validation.Strategy;
15+
import fi.helsinki.cs.tmc.stylerunner.validation.ValidationError;
16+
import java.io.File;
1517
import java.nio.file.Paths;
18+
import java.util.HashMap;
19+
import java.util.List;
20+
import java.util.Map;
1621

1722
import javax.swing.SwingUtilities;
1823

@@ -32,11 +37,11 @@ public void performAction(final ResultCollector resultCollector, final Project p
3237
final String projectType = projectInfo.getProjectType().name();
3338
ProjectMediator.getInstance().saveAllFiles();
3439
try {
35-
ListenableFuture<ValidationResult> result = TmcCoreSingleton.getInstance().runCheckstyle(
36-
Paths.get(
37-
projectInfo.getProjectDirAsFile().getAbsolutePath()
38-
));
39-
Futures.addCallback(result, new ExplainValidationResult(resultCollector, dialogDisplayer));
40+
ListenableFuture<ValidationResult> result = TmcCoreSingleton.getInstance().runCheckstyle(
41+
Paths.get(
42+
projectInfo.getProjectDirAsFile().getAbsolutePath()
43+
));
44+
Futures.addCallback(result, new ExplainValidationResult(resultCollector, dialogDisplayer));
4045
} catch (TmcCoreException ex) {
4146
ConvenientDialogDisplayer.getDefault().displayError("Checkstyle audit failed.");
4247
Exceptions.printStackTrace(ex);
@@ -60,17 +65,33 @@ public void onSuccess(final ValidationResult v) {
6065
SwingUtilities.invokeLater(new Runnable() {
6166
@Override
6267
public void run() {
68+
System.out.println("style done yay");
6369
resultCollector.setValidationResult(v);
6470
}
6571
});
6672
}
6773

6874
@Override
69-
public void onFailure(Throwable thrwbl) {
75+
public void onFailure(final Throwable ex) {
7076
SwingUtilities.invokeLater(new Runnable() {
7177
@Override
7278
public void run() {
73-
dialogDisplayer.displayError("Failed to validate the code.");
79+
if (ex instanceof UnsupportedOperationException) {
80+
resultCollector.setValidationResult(new ValidationResult() {
81+
82+
@Override
83+
public Strategy getStrategy() {
84+
return null;
85+
}
86+
87+
@Override
88+
public Map<File, List<ValidationError>> getValidationErrors() {
89+
return new HashMap<File, List<ValidationError>>();
90+
}
91+
});
92+
} else {
93+
dialogDisplayer.displayError("Failed to validate the code.");
94+
}
7495
}
7596
});
7697
}

0 commit comments

Comments
 (0)