diff --git a/basicMath/MathUtilities.js b/basicMath/MathUtilities.js index 705dd88..e4ac5ca 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; + subtract(baseValue, valueToSubtract){ + return baseValue - valueToSubtract; } - divide(baseValue, valueToAdd){ - return -1; + divide(baseValue, valueToDivideBy){ + return baseValue / valueToDivideBy; } - multiply(baseValue, valueToAdd){ - return -1; + multiply(baseValue, valueToMultiplyBy){ + return baseValue * valueToMultiplyBy; } } diff --git a/basicMath/MathUtilities.test.js b/basicMath/MathUtilities.test.js index 2d37cf1..bf0c9b2 100644 --- a/basicMath/MathUtilities.test.js +++ b/basicMath/MathUtilities.test.js @@ -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..ac92dff 100644 --- a/strangerStrings/StrangerStrings.js +++ b/strangerStrings/StrangerStrings.js @@ -1,35 +1,54 @@ class StrangerStrings { getHelloWorld(){ - return null; + return "Hello World"; } concatenation(firstSegment, secondSegment){ - return null; + return firstSegment + secondSegment; } getPrefix(input){ - return null; + //return input[0] + input[1] + input[2]; + return input.substring(0, 3); } getSuffix(input){ - return null; + return input[input.length-3] + input[input.length-2] + input[input.length-1]; + //return input.substring(-3, -1); } - getMiddleCharacter(input){ - return null; + getMiddleCharacter(inputValue){ + let half = (inputValue.length / 2) - 0.5; + return inputValue[half]; } - getFirstWord(input){ - return null; + getFirstWord(inputValue){ + let output = ""; + for(let i = 0; i < inputValue.length; i++){ + if(inputValue[i] !== " "){ + output += inputValue[i]; + } else{ + break; + } + } + return output; } getSecondWord(spaceDelimnatedInput){ - return null; + let output = ""; + for(let i = spaceDelimnatedInput.length -1; i > 0; i--){ + if(spaceDelimnatedInput[i] !== " "){ + output += spaceDelimnatedInput[i]; + } else{ + break; + } + } + return output.split("").reverse().join(""); } - reverse(input){ - return null; + reverse(inputValue){ + return inputValue.split("").reverse().join(""); } } diff --git a/strangerStrings/StrangerStrings.test.js b/strangerStrings/StrangerStrings.test.js index 59da8fa..342bd46 100644 --- a/strangerStrings/StrangerStrings.test.js +++ b/strangerStrings/StrangerStrings.test.js @@ -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); }); @@ -89,13 +89,13 @@ test("return the first sequence of characters", () => { test("return the second sequence of characters", () => { // Given let strangerStrings = new StrangerStrings(); - let inputValue = 'Wutang Clan'; + let spaceDelimnatedInput = 'Wutang Clan'; let expected = "Clan"; // When - let actual = strangerStrings.getSecondWord(inputValue); + let actual = strangerStrings.getSecondWord(spaceDelimnatedInput); //Then expect(actual).toEqual(expected); });