diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..a05934a Binary files /dev/null and b/.DS_Store differ diff --git a/basicMath/MathUtilities.js b/basicMath/MathUtilities.js index 705dd88..5cdc657 100644 --- a/basicMath/MathUtilities.js +++ b/basicMath/MathUtilities.js @@ -2,19 +2,19 @@ class MathUtilities { add(baseValue, valueToAdd){ - return -1; + return baseValue + valueToAdd; } subtract(baseValue, valueToAdd){ - return -1; + return baseValue - valueToAdd; } divide(baseValue, valueToAdd){ - return -1; + return baseValue / valueToAdd; } multiply(baseValue, valueToAdd){ - return -1; + return baseValue * valueToAdd; } } diff --git a/basicMath/MathUtilities.test.js b/basicMath/MathUtilities.test.js index 2d37cf1..d2d33a1 100644 --- a/basicMath/MathUtilities.test.js +++ b/basicMath/MathUtilities.test.js @@ -1,4 +1,4 @@ -const { TestScheduler } = require('jest'); +//const { TestScheduler } = require('jest'); const MathUtilities = require('./MathUtilities'); test("Test 1 Integer Addition", () => { @@ -74,7 +74,7 @@ test("Test 2 Integer Division", () => { let addedValue = 1; // When - let expected = 127; + let expected = 2; let actual = math.divide(baseValue, addedValue); //Then expect(actual).toEqual(expected); diff --git a/strangerStrings/StrangerStrings.js b/strangerStrings/StrangerStrings.js index 7fb3629..7e5f213 100644 --- a/strangerStrings/StrangerStrings.js +++ b/strangerStrings/StrangerStrings.js @@ -1,36 +1,54 @@ class StrangerStrings { getHelloWorld(){ - return null; + return "Hello World"; } concatenation(firstSegment, secondSegment){ - return null; + return firstSegment + secondSegment; } getPrefix(input){ - return null; + let string = ""; + string += input[0]; + string += input[1]; + string += input[2]; + return string; + } getSuffix(input){ - return null; + let string = ""; + string += input[input.length - 3]; + string += input[input.length - 2]; + string += input[input.length - 1]; + return string; } getMiddleCharacter(input){ - return null; + let middle = Math.floor(input.length/2); + if (input.length % 2 === 0) { + return input[middle-1] + input[middle]; + }else { + return input[middle]; + } } getFirstWord(input){ - return null; + return input.split(" ")[0]; } getSecondWord(spaceDelimnatedInput){ - return null; + return spaceDelimnatedInput.split(" ")[1]; } reverse(input){ - return null; + let splitString = input.split(""); + let reverseArray = splitString.reverse(); + let joinArray = reverseArray.join(""); + return joinArray; } } -module.exports = StrangerStrings; \ No newline at end of file +module.exports = StrangerStrings; + diff --git a/strangerStrings/StrangerStrings.test.js b/strangerStrings/StrangerStrings.test.js index 59da8fa..c452126 100644 --- a/strangerStrings/StrangerStrings.test.js +++ b/strangerStrings/StrangerStrings.test.js @@ -1,4 +1,4 @@ -const { TestScheduler } = require('jest'); +//const { TestScheduler } = require('jest'); const StrangerStrings = require('./StrangerStrings'); @@ -67,7 +67,7 @@ test("return the middle character of `inputValue`", () => { // When - let actual = strangerStrings.getMiddleCharacter(input); + let actual = strangerStrings.getMiddleCharacter(inputValue); //Then expect(actual).toEqual(expected); });