Skip to content

Commit 38b997a

Browse files
committed
Save files on testrun and fix test result showing
1 parent d5865c3 commit 38b997a

File tree

2 files changed

+31
-26
lines changed

2 files changed

+31
-26
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ protected boolean enabledFor(Exercise exercise) {
7676
@Override
7777
public void run() {
7878
Exercise exercise = exerciseForProject(project);
79+
80+
projectMediator.saveAllFiles();
7981
final ResultCollector resultCollector = new ResultCollector(exercise);
8082

8183
if (exercise != null) {

tmc-plugin/src/fi/helsinki/cs/tmc/ui/TestCaseResultCell.java

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,11 @@ private JPanel createDetailView() {
8989
view.setLayout(new GridBagLayout());
9090
view.setBackground(Color.WHITE);
9191

92-
if (result.getException() != null) {
92+
if (result.getException() != null || result.getMessage() != null) {
9393
view.add(Box.createVerticalStrut(16), gbc);
9494
this.detailedMessageButton = new JButton(detailedMessageAction);
9595
gbc.weighty = 1.0; // Leave it so for the detailed message
9696
view.add(detailedMessageButton, gbc);
97-
} else if (result.getMessage() != null) {
98-
view.add(Box.createVerticalStrut(16), gbc);
99-
this.detailedMessageButton = new JButton(valgrindAction);
100-
gbc.weighty = 1.0; // Leave it so for the detailed message
101-
view.add(detailedMessageButton, gbc);
10297
} else {
10398
this.detailedMessageButton = null;
10499
return null;
@@ -201,25 +196,25 @@ public void finish() {
201196
}
202197
}
203198

204-
private Action valgrindAction = new AbstractAction("Show valgrind trace") {
205-
206-
@Override
207-
public void actionPerformed(final ActionEvent event) {
208-
209-
detailView.remove(detailedMessageButton);
210-
211-
final DetailedMessageDisplay display = new DetailedMessageDisplay();
212-
display.setBackground(Color.WHITE);
213-
display.setContent(result.getMessage());
214-
display.finish();
215-
216-
detailView.add(display, gbc);
217-
218-
resultCell.revalidate();
219-
resultCell.repaint();
220-
}
221-
222-
};
199+
// private Action valgrindAction = new AbstractAction("Show valgrind trace") {
200+
//
201+
// @Override
202+
// public void actionPerformed(final ActionEvent event) {
203+
//
204+
// detailView.remove(detailedMessageButton);
205+
//
206+
// final DetailedMessageDisplay display = new DetailedMessageDisplay();
207+
// display.setBackground(Color.WHITE);
208+
// display.setContent(result.getMessage());
209+
// display.finish();
210+
//
211+
// detailView.add(display, gbc);
212+
//
213+
// resultCell.revalidate();
214+
// resultCell.repaint();
215+
// }
216+
//
217+
// };
223218

224219
private Action detailedMessageAction = new AbstractAction("Show detailed message") {
225220

@@ -229,7 +224,15 @@ public void actionPerformed(ActionEvent event) {
229224
detailView.remove(detailedMessageButton);
230225

231226
ExceptionDisplay display = new ExceptionDisplay();
232-
addException(display, result.getException(), false);
227+
ImmutableList<String> ex;
228+
229+
if (result.getException() != null && result.getException().size() > 0) {
230+
ex = result.getException();
231+
} else {
232+
ex = result.getDetailedMessage();
233+
}
234+
235+
addException(display, ex, false);
233236
display.finish();
234237

235238
detailView.add(display, gbc);

0 commit comments

Comments
 (0)