fix unit test & remove double space

Author: NJahreis

classes/local/question_generator.php

@@ -107,14 +107,14 @@ public function generate_question(stdClass $dataobject, bool $sendexistingquesti
             switch ($dataobject->mode) {
                 case story_form::QUESTIONGEN_MODE_TOPIC:
                     $storyprompt =
-                        $modeheader . ' TOPIC\n' .
+                        $modeheader . 'TOPIC\n' .
                         'Create a question about the following topic. Use your own training data to generate it: "' .
                         $story . '"';
                     break;
                 case story_form::QUESTIONGEN_MODE_STORY:
                 case story_form::QUESTIONGEN_MODE_COURSECONTENTS:
                     $storyprompt =
-                        $modeheader . ' COURSE CONTENTS\n' .
+                        $modeheader . 'COURSE CONTENTS\n' .
                         'Create a question from the following contents. ' .
                         'Only use this content and do not use any training data: "' .
                         $story .

tests/local/question_generator_test.php

@@ -71,7 +71,8 @@ public function test_generate_question(): void {
         $this->assertEquals($presetjson->primer, $questionobject->primer);
         $this->assertEquals($presetjson->instructions, $questionobject->instructions);
         $this->assertEquals($presetjson->example, $questionobject->example);
-        $expectedstoryprompt = 'Create a question about the following topic. Use your own training data to generate it: "' .
+        $expectedstoryprompt = '\n\n## QUESTION GENERATION MODE - TOPIC\n' .
+            'Create a question about the following topic. Use your own training data to generate it: "' .
             $dataobject->story . '"';
         $this->assertEquals($expectedstoryprompt, $questionobject->storyprompt);
         $this->assertEmpty($questionobject->questiontextsinqbankprompt);
@@ -110,11 +111,12 @@ public function test_generate_question(): void {
         $this->assertEquals($presetjson->primer, $questionobject->primer);
         $this->assertEquals($presetjson->instructions, $questionobject->instructions);
         $this->assertEquals($presetjson->example, $questionobject->example);
-        $expectedstoryprompt = 'Create a question about the following topic. Use your own training data to generate it: "' .
+        $expectedstoryprompt = '\n\n## QUESTION GENERATION MODE - TOPIC\n' .
+            'Create a question about the following topic. Use your own training data to generate it: "' .
             $dataobject->story . '"';
         $this->assertEquals($expectedstoryprompt, $questionobject->storyprompt);
-        $this->assertStringContainsString('The question that will be generated by you has to be different '
-            . 'from all of the following questions in this JSON string: "', $questionobject->questiontextsinqbankprompt);
+        $this->assertStringContainsString('The question that will be generated by you has to be different from'
+            . 'all the questions in this JSON string:\n"', $questionobject->questiontextsinqbankprompt);
         $this->assertStringContainsString('Test question 1', $questionobject->questiontextsinqbankprompt);
         $this->assertStringContainsString('Write some intelligent stuff', $questionobject->questiontextsinqbankprompt);
         $this->assertStringContainsString('Test question 2', $questionobject->questiontextsinqbankprompt);
@@ -133,7 +135,7 @@ public function test_generate_question(): void {
         $this->assertEquals($presetjson->primer, $questionobject->primer);
         $this->assertEquals($presetjson->instructions, $questionobject->instructions);
         $this->assertEquals($presetjson->example, $questionobject->example);
-        $expectedstoryprompt = 'Create a question from the following contents. '
+        $expectedstoryprompt = '\n\n## QUESTION GENERATION MODE - COURSE CONTENTS\nCreate a question from the following contents. '
             . 'Only use this content and do not use any training data: "' . $dataobject->story . '"';
         $this->assertEquals($expectedstoryprompt, $questionobject->storyprompt);
         $this->assertEmpty($questionobject->questiontextsinqbankprompt);
@@ -148,7 +150,7 @@ public function test_generate_question(): void {
         $this->assertEquals($presetjson->primer, $questionobject->primer);
         $this->assertEquals($presetjson->instructions, $questionobject->instructions);
         $this->assertEquals($presetjson->example, $questionobject->example);
-        $expectedstoryprompt = 'Create a question from the following contents. '
+        $expectedstoryprompt = '\n\n## QUESTION GENERATION MODE - COURSE CONTENTS\nCreate a question from the following contents. '
             . 'Only use this content and do not use any training data: "' . $dataobject->story . '"';
         $this->assertEquals($expectedstoryprompt, $questionobject->storyprompt);
         $this->assertEmpty($questionobject->questiontextsinqbankprompt);