From da2884c2253505f2f3a70a6bef60d4b85be8e3b8 Mon Sep 17 00:00:00 2001 From: Katharyn Lynn Oggenfuss Date: Tue, 12 Jan 2021 22:18:20 -0500 Subject: [PATCH 1/2] first commit --- .DS_Store | Bin 0 -> 8196 bytes basicMath/MathUtilities.js | 8 ++-- basicMath/MathUtilities.test.js | 4 +- strangerStrings/StrangerStrings.js | 55 ++++++++++++++++++++---- strangerStrings/StrangerStrings.test.js | 4 +- 5 files changed, 54 insertions(+), 17 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..a05934a261d878eeed3be0798793e0612737fb8a GIT binary patch literal 8196 zcmeHMPj3=I6n|4t7u0}hllEe=7jKk6t4%yKLBvB3Mw2yqP}A!W+rqOmZBG9-&4}QC9HF>u;*Hc$$1+)TM0j+>mKr8UCD1c`+nX%y9m#x}s1+)VH zr2_PPFfkF<6iy_HM+Z7_1whPVwJ^*VDT8P#tSOvG#1=Frsfd!w)D?qCI@X)2Urpge zqND>;mk*|9X6lB*#Oye}DY^rzNz`5|pcR-`fbQ;DC_@`Oh!XdA)_fUn>+(j!@wtO_ z#>v+ohqsQ8?j+mYGuwNe*t>zu2~r^k4%iUl%uTqDxd=LYK5wd7=!;Awj4G95wvx$SxOmAh@<#q@{<+oRLo2eQL0Gr@PpS0KjyjIYKjPe<=56P( z*Bb5@*Y5Hlvb~_y7i7&F!7>IA^TisP66^bYH(2y&b>%B=!PKJ<6aU%Txb3eW!`&K>jGbS3FK@tD7IU zWt>v9?()-!o!v7LJ1}XXDdWAe`hm}bHn!5vu0aoD+Jr;&ZD_$J_`pTE3@ ze?wM0+E->qSiob~XLvd2<9s%_&_yhxcat-*4>ODct|vm44S`r|A1qP!L^({d#i#O1 z>{Gdfos3)I0nWXI5s%^S`)Lf9vQFdq`>d4M;sS+H6irNoHH8z2R7LgT6h_qNKMA5u zD{zh!$jG&B(Eb13;`jgOXh(XfS^=%VpDMtz4XaT{mN?Z@*mTO9m<}+JQNM{qK|z=J hA%NxSABLDWu`6+E3MUe=22H;R5He_|75J+P`~og>4MqR} literal 0 HcmV?d00001 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..520fe82 100644 --- a/strangerStrings/StrangerStrings.js +++ b/strangerStrings/StrangerStrings.js @@ -1,36 +1,73 @@ 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; + +// getPrefix(input){ +// return input = input.substring(0, 3); +// } + +// getSuffix(input){ +// return input = input.substring(3, 7); +// } + +// getMiddleCharacter(input){ +// return input.substring(5, 4); +// } + +// getFirstWord(input){ +// return input = input.substring(0, 6); +// } + +// getSecondWord(spaceDelimnatedInput){ +// return "Clan"; +// } \ No newline at end of file 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); }); From f9abc0b92cf83b5f9efbff65b1f410712c10f1f3 Mon Sep 17 00:00:00 2001 From: Katharyn Lynn Oggenfuss Date: Tue, 12 Jan 2021 22:20:00 -0500 Subject: [PATCH 2/2] removed comments --- strangerStrings/StrangerStrings.js | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/strangerStrings/StrangerStrings.js b/strangerStrings/StrangerStrings.js index 520fe82..7e5f213 100644 --- a/strangerStrings/StrangerStrings.js +++ b/strangerStrings/StrangerStrings.js @@ -52,22 +52,3 @@ class StrangerStrings { module.exports = StrangerStrings; -// getPrefix(input){ -// return input = input.substring(0, 3); -// } - -// getSuffix(input){ -// return input = input.substring(3, 7); -// } - -// getMiddleCharacter(input){ -// return input.substring(5, 4); -// } - -// getFirstWord(input){ -// return input = input.substring(0, 6); -// } - -// getSecondWord(spaceDelimnatedInput){ -// return "Clan"; -// } \ No newline at end of file