2
2
3
3
import java .util .List ;
4
4
import hy .tmc .core .domain .submission .SubmissionResult ;
5
- import fi . helsinki . cs . tmc . data . TestCaseResult ;
6
- import fi . helsinki . cs . tmc . testrunner . CaughtException ;
5
+ import hy . tmc . core . domain . submission . FeedbackQuestion ;
6
+ import hy . tmc . core . domain . submission . StackTrace ;
7
7
import static hy .tmc .core .domain .submission .SubmissionResult .Status .*;
8
+ import hy .tmc .core .domain .submission .TestCase ;
9
+ import hy .tmc .core .domain .submission .TestException ;
8
10
import org .junit .Test ;
9
11
import static org .junit .Assert .*;
10
12
@@ -52,7 +54,7 @@ public void testFail() {
52
54
assertEquals (1 , result .getPoints ().size ());
53
55
assertEquals ("1.1" , result .getPoints ().get (0 ));
54
56
55
- List <TestCaseResult > testCases = result .getTestCases ();
57
+ List <TestCase > testCases = result .getTestCases ();
56
58
assertEquals (2 , testCases .size ());
57
59
assertEquals ("Some test" , testCases .get (0 ).getName ());
58
60
assertEquals ("Another test" , testCases .get (1 ).getName ());
@@ -71,15 +73,14 @@ public void testExceptions() {
71
73
72
74
SubmissionResult result = parse (input );
73
75
74
- CaughtException cex = result .getTestCases ().get (0 ).getException ();
76
+ TestException cex = result .getTestCases ().get (0 ).getException ();
75
77
assertNotNull (cex );
76
- assertEquals ("FooEx" , cex .className );
77
- assertEquals ("xoo" , cex .message );
78
- assertNull (null , cex .cause );
78
+ assertEquals ("FooEx" , cex .getClassName ());
79
+ assertEquals ("xoo" , cex .getMessage ());
79
80
80
- StackTraceElement [] trace = cex .stackTrace ;
81
+ StackTrace [] trace = cex .getStackTrace () ;
81
82
assertNotNull (trace );
82
- assertEquals ("Foo" , trace [0 ].getClassName ());
83
+ assertEquals ("Foo" , trace [0 ].getDeclaringClass ());
83
84
assertEquals ("bar" , trace [0 ].getMethodName ());
84
85
assertEquals ("Foo.java" , trace [0 ].getFileName ());
85
86
assertEquals (123 , trace [0 ].getLineNumber ());
@@ -98,8 +99,10 @@ public void testFeedbackQuestions() {
98
99
assertEquals ("foo?" , result .getFeedbackQuestions ().get (0 ).getQuestion ());
99
100
assertTrue (result .getFeedbackQuestions ().get (0 ).isIntRange ());
100
101
assertFalse (result .getFeedbackQuestions ().get (0 ).isText ());
101
- assertEquals (1 , result .getFeedbackQuestions ().get (0 ).getIntRangeMin ());
102
- assertEquals (5 , result .getFeedbackQuestions ().get (0 ).getIntRangeMax ());
102
+ FeedbackQuestion feedbackQ = result .getFeedbackQuestions ().get (0 );
103
+ feedbackQ .setKind ("intrange[1..5]" );
104
+ assertEquals (1 , feedbackQ .getIntRangeMin ());
105
+ assertEquals (5 , feedbackQ .getIntRangeMax ());
103
106
104
107
assertEquals (7 , result .getFeedbackQuestions ().get (1 ).getId ());
105
108
assertEquals ("bar?" , result .getFeedbackQuestions ().get (1 ).getQuestion ());
0 commit comments