Typed generics

Author: jamo

src/test/java/fi/helsinki/cs/tmc/cli/shared/FeedbackHandlerTest.java

@@ -3,6 +3,7 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyListOf;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.powermock.api.mockito.PowerMockito.mockStatic;
@@ -66,7 +67,7 @@ public void setup() {
     @Test
     public void sendingFeedbackWorks() {
         PowerMockito.when(
-                TmcUtil.sendFeedback(any(CliContext.class), any(List.class), any(URI.class)))
+                TmcUtil.sendFeedback(any(CliContext.class), anyListOf(FeedbackAnswer.class), any(URI.class)))
                 .thenReturn(true);
         io.addLinePrompt("1");
         io.addLinePrompt("who cars");

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

@@ -12,6 +12,7 @@
 import fi.helsinki.cs.tmc.core.domain.submission.ValidationResultImpl;
 import fi.helsinki.cs.tmc.langs.abstraction.Strategy;
 import fi.helsinki.cs.tmc.langs.abstraction.ValidationError;
+import fi.helsinki.cs.tmc.langs.abstraction.ValidationResult;
 import fi.helsinki.cs.tmc.langs.domain.RunResult;
 import fi.helsinki.cs.tmc.langs.domain.RunResult.Status;
 import fi.helsinki.cs.tmc.langs.domain.TestResult;
@@ -24,6 +25,7 @@
 
 import java.io.File;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class ResultPrinterTest {
@@ -150,7 +152,7 @@ public void printValidationErrorsInLocalTests() {
         error.setMessage("validation error");
         validationErrors = ImmutableList.of((ValidationError) error);
         File file = new File("");
-        Map map = new HashMap<>();
+        Map<File, List<ValidationError>> map = new HashMap<>();
         map.put(file, validationErrors);
         valResult.setValidationErrors(map);
 
@@ -164,7 +166,7 @@ public void printValidationErrorsInSubmit() {
         error.setMessage("Incorrect indentation");
 
         File file = new File("Test.java");
-        Map valErrors = new HashMap<>();
+        Map<File, List<ValidationError>> valErrors = new HashMap<>();
         valErrors.put(file, ImmutableList.of((ValidationError) error));
 
         ValidationResultImpl valResult = new ValidationResultImpl();