Rebased and everything fixed

testmycode · Sep 12, 2015 · d35f7b3 · d35f7b3
1 parent c8f842c
commit d35f7b3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/test/java/fi/helsinki/cs/tmc/core/commands/SubmitTest.java b/src/test/java/fi/helsinki/cs/tmc/core/commands/SubmitTest.java
@@ -27,6 +27,7 @@
 import fi.helsinki.cs.tmc.core.exceptions.ExpiredException;
 import fi.helsinki.cs.tmc.core.exceptions.TmcCoreException;
 import fi.helsinki.cs.tmc.core.testhelpers.ExampleJson;
+import fi.helsinki.cs.tmc.langs.domain.NoLanguagePluginFoundException;
 
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
@@ -183,7 +184,7 @@ public void submitWithTmcCore() throws Exception {
     public void testSubmissionWithObserver()
             throws URISyntaxException, ExpiredException,
             TmcCoreException, ParseException,
-            IOException, InterruptedException {
+            IOException, InterruptedException, NoLanguagePluginFoundException {
 
         when(submitterMock.submit(eq(path), eq(observer))).thenReturn(URI.create("xkcd.com"));
         submitWithObserver.call();

diff --git a/src/test/java/fi/helsinki/cs/tmc/core/communication/SubmissionPollerTest.java b/src/test/java/fi/helsinki/cs/tmc/core/communication/SubmissionPollerTest.java
@@ -25,11 +25,7 @@ public class SubmissionPollerTest {
 
     private SubmissionPoller submissionPoller;
     private URI url = URI.create(
-<<<<<<< HEAD
             "https://example.com/staging/submissions/1764.json?api_version=7&client=tmc_cli&client_version=1");
-=======
-            "https://tmc.mooc.fi/staging/submissions/1764.json?api_version=7&client=tmc_cli&client_version=1");
->>>>>>> fix indentation and import orders
     private CoreTestSettings settings;
     private TmcApi tmcApi;