update tests

Author: christianp

tests/jme-runtime.js

@@ -9741,6 +9741,9 @@ var jme = Numbas.jme = /** @lends Numbas.jme */ {
             var jmeifier = new Numbas.jme.display.JMEifier({}, scope);
             return jmeifier.niceNumber(v.value, Numbas.jme.display.number_options(v));
         },
+        'integer': function(v, scope) {
+            return v.bigValue.toString();
+        },
         'rational': function(v) {
             var f = v.value.reduced();
             return f.toString();
@@ -17822,7 +17825,7 @@ builtin_function_set({name: 'jme', description: 'Working with JME expressions'},
 
     set.add_function('expression', [TString], TExpression, null, {
         evaluate: function(args, scope) {
-            var notation = Numbas.locale.default_number_notation;
+            var number_notation = Numbas.locale.default_number_notation;
             Numbas.locale.default_number_notation = ['plain'];
             /**
              * Replace all strings in the given expression with copies marked with `subjme`.
@@ -17848,13 +17851,17 @@ builtin_function_set({name: 'jme', description: 'Working with JME expressions'},
             try {
                 var str = scope.evaluate(arg);
             } finally {
-                Numbas.locale.default_number_notation = notation;
+                Numbas.locale.default_number_notation = number_notation;
             }
             if(!jme.isType(str, 'string')) {
                     throw(new Numbas.Error('jme.typecheck.no right type definition', {op:'expression'}));
             }
             str = jme.castToType(str, 'string');
-            return new TExpression(jme.compile(str.value));
+
+            var jme_notation_name = args.length > 1 ? jme.castToType(scope.evaluate(args[1]), 'string').value : 'standard';
+            var jme_notation = get_notation(jme_notation_name);
+
+            return new TExpression(jme_notation.compile(str.value));
         }
     });
     Numbas.jme.lazyOps.push('expression');
@@ -20939,7 +20946,7 @@ var typeToJME = Numbas.jme.display.typeToJME = {
         return 'nothing';
     },
     'integer': function(tree, tok, bits) {
-        return this.number(tok.value, number_options(tok));
+        return math.niceNumber(tok.bigValue, number_options(tok));
     },
     'rational': function(tree, tok, bits) {
         var value = tok.value.reduced();
@@ -22162,6 +22169,7 @@ class RealIntervalNotation extends Notation {
 }
 
 class PatternNotation extends Notation {
+    name = 'Pattern matching';
     Parser = jme.rules.PatternParser;
 }
 

tests/jme/jme-tests.mjs

@@ -2478,8 +2478,8 @@ Numbas.queueScript('jme_tests',['qunit','jme','jme-rules','jme-display','jme-cal
         assert.equal(simplifyExpression('-4+5i','all'),'-4 + 5i','-4+5i - unary minus brought out of complex number properly');
         assert.equal(simplifyExpression('(1-i)+(-2+2i)','collectComplex'),'1 - i - 2 + 2i','(1-i)+(-2+2i) - addition of complex numbers with negative imaginary parts');
         assert.equal(simplifyExpression('(1-i)-(-2+2i)','collectComplex'),'1 - i + 2 - 2i','(1-i)-(-2+2i) - addition of complex numbers with negative imaginary parts');
-        assert.equal(simplifyExpression('10000000000000000000000000',{flags:{noscientificnumbers:false}}),'1*10^(25)','scientific notation - 1*10^25');
-        assert.equal(simplifyExpression('47652000000000000000000000',{flags:{noscientificnumbers:false}}),'4.7652*10^(25)','scientific notation - 4.7652*10^25');
+        assert.equal(simplifyExpression('10000000000000000000000000.0',{flags:{noscientificnumbers:false}}),'1*10^(25)','scientific notation - 1*10^25');
+        assert.equal(simplifyExpression('47652000000000000000000000.0',{flags:{noscientificnumbers:false}}),'4.7652*10^(25)','scientific notation - 4.7652*10^25');
         assert.equal(simplifyExpression('x+(-10+2)','all,collectNumbers'),'x - 8','x+(-10+2) - negative number in the middle of an addition gets cancelled through properly');
         assert.equal(simplifyExpression('4-(x^2+x+1)',[]),'4 - (x^2 + x + 1)',"4-(x^2+x+1) - brackets round right-hand operand in subtraction kept when they\'re wrapping an addition.");
         assert.equal(simplifyExpression('(x^2+x)-4',[]),'x^2 + x - 4','(x^2+x)-4 - brackets round left-hand operand in subtraction can be dropped.');
@@ -2828,7 +2828,7 @@ Numbas.queueScript('jme_tests',['qunit','jme','jme-rules','jme-display','jme-cal
 
     QUnit.module('Promises');
     QUnit.test('makeVariablesPromise', async function(assert) {
-        assert.expect(4);
+        assert.expect(3);
         const done = assert.async();
 
         const scope = new jme.Scope([jme.builtinScope]);
@@ -2847,8 +2847,6 @@ Numbas.queueScript('jme_tests',['qunit','jme','jme-rules','jme-display','jme-cal
         const todo = {
             'q': { tree: jme.compile('wait(0.1)'), vars: []},
             'z': { tree: jme.compile('q+1'), vars: ['q']},
-            'fetched_file': { tree: jme.compile('fetch_text("/README.md")'), vars: []},
-            'file_length': { tree: jme.compile('len(fetched_file)'), vars: ['fetched_file']},
         };
 
         const res = jme.variables.makeVariablesPromise(todo, scope);
@@ -2857,7 +2855,6 @@ Numbas.queueScript('jme_tests',['qunit','jme','jme-rules','jme-display','jme-cal
         res.then((result) => {
             assert.equal(result.variables.q.type, 'number', 'q is a number');
             assert.equal(result.variables.z.value, '1.1', 'z = q + 1 = 1.1');
-            assert.equal(result.variables.fetched_file.type, 'string', 'fetched_file is a string');
             done();
         });
     });

tests/locales.js

@@ -2068,8 +2068,8 @@ Numbas.locale = {
     "question.score feedback.score total actual": "Score: {{score,niceNumber}}/{{marks,niceNumber}}",
     "question.score feedback.score actual.plain": "{{scoreString}}",
     "question.score feedback.score total actual.plain": "{{score,niceNumber}}/{{marks,niceNumber}}",
-    "question.score feedback.correct": "Your answer is correct",
-    "question.score feedback.partial": "Your answer is partially correct",
+    "question.score feedback.correct": "Your answer is correct.",
+    "question.score feedback.partial": "Your answer is partially correct.",
     "question.score feedback.wrong": "Your answer is incorrect",
     "question.objectives": "Objectives",
     "question.penalties": "Penalties",
@@ -2155,7 +2155,12 @@ Numbas.locale = {
     "worksheet.right": "Right",
     "modal.style.text size preview": "Most text will be this big.",
     "part.show feedback": "Show feedback",
-    "part.hide feedback": "Hide feedback"
+    "part.hide feedback": "Hide feedback",
+    "icon.correct": "✔",
+    "icon.partial": "✔",
+    "icon.wrong": "✘",
+    "icon.warning": "❗",
+    "icon.none": ""
 }
 }
 ,