Description:
Merge branch 'master' into windows
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r126:be832795a805 - - 2 files changed: 26 inserted, 1 deleted
@@ -0,0 +1,13 | |||||
|
|
1 | + /* | ||
|
|
2 | + LANG: C++ | ||
|
|
3 | + */ | ||
|
|
4 | + #include <cstdio> | ||
|
|
5 | + | ||
|
|
6 | + int main() | ||
|
|
7 | + { | ||
|
|
8 | + int a,b,r; | ||
|
|
9 | + r = scanf("%d %d",&a,&b); | ||
|
|
10 | + printf("%d\n",a+b); | ||
|
|
11 | + return 0; | ||
|
|
12 | + } | ||
|
|
13 | + |
@@ -19,24 +19,35 | |||||
|
19 | init_sandbox |
|
19 | init_sandbox |
|
20 | end |
|
20 | end |
|
21 |
|
21 | ||
|
22 | it "should grade normal submission" do |
|
22 | it "should grade normal submission" do |
|
23 | grader_should(:grade => "test1_correct.c", |
|
23 | grader_should(:grade => "test1_correct.c", |
|
24 | :on => @problem_test_normal, |
|
24 | :on => @problem_test_normal, |
|
25 | :and_report => { |
|
25 | :and_report => { |
|
26 | :score => 135, |
|
26 | :score => 135, |
|
27 | :comment => /^(\[|P|\])+/}) |
|
27 | :comment => /^(\[|P|\])+/}) |
|
28 | end |
|
28 | end |
|
29 |
|
29 | ||
|
30 |
|
30 | ||
|
|
31 | + it "should grade normal submission in C++" do | ||
|
|
32 | + cpp_lang = stub(Language, :name => 'cpp', :ext => 'cpp') | ||
|
|
33 | + | ||
|
|
34 | + grader_should(:grade => "test1_correct_cc.cc", | ||
|
|
35 | + :language => cpp_lang, | ||
|
|
36 | + :on => @problem_test_normal, | ||
|
|
37 | + :and_report => { | ||
|
|
38 | + :score => 135, | ||
|
|
39 | + :comment => /^(\[|P|\])+/}) | ||
|
|
40 | + end | ||
|
|
41 | + | ||
|
31 | it "should produce error message when submission cannot compile" do |
|
42 | it "should produce error message when submission cannot compile" do |
|
32 | grader_should(:grade => "test1_compile_error.c", |
|
43 | grader_should(:grade => "test1_compile_error.c", |
|
33 | :on => @problem_test_normal, |
|
44 | :on => @problem_test_normal, |
|
34 | :and_report => { |
|
45 | :and_report => { |
|
35 | :score => 0, |
|
46 | :score => 0, |
|
36 | :comment => 'compilation error', |
|
47 | :comment => 'compilation error', |
|
37 | :compiler_message => /[Ee]rror/}) |
|
48 | :compiler_message => /[Ee]rror/}) |
|
38 | end |
|
49 | end |
|
39 |
|
50 | ||
|
40 | it "should produce timeout error when submission runs forever" do |
|
51 | it "should produce timeout error when submission runs forever" do |
|
41 | @problem_test_timeout = stub(Problem, |
|
52 | @problem_test_timeout = stub(Problem, |
|
42 | :id => 1, :name => 'test_timeout', |
|
53 | :id => 1, :name => 'test_timeout', |
@@ -113,26 +124,27 | |||||
|
113 | :id => 1, :name => 'test_yesno', |
|
124 | :id => 1, :name => 'test_yesno', |
|
114 | :full_score => 10) |
|
125 | :full_score => 10) |
|
115 | grader_should(:grade => "yesno_open_file.c", |
|
126 | grader_should(:grade => "yesno_open_file.c", |
|
116 | :on => problem_test_yesno, |
|
127 | :on => problem_test_yesno, |
|
117 | :and_report => { |
|
128 | :and_report => { |
|
118 | :score => 0, |
|
129 | :score => 0, |
|
119 | :comment => /(-|x)/}) |
|
130 | :comment => /(-|x)/}) |
|
120 | end |
|
131 | end |
|
121 |
|
132 | ||
|
122 | def grader_should(args) |
|
133 | def grader_should(args) |
|
123 | @user1 = stub(User, |
|
134 | @user1 = stub(User, |
|
124 | :id => 1, :login => 'user1') |
|
135 | :id => 1, :login => 'user1') |
|
|
136 | + | ||
|
125 | submission = |
|
137 | submission = |
|
126 | - create_submission_from_file(1, @user1, args[:on], args[:grade]) |
|
138 | + create_submission_from_file(1, @user1, args[:on], args[:grade], args[:language]) |
|
127 | submission.should_receive(:graded_at=) |
|
139 | submission.should_receive(:graded_at=) |
|
128 |
|
140 | ||
|
129 | expected_score = args[:and_report][:score] |
|
141 | expected_score = args[:and_report][:score] |
|
130 | expected_comment = args[:and_report][:comment] |
|
142 | expected_comment = args[:and_report][:comment] |
|
131 | if args[:and_report][:compiler_message]!=nil |
|
143 | if args[:and_report][:compiler_message]!=nil |
|
132 | expected_compiler_message = args[:and_report][:compiler_message] |
|
144 | expected_compiler_message = args[:and_report][:compiler_message] |
|
133 | else |
|
145 | else |
|
134 | expected_compiler_message = '' |
|
146 | expected_compiler_message = '' |
|
135 | end |
|
147 | end |
|
136 |
|
148 | ||
|
137 | submission.should_receive(:points=).with(expected_score) |
|
149 | submission.should_receive(:points=).with(expected_score) |
|
138 | submission.should_receive(:grader_comment=).with(expected_comment) |
|
150 | submission.should_receive(:grader_comment=).with(expected_comment) |
You need to be logged in to leave comments.
Login now