From f843419ebed2d0ee6ded60b26c57ea51e1243cd9 Mon Sep 17 00:00:00 2001 From: lanayh3 <74631402+lanayh3@users.noreply.github.com> Date: Thu, 14 Jan 2021 19:50:19 -0500 Subject: [PATCH] input functions --- basicMath/MathUtilities.js | 8 +++--- basicMath/MathUtilities.test.js | 4 +-- strangerStrings/StrangerStrings.js | 33 ++++++++++++++++++------- strangerStrings/StrangerStrings.test.js | 4 +-- 4 files changed, 32 insertions(+), 17 deletions(-) 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..6227130 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..9cf1012 100644 --- a/strangerStrings/StrangerStrings.js +++ b/strangerStrings/StrangerStrings.js @@ -1,35 +1,50 @@ class StrangerStrings { getHelloWorld(){ - return null; + return "Hello World"; } concatenation(firstSegment, secondSegment){ - return null; + return firstSegment.concat(secondSegment); } getPrefix(input){ - return null; + return input.substring(0, 3); } getSuffix(input){ - return null; + return input.slice(input.length - 3); } getMiddleCharacter(input){ - return null; + var position; + var length; + + if(input.length % 2 == 1) { + position = input.length / 2; + length = 1; + } else { + position = input.length / 2 - 1; + length = 2; + } + return input.substring(position, position + length); } getFirstWord(input){ - return null; + var firstWord = input.split(" "); + return firstWord[0]; } - getSecondWord(spaceDelimnatedInput){ - return null; + getSecondWord(input){ + var secondWord = input.split(" "); + return secondWord[1]; } reverse(input){ - return null; + let splitString = input.split(""); + let reverseArray = splitString.reverse(); + let joinArray = reverseArray.join(""); + return joinArray; } } diff --git a/strangerStrings/StrangerStrings.test.js b/strangerStrings/StrangerStrings.test.js index 59da8fa..d8e5478 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); });