🐛 Fix unittest

Author: zihan21206

runestone/hparsons/hparsons.py

@@ -48,8 +48,7 @@ def setup(app):
 
 TEMPLATE_END = """
         </div>
-        <div>%(instructions)s</div>
-        <div class="hparsons" %(textentry)s %(nostrictmatch)s %(hidetests)s>
+        <div class="hparsons" %(textentry)s %(nostrictmatch)s %(hidetests)s %(type)s>
             <pre>%(settings)s</pre>
         </div>
         </div>
@@ -178,9 +177,11 @@ def run(self):
 
         if '--problem--' in sorted_delimiters:
             index = sorted_delimiters.index('--problem--')
-            self.options['instructions'] = '\n'.join(content[(sorted_index[index] + 1): (sorted_index[index + 1] if index + 1 < len(sorted_index) else len(content))])
+            self.options['instructions'] = content[(sorted_index[index] + 1): (sorted_index[index + 1] if index + 1 < len(sorted_index) else len(content))]
+            self.options['problem'] = '\n'.join(content[(sorted_index[index] + 1): (sorted_index[index + 1] if index + 1 < len(sorted_index) else len(content))])
         else:
-            self.options['instructions'] = 'empty problem'
+            self.options['instructions'] = ['empty problem']
+            self.options['problem'] = 'empty problem'
 
         if '--blocks--' in sorted_delimiters:
             index = sorted_delimiters.index('--blocks--')
@@ -212,6 +213,7 @@ def run(self):
                 index += 2
 
         self.options['settings'] = json.dumps(parsons_settings)
+        self.options['type'] = type(self.options['instructions'])
 
         # same
         maybeAddToAssignment(self)
@@ -229,9 +231,9 @@ def run(self):
         # TODO: fix the nested parse
         # same as mchoice, different from parsons. i think it is for generating instructions.
         # parsons:
-        # self.state.nested_parse(
-        #     self.options['instructions'], self.content_offset, hparsons_node
-        # )
+        self.state.nested_parse(
+            self.options['instructions'], self.content_offset, hparsons_node
+        )
 
 
         # same

runestone/hparsons/js/hparsons.js

@@ -87,6 +87,10 @@ export default class HParsons extends RunestoneBase {
             regexElement.setNegativeInitialTestString(settings.negativetest);
         }
         if (settings.testcases) {
+            for (let index in settings.testcases) {
+                settings.testcases[index].expect = settings.testcases[index].expect.length < 4 ? [] : settings.testcases[index].expect.slice(2, -2).split(', ');
+                console.log(settings.testcases[index])
+            }
             regexElement.setTestCases(settings.testcases);
         }
 
@@ -126,48 +130,35 @@ export default class HParsons extends RunestoneBase {
     }
 
     renderFeedback() {
-        console.log('hparsons, renderfeedback')
+        // console.log('hparsons, renderfeedback')
         // this.feedbackDiv.innerHTML = "Your answer has been saved.";
         // $(this.feedbackDiv).removeClass("alert-danger");
         // $(this.feedbackDiv).addClass("alert alert-success");
     }
     setLocalStorage(data) {
-        console.log('hparsons, setlocalstorage')
+        // console.log('hparsons, setlocalstorage')
         // if (!this.graderactive) {
         //     let key = this.localStorageKey();
         //     localStorage.setItem(key, JSON.stringify(data));
         // }
     }
     checkLocalStorage() {
         console.log('hparsons, checklocalstorage')
-        // Repopulates the short answer text
-        // which was stored into local storage.
-        // var answer = "";
-        // if (this.graderactive) {
-        //     return;
-        // }
-        // var len = localStorage.length;
-        // if (len > 0) {
-        //     var ex = localStorage.getItem(this.localStorageKey());
-        //     if (ex !== null) {
-        //         try {
-        //             var storedData = JSON.parse(ex);
-        //             answer = storedData.answer;
-        //         } catch (err) {
-        //             // error while parsing; likely due to bad value stored in storage
-        //             console.log(err.message);
-        //             localStorage.removeItem(this.localStorageKey());
-        //             return;
-        //         }
-        //         let solution = $("#" + this.divid + "_solution");
-        //         solution.text(answer);
-        //         this.renderMath(answer);
-        //         this.feedbackDiv.innerHTML =
-        //             "Your current saved answer is shown above.";
-        //         $(this.feedbackDiv).removeClass("alert-danger");
-        //         $(this.feedbackDiv).addClass("alert alert-success");
-        //     }
-        // }
+        var toStore;
+        if (data == undefined) {
+            toStore = {
+                source: this.sourceHash(),
+                answer: this.answerHash(),
+                timestamp: new Date(),
+            };
+            var adaptiveHash = this.adaptiveHash();
+            if (adaptiveHash.length > 0) {
+                toStore.adaptive = adaptiveHash;
+            }
+        } else {
+            toStore = data;
+        }
+        localStorage.setItem(this.storageId, JSON.stringify(toStore));
     }
     restoreAnswers(data) {
         console.log('hparsons, restoreanswers')

runestone/hparsons/js/regex-element.js

@@ -16078,7 +16078,6 @@ class UnitTestTable {
         row.innerHTML += this._getRevealedRow(this.testCases[index], this.latestResults[index]);
     };
     setTestCases = (testCases) => {
-        console.log('unittest 242');
         this.testCases = testCases;
         // TODO: make this an option. Set all revealed for study 0 and 1.
         this.hintRevealed = Array(testCases.length).fill(true);

runestone/hparsons/test/_sources/index.rst

@@ -14,6 +14,15 @@ Horizontal Parsons + Regex
     Capture words that start with a vowel letter(aeiou), but ends with a non-vowel letter. 
     There can be 0 or more letters in between. 
     Also, it is not allowed to have other characters besides letter in between.
+
+    .. code-block:: python
+
+        sum = 0
+        for i in range(10):
+            sum = sum + i
+    
+        print(sum)
+    
     e.g. your regular expression should match unicorn, element, but should not match: banana, apple. All letters are lowercase.
     --blocks--
     [a-z]
@@ -50,15 +59,26 @@ Horizontal Parsons + Regex
     ['az']
     abcdefghizsdz
     ['abcdefghizsdz']
-    abc9defghizsdz'
+    abc9defghizsdz
     []
 
 
 .. hparsons:: codeexample2
     :textentry:
     :hidetests:
 
+    --problem--
+    Capture words that start with a vowel letter(aeiou), but ends with a non-vowel letter. 
+    There can be 0 or more letters in between. 
+    Also, it is not allowed to have other characters besides letter in between.
+    e.g. your regular expression should match unicorn, element, but should not match: banana, apple. All letters are lowercase.
     content content content
+    --positive test string--
+    unicorn
+    element
+    --negative test string--
+    apple
+    banana
 
 
 Other Problems for reference