Add solution command in the intro message for local grading (#125)

ia-toki · Feb 20, 2017 · c304556 · c304556
1 parent 7c019b6
commit c304556
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/include/tcframe/grader/Grader.hpp b/include/tcframe/grader/Grader.hpp
@@ -35,7 +35,7 @@ class Grader {
             , logger_(logger) {}
 
     virtual void grade(const TestSuite& testSuite, const ConstraintSuite& constraintSuite, const GraderConfig& config) {
-        logger_->logIntroduction();
+        logger_->logIntroduction(config.solutionCommand());
 
         map<int, Verdict> subtaskVerdicts;
         for (int subtaskId : getSubtaskIdsToGrade(constraintSuite)) {

diff --git a/include/tcframe/grader/GraderLogger.hpp b/include/tcframe/grader/GraderLogger.hpp
@@ -17,8 +17,8 @@ class GraderLogger : public BaseLogger {
     GraderLogger(LoggerEngine* engine)
             : BaseLogger(engine) {}
 
-    virtual void logIntroduction() {
-        engine_->logParagraph(0, "Grading...");
+    virtual void logIntroduction(const string& solutionCommand) {
+        engine_->logParagraph(0, "Local grading with solution command: '" + solutionCommand + "'...");
     }
 
     virtual void logTestCaseVerdict(const Verdict& verdict) {

diff --git a/test/unit/tcframe/grader/GraderLoggerTests.cpp b/test/unit/tcframe/grader/GraderLoggerTests.cpp
@@ -17,9 +17,9 @@ class GraderLoggerTests : public Test {
 };
 
 TEST_F(GraderLoggerTests, Introduction) {
-    EXPECT_CALL(engine, logParagraph(0, "Grading..."));
+    EXPECT_CALL(engine, logParagraph(0, "Local grading with solution command: './solution'..."));
 
-    logger.logIntroduction();
+    logger.logIntroduction("./solution");
 }
 
 TEST_F(GraderLoggerTests, TestCaseVerdict) {

diff --git a/test/unit/tcframe/grader/GraderTests.cpp b/test/unit/tcframe/grader/GraderTests.cpp
@@ -86,7 +86,7 @@ int GraderTests::T;
 TEST_F(GraderTests, Grading_AC) {
     {
         InSequence sequence;
-        EXPECT_CALL(logger, logIntroduction());
+        EXPECT_CALL(logger, logIntroduction("python Sol.py"));
         EXPECT_CALL(logger, logTestGroupIntroduction(0));
         EXPECT_CALL(testCaseGrader, grade(stcA, config));
         EXPECT_CALL(logger, logTestGroupIntroduction(-1));
@@ -107,7 +107,7 @@ TEST_F(GraderTests, Grading_NonAC) {
 TEST_F(GraderTests, Grading_WithSubtasks) {
     {
         InSequence sequence;
-        EXPECT_CALL(logger, logIntroduction());
+        EXPECT_CALL(logger, logIntroduction("python Sol.py"));
         EXPECT_CALL(logger, logTestGroupIntroduction(0));
         EXPECT_CALL(testCaseGrader, grade(stc1, config));
         EXPECT_CALL(testCaseGrader, grade(stc2, config));
@@ -143,7 +143,7 @@ TEST_F(GraderTests, Grading_WithSubtasks_WithGlobalConstraints) {
 TEST_F(GraderTests, Grading_WithSubtasks_MultipleTestCases) {
     {
         InSequence sequence;
-        EXPECT_CALL(logger, logIntroduction());
+        EXPECT_CALL(logger, logIntroduction("python Sol.py"));
         EXPECT_CALL(logger, logTestGroupIntroduction(0));
         EXPECT_CALL(testCaseGrader, grade(
                 TestUtils::createFakeTestCase("foo_sample", {1, 2}), multipleTestCasesConfig));

diff --git a/test/unit/tcframe/grader/MockGraderLogger.hpp b/test/unit/tcframe/grader/MockGraderLogger.hpp
@@ -16,7 +16,7 @@ class MockGraderLogger : public GraderLogger {
     MOCK_METHOD1(logTestCaseScoringMessage, void(const string&));
     MOCK_METHOD2(logExecutionFailure, void(const string&, const ExecutionResult&));
 
-    MOCK_METHOD0(logIntroduction, void());
+    MOCK_METHOD1(logIntroduction, void(const string&));
     MOCK_METHOD1(logTestCaseVerdict, void(const Verdict&));
 
     MOCK_METHOD1(logResult, void(const map<int, Verdict>&));