Added commutative simplification for + and *

app/imports/parser/parser.test.js

@@ -1,11 +1,26 @@
 import { parse } from './parser';
+import resolve, { toString } from './resolve';
 import { assert } from 'chai';
 
-describe('Parser', function(){
-  it('parses valid text without error', function(){
+describe('Parser', function () {
+  it('parses valid text without error', function () {
     assert.typeOf(parse('1'), 'object');
   });
-  it('parses various operations', function(){
+  it('parses various operations', function () {
     assert.typeOf(parse('1 + 2 * 3 / 4 * 1d8'), 'object');
   });
+  it('simplifies basic addition and multiplication', function () {
+    let add = parse('1 + 3 + 3 + 4');
+    ({ result: add } = resolve('compile', add));
+    assert.equal(toString(add), '11');
+
+    let mul = parse('2 * 3 * 4');
+    ({ result: mul } = resolve('compile', mul));
+    assert.equal(toString(mul), '24');
+  });
+  it('simplifies addition when possible, even if a roll is in the way', function () {
+    let { result } = resolve('compile', parse('1 + 3 + d12 + 3 + 4'));
+    console.log(result);
+    assert.equal(toString(result), 'd12 + 11');
+  });
 });