Skip to content

Commit 433c1e3

Browse files
committed
Merge branch 'core_integration' of https://github.com/rage/tmc-netbeans into core_integration
2 parents d67b34b + ce1044c commit 433c1e3

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fi.helsinki.cs.tmc.actions;
1+
package fi.helsinki.cs.tmc.actions;
22

33
import hy.tmc.core.domain.Exercise;
44
import fi.helsinki.cs.tmc.model.CourseDb;

tmc-plugin/test/unit/src/fi/helsinki/cs/tmc/data/serialization/SubmissionResultParserTest.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.List;
44
import hy.tmc.core.domain.submission.SubmissionResult;
5+
import hy.tmc.core.domain.submission.FeedbackQuestion;
56
import hy.tmc.core.domain.submission.StackTrace;
67
import static hy.tmc.core.domain.submission.SubmissionResult.Status.*;
78
import hy.tmc.core.domain.submission.TestCase;
@@ -71,15 +72,14 @@ public void testExceptions() {
7172
String input = "{status: \"fail\", test_cases: " + testCasesJson + ", points: []}";
7273

7374
SubmissionResult result = parse(input);
74-
7575
TestException cex = result.getTestCases().get(0).getException();
7676
assertNotNull(cex);
7777
assertEquals("FooEx", cex.getClassName());
7878
assertEquals("xoo", cex.getMessage());
7979

8080
StackTrace[] trace = cex.getStackTrace();
8181
assertNotNull(trace);
82-
assertEquals("Foo", trace[0].getDeclaringClass()); // getClassName());
82+
assertEquals("Foo", trace[0].getDeclaringClass());
8383
assertEquals("bar", trace[0].getMethodName());
8484
assertEquals("Foo.java", trace[0].getFileName());
8585
assertEquals(123, trace[0].getLineNumber());
@@ -98,8 +98,10 @@ public void testFeedbackQuestions() {
9898
assertEquals("foo?", result.getFeedbackQuestions().get(0).getQuestion());
9999
assertTrue(result.getFeedbackQuestions().get(0).isIntRange());
100100
assertFalse(result.getFeedbackQuestions().get(0).isText());
101-
assertEquals(1, result.getFeedbackQuestions().get(0).getIntRangeMin());
102-
assertEquals(5, result.getFeedbackQuestions().get(0).getIntRangeMax());
101+
FeedbackQuestion feedbackQ = result.getFeedbackQuestions().get(0);
102+
feedbackQ.setKind("intrange[1..5]");
103+
assertEquals(1, feedbackQ.getIntRangeMin());
104+
assertEquals(5, feedbackQ.getIntRangeMax());
103105

104106
assertEquals(7, result.getFeedbackQuestions().get(1).getId());
105107
assertEquals("bar?", result.getFeedbackQuestions().get(1).getQuestion());

0 commit comments

Comments
 (0)