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

Commit a1a2972

Browse files
author
Aleksi Salmela
committed
Remove unused option in workDir.
1 parent fa221fe commit a1a2972

4 files changed

Lines changed: 15 additions & 43 deletions

File tree

‎src/main/java/fi/helsinki/cs/tmc/cli/command/InfoCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ private int getCompletedExerciseCount(Course course) {
213213
}
214214

215215
private String getCurrentExercise(WorkDir workDir) {
216-
List<String> exercises = workDir.getExerciseNames(false, false, false);
216+
List<String> exercises = workDir.getExerciseNames(false, false);
217217
if (exercises.size() == 1) {
218218
return exercises.get(0);
219219
}

‎src/main/java/fi/helsinki/cs/tmc/cli/command/SubmitCommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void run(CliContext context, CommandLine args) {
7272
List<String> exerciseNames;
7373
if (args.hasOption("c")) {
7474
workDir.addPath(workDir.getCourseDirectory());
75-
exerciseNames = workDir.getExerciseNames(true, true, false);
75+
exerciseNames = workDir.getExerciseNames(true, true);
7676
} else {
7777
exerciseNames = workDir.getExerciseNames();
7878
}
@@ -97,7 +97,7 @@ public void run(CliContext context, CommandLine args) {
9797
ResultPrinter resultPrinter = new ResultPrinter(io, this.showDetails, this.showAll,
9898
color1, color2);
9999

100-
Boolean isOnlyExercise = exerciseNames.size() == 1;
100+
boolean isOnlyExercise = exerciseNames.size() == 1;
101101
List<Exercise> submitExercises = info.getExercises(exerciseNames);
102102
List<List<FeedbackQuestion>> feedbackLists
103103
= new ArrayList<>();

‎src/main/java/fi/helsinki/cs/tmc/cli/io/WorkDir.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,17 @@ public Path getConfigFile() {
6868
}
6969

7070
public List<String> getExerciseNames() {
71-
return getExerciseNames(true, false, false);
71+
return getExerciseNames(true, false);
7272
}
7373

7474
/**
7575
* Go through directories and return matching exercises.
7676
* @param exists Returns only exercises that aren't removed
7777
* @param onlyTested Return only exercises that are already tested
78-
* @param filterCompleted Remove the ones that are already completed
7978
* @return: return names of exercises as List
8079
*/
8180
public List<String> getExerciseNames(
82-
boolean exists, boolean onlyTested, boolean filterCompleted) {
81+
boolean exists, boolean onlyTested) {
8382
if (this.directories.isEmpty() && getConfigFile() == null) {
8483
return new ArrayList<>();
8584
}
@@ -121,7 +120,7 @@ public List<String> getExerciseNames(
121120
}
122121

123122
for (Exercise exercise : exercises) {
124-
if (filterExercise(exercise, locallyTested, exists, onlyTested, filterCompleted)) {
123+
if (filterExercise(exercise, locallyTested, exists, onlyTested)) {
125124
filteredExerciseNames.add(exercise.getName());
126125
}
127126
}
@@ -130,13 +129,10 @@ public List<String> getExerciseNames(
130129
}
131130

132131
private boolean filterExercise(Exercise exercise, List<String> tested,
133-
boolean exists, boolean onlyTested, boolean filterCompleted) {
132+
boolean exists, boolean onlyTested) {
134133
if (onlyTested && !tested.contains(exercise.getName())) {
135134
return false;
136135
}
137-
if (filterCompleted && exercise.isCompleted()) {
138-
return false;
139-
}
140136
if (exists && !Files.exists(getCourseDirectory().resolve(exercise.getName()))) {
141137
return false;
142138
}

‎src/test/java/fi/helsinki/cs/tmc/cli/io/WorkDirTest.java‎

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public void worksIfInCourseDirectoryWithNoParams() {
128128
workDir.setWorkdir(TEST_DIR);
129129
assertEquals(TEST_DIR.resolve(CourseInfoIo.COURSE_CONFIG),
130130
workDir.getConfigFile());
131-
List<String> exercises = workDir.getExerciseNames(true, false, false);
131+
List<String> exercises = workDir.getExerciseNames(true, false);
132132
assertEquals(3, exercises.size());
133133
assertTrue(exercises.contains("viikko1-teht1"));
134134
assertTrue(exercises.contains("viikko2-teht2"));
@@ -148,7 +148,7 @@ public void worksIfInExerciseDirectoryWithNoParams() {
148148
workDir.setWorkdir(TEST_DIR.resolve("viikko2-teht2"));
149149
assertEquals(TEST_DIR.resolve(CourseInfoIo.COURSE_CONFIG),
150150
workDir.getConfigFile());
151-
List<String> exercises = workDir.getExerciseNames(true, false, false);
151+
List<String> exercises = workDir.getExerciseNames(true, false);
152152
assertEquals(1, exercises.size());
153153
assertFalse(exercises.contains("viikko1-teht1"));
154154
assertTrue(exercises.contains("viikko2-teht2"));
@@ -162,7 +162,7 @@ public void worksIfInSubSubDirectoryWithNoParams() {
162162
workDir.setWorkdir(TEST_DIR.resolve("viikko2").resolve("subdir"));
163163
assertEquals(TEST_DIR.resolve(CourseInfoIo.COURSE_CONFIG),
164164
workDir.getConfigFile());
165-
List<String> exercises = workDir.getExerciseNames(true, false, false);
165+
List<String> exercises = workDir.getExerciseNames(true, false);
166166
assertEquals(1, exercises.size());
167167
assertFalse(exercises.contains("viikko1-teht1"));
168168
assertFalse(exercises.contains("viikko2-teht2"));
@@ -185,7 +185,7 @@ public void worksIfInCourseDirectoryWithParams() {
185185
workDir = new WorkDir();
186186
workDir.setWorkdir(TEST_DIR);
187187
workDir.addPath("teht1");
188-
exercises = workDir.getExerciseNames(true, false, false);
188+
exercises = workDir.getExerciseNames(true, false);
189189
assertEquals(0, exercises.size());
190190
assertFalse(exercises.contains("viikko1-teht1"));
191191
assertFalse(exercises.contains("viikko2-teht2"));
@@ -200,7 +200,7 @@ public void worksIfInSubDirectoryWithParams() {
200200
assertEquals(TEST_DIR.resolve(CourseInfoIo.COURSE_CONFIG),
201201
workDir.getConfigFile());
202202
workDir.addPath("teht2");
203-
List<String> exercises = workDir.getExerciseNames(true, false, false);
203+
List<String> exercises = workDir.getExerciseNames(true, false);
204204
assertEquals(1, exercises.size());
205205
assertFalse(exercises.contains("viikko1-teht1"));
206206
assertTrue(exercises.contains("viikko2-teht2"));
@@ -217,7 +217,7 @@ public void worksIfInSubSubDirectoryWithParams() {
217217
.resolve("dirUtilTest").resolve(CourseInfoIo.COURSE_CONFIG),
218218
workDir.getConfigFile());
219219
workDir.addPath("teht3");
220-
List<String> exercises = workDir.getExerciseNames(true, false, false);
220+
List<String> exercises = workDir.getExerciseNames(true, false);
221221
assertEquals(1, exercises.size());
222222
assertFalse(exercises.contains("viikko1-teht1"));
223223
assertFalse(exercises.contains("viikko2-teht2"));
@@ -229,7 +229,7 @@ public void worksInSubDirectoryOfAnExercise() {
229229
Path path = TEST_DIR.resolve("viikko1-teht1").resolve("src");
230230
WorkDir workDir = new WorkDir();
231231
workDir.addPath(path);
232-
List<String> exercises = workDir.getExerciseNames(true, false, false);
232+
List<String> exercises = workDir.getExerciseNames(true, false);
233233
assertEquals(1, exercises.size());
234234
assertTrue(exercises.contains("viikko1-teht1"));
235235
assertFalse(exercises.contains("viikko2-teht2"));
@@ -240,35 +240,11 @@ public void worksInSubDirectoryOfAnExercise() {
240240
public void worksWhenDeletedExercisesAreNotFiltered() {
241241
WorkDir workDir = new WorkDir();
242242
workDir.addPath(TEST_DIR);
243-
List<String> exercises = workDir.getExerciseNames(false, false, false);
243+
List<String> exercises = workDir.getExerciseNames(false, false);
244244
assertEquals(4, exercises.size());
245245
assertTrue(exercises.contains("viikko1-teht1"));
246246
assertTrue(exercises.contains("viikko2-teht2"));
247247
assertTrue(exercises.contains("viikko2-teht3"));
248248
assertTrue(exercises.contains("viikko3-nonexistent"));
249249
}
250-
251-
@Test
252-
public void filteringCompletedExercisesWorks() {
253-
WorkDir workDir = new WorkDir();
254-
workDir.addPath(TEST_DIR);
255-
List<String> exercises = workDir.getExerciseNames(false, false, true);
256-
assertEquals(3, exercises.size());
257-
assertTrue(exercises.contains("viikko1-teht1"));
258-
assertFalse(exercises.contains("viikko2-teht2"));
259-
assertTrue(exercises.contains("viikko2-teht3"));
260-
assertTrue(exercises.contains("viikko3-nonexistent"));
261-
}
262-
263-
@Test
264-
public void filteringOnlyTestedExercisesWorks() {
265-
WorkDir workDir = new WorkDir();
266-
workDir.addPath(TEST_DIR);
267-
List<String> exercises = workDir.getExerciseNames(false, true, false);
268-
assertEquals(1, exercises.size());
269-
assertTrue(exercises.contains("viikko1-teht1"));
270-
assertFalse(exercises.contains("viikko2-teht2"));
271-
assertFalse(exercises.contains("viikko2-teht3"));
272-
assertFalse(exercises.contains("viikko3-nonexistent"));
273-
}
274250
}

0 commit comments

Comments
 (0)