Skip to content
This repository was archived by the owner on Jun 3, 2025. It is now read-only.

Commit 1cd105b

Browse files
author
mikkomaa
authored
Merge pull request #359 from tmc-cli/some-tests-matike
Some tests added
2 parents 3cf1d53 + 731b9a4 commit 1cd105b

File tree

2 files changed

+47
-4
lines changed

2 files changed

+47
-4
lines changed

src/test/java/fi/helsinki/cs/tmc/cli/io/ResultPrinterTest.java

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55

66
import fi.helsinki.cs.tmc.core.domain.submission.SubmissionResult;
77
import fi.helsinki.cs.tmc.core.domain.submission.SubmissionResult.TestResultStatus;
8-
import fi.helsinki.cs.tmc.langs.abstraction.ValidationResult;
8+
import fi.helsinki.cs.tmc.core.domain.submission.ValidationErrorImpl;
9+
import fi.helsinki.cs.tmc.core.domain.submission.ValidationResultImpl;
10+
import fi.helsinki.cs.tmc.langs.abstraction.ValidationError;
911
import fi.helsinki.cs.tmc.langs.domain.RunResult;
1012
import fi.helsinki.cs.tmc.langs.domain.RunResult.Status;
1113
import fi.helsinki.cs.tmc.langs.domain.TestResult;
@@ -16,15 +18,19 @@
1618
import org.junit.Before;
1719
import org.junit.Test;
1820

21+
import java.io.File;
22+
import java.util.HashMap;
23+
import java.util.Map;
24+
1925
public class ResultPrinterTest {
2026

2127
private TestIo io;
2228
private ResultPrinter printer;
2329
private SubmissionResult mockSubResult;
2430
private RunResult runResult;
25-
private ValidationResult valResult;
2631
private ImmutableList<TestResult> testResults;
2732
private ImmutableMap<String, byte[]> logs;
33+
private ImmutableList<ValidationError> validationErrors;
2834

2935
@Before
3036
public void setUp() {
@@ -130,4 +136,21 @@ public void printLocalTestResultIfCompilationFail() {
130136
io.assertContains("Failed to compile project");
131137
}
132138

139+
@Test
140+
public void printValidationErrors() {
141+
testResults = ImmutableList.of(new TestResult("test1", true, "Cool!"));
142+
runResult = new RunResult(Status.PASSED, testResults, logs);
143+
144+
ValidationErrorImpl error = new ValidationErrorImpl();
145+
ValidationResultImpl valResult = new ValidationResultImpl();
146+
error.setMessage("validation error");
147+
validationErrors = ImmutableList.of((ValidationError) error);
148+
File file = new File("");
149+
Map map = new HashMap<>();
150+
map.put(file, validationErrors);
151+
valResult.setValidationErrors(map);
152+
153+
printer.printLocalTestResult(runResult, valResult, false);
154+
io.assertContains("validation error");
155+
}
133156
}

src/test/java/fi/helsinki/cs/tmc/cli/tmcstuff/CourseInfoTest.java

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,15 @@ public void replacesAllOldExercises() {
5757
Exercise newEx2 = new Exercise("test-exercise2", "test-course");
5858
newEx2.setCompleted(true);
5959

60+
List<Exercise> exercises = new ArrayList<>();
61+
exercises.add(newEx1);
62+
exercises.add(newEx2);
63+
6064
courseInfo.getExercises().add(oldEx1);
6165
courseInfo.getExercises().add(oldEx2);
6266
assertFalse(courseInfo.getExercise("test-exercise1").isCompleted());
6367
assertFalse(courseInfo.getExercise("test-exercise2").isCompleted());
64-
courseInfo.replaceOldExercise(newEx1);
65-
courseInfo.replaceOldExercise(newEx2);
68+
courseInfo.replaceOldExercises(exercises);
6669
assertTrue(courseInfo.getExercise("test-exercise1").isCompleted());
6770
assertTrue(courseInfo.getExercise("test-exercise2").isCompleted());
6871

@@ -90,4 +93,21 @@ public void canGetListOfExercisesByTheirNames() {
9093
assertTrue(got.contains(ex3));
9194
assertEquals(2, got.size());
9295
}
96+
97+
@Test
98+
public void canGetListOfExerciseNames() {
99+
Exercise ex1 = new Exercise("test-exercise1", "test-course");
100+
Exercise ex2 = new Exercise("test-exercise2", "test-course");
101+
102+
List<Exercise> exercises = new ArrayList<>();
103+
exercises.add(ex1);
104+
exercises.add(ex2);
105+
106+
courseInfo.setExercises(exercises);
107+
108+
List<String> got = courseInfo.getExerciseNames();
109+
110+
assertEquals(got.get(0), "test-exercise1");
111+
assertEquals(got.get(1), "test-exercise2");
112+
}
93113
}

0 commit comments

Comments
 (0)