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 | + |
@@ -7,48 +7,59 | |||
|
7 | 7 | |
|
8 | 8 | before(:each) do |
|
9 | 9 | @config = Grader::Configuration.get_instance |
|
10 | 10 | |
|
11 | 11 | # this test is from Pong |
|
12 | 12 | @problem_test_normal = stub(Problem, |
|
13 | 13 | :id => 1, :name => 'test_normal', |
|
14 | 14 | :full_score => 135) |
|
15 | 15 | @user_user1 = stub(User, |
|
16 | 16 | :id => 1, :login => 'user1') |
|
17 | 17 | |
|
18 | 18 | @engine = Grader::Engine.new |
|
19 | 19 | init_sandbox |
|
20 | 20 | end |
|
21 | 21 | |
|
22 | 22 | it "should grade normal submission" do |
|
23 | 23 | grader_should(:grade => "test1_correct.c", |
|
24 | 24 | :on => @problem_test_normal, |
|
25 | 25 | :and_report => { |
|
26 | 26 | :score => 135, |
|
27 | 27 | :comment => /^(\[|P|\])+/}) |
|
28 | 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 | 42 | it "should produce error message when submission cannot compile" do |
|
32 | 43 | grader_should(:grade => "test1_compile_error.c", |
|
33 | 44 | :on => @problem_test_normal, |
|
34 | 45 | :and_report => { |
|
35 | 46 | :score => 0, |
|
36 | 47 | :comment => 'compilation error', |
|
37 | 48 | :compiler_message => /[Ee]rror/}) |
|
38 | 49 | end |
|
39 | 50 | |
|
40 | 51 | it "should produce timeout error when submission runs forever" do |
|
41 | 52 | @problem_test_timeout = stub(Problem, |
|
42 | 53 | :id => 1, :name => 'test_timeout', |
|
43 | 54 | :full_score => 10) |
|
44 | 55 | grader_should(:grade => "test2_timeout.c", |
|
45 | 56 | :on => @problem_test_timeout, |
|
46 | 57 | :and_report => { |
|
47 | 58 | :score => 0, |
|
48 | 59 | :comment => 'TT'}) |
|
49 | 60 | end |
|
50 | 61 | |
|
51 | 62 | it "should produce timeout error correctly with fractional running time and fractional time limits" do |
|
52 | 63 | @problem_test_timeout = stub(Problem, |
|
53 | 64 | :id => 1, :name => 'test_timeout', |
|
54 | 65 | :full_score => 20) |
@@ -101,50 +112,51 | |||
|
101 | 112 | problem_test_yesno = stub(Problem, |
|
102 | 113 | :id => 1, :name => 'test_yesno', |
|
103 | 114 | :full_score => 10) |
|
104 | 115 | grader_should(:grade => "yesno_access_problem_home.c", |
|
105 | 116 | :on => problem_test_yesno, |
|
106 | 117 | :and_report => { |
|
107 | 118 | :score => 0, |
|
108 | 119 | :comment => /(-|x)/}) |
|
109 | 120 | end |
|
110 | 121 | |
|
111 | 122 | it "should not allow malicious submission to open files" do |
|
112 | 123 | problem_test_yesno = stub(Problem, |
|
113 | 124 | :id => 1, :name => 'test_yesno', |
|
114 | 125 | :full_score => 10) |
|
115 | 126 | grader_should(:grade => "yesno_open_file.c", |
|
116 | 127 | :on => problem_test_yesno, |
|
117 | 128 | :and_report => { |
|
118 | 129 | :score => 0, |
|
119 | 130 | :comment => /(-|x)/}) |
|
120 | 131 | end |
|
121 | 132 | |
|
122 | 133 | def grader_should(args) |
|
123 | 134 | @user1 = stub(User, |
|
124 | 135 | :id => 1, :login => 'user1') |
|
136 | + | |
|
125 | 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 | 139 | submission.should_receive(:graded_at=) |
|
128 | 140 | |
|
129 | 141 | expected_score = args[:and_report][:score] |
|
130 | 142 | expected_comment = args[:and_report][:comment] |
|
131 | 143 | if args[:and_report][:compiler_message]!=nil |
|
132 | 144 | expected_compiler_message = args[:and_report][:compiler_message] |
|
133 | 145 | else |
|
134 | 146 | expected_compiler_message = '' |
|
135 | 147 | end |
|
136 | 148 | |
|
137 | 149 | submission.should_receive(:points=).with(expected_score) |
|
138 | 150 | submission.should_receive(:grader_comment=).with(expected_comment) |
|
139 | 151 | submission.should_receive(:compiler_message=).with(expected_compiler_message) |
|
140 | 152 | submission.should_receive(:save) |
|
141 | 153 | |
|
142 | 154 | @engine.grade(submission) |
|
143 | 155 | end |
|
144 | 156 | |
|
145 | 157 | protected |
|
146 | 158 | |
|
147 | 159 | def create_normal_submission_mock_from_file(source_fname) |
|
148 | 160 | create_submission_from_file(1, @user_user1, @problem_test_normal, source_fname) |
|
149 | 161 | end |
|
150 | 162 |
You need to be logged in to leave comments.
Login now