diff --git a/05_sumAll/sumAll.js b/05_sumAll/sumAll.js index 00880c7..5487635 100644 --- a/05_sumAll/sumAll.js +++ b/05_sumAll/sumAll.js @@ -1,5 +1,23 @@ -const sumAll = function() { - +const sumAll = function(a,b) { + let sum = 0; + if (a > b) { + min = b; + max = a; + } + else { + min = a; + max = b; + } + if (a < 0 || b < 0) { + return "ERROR"; + } + if (!Number.isInteger(a) || !Number.isInteger(b)) { + return "ERROR"; + } + for (let i = min; i<=max; i++) { + sum += i; + } + return sum; }; // Do not edit below this line diff --git a/05_sumAll/sumAll.spec.js b/05_sumAll/sumAll.spec.js index be810a6..ddfc2d5 100644 --- a/05_sumAll/sumAll.spec.js +++ b/05_sumAll/sumAll.spec.js @@ -4,22 +4,22 @@ describe('sumAll', () => { test('sums numbers within the range', () => { expect(sumAll(2, 4)).toEqual(9); }); - test.skip('works with large numbers', () => { + test('works with large numbers', () => { expect(sumAll(1, 4000)).toEqual(8002000); }); - test.skip('works with larger number first', () => { + test('works with larger number first', () => { expect(sumAll(123, 1)).toEqual(7626); }); - test.skip('returns ERROR with negative numbers', () => { + test('returns ERROR with negative numbers', () => { expect(sumAll(-10, 4)).toEqual('ERROR'); }); - test.skip('returns ERROR with non-integer parameters', () => { + test('returns ERROR with non-integer parameters', () => { expect(sumAll(2.5, 4)).toEqual('ERROR'); }); - test.skip('returns ERROR with non-number parameters', () => { + test('returns ERROR with non-number parameters', () => { expect(sumAll(10, "90")).toEqual('ERROR'); }); - test.skip('returns ERROR with non-number parameters', () => { + test('returns ERROR with non-number parameters', () => { expect(sumAll(10, [90, 1])).toEqual('ERROR'); }); });