diff --git a/practice-tdd/count.js b/practice-tdd/count.js index 5518c5712..78eb25b7f 100644 --- a/practice-tdd/count.js +++ b/practice-tdd/count.js @@ -1,3 +1,8 @@ export function countChar(stringOfCharacters, findCharacter) { - return 5 + let count = 0; + for (let i = 0; i < stringOfCharacters.length; i++) + if (stringOfCharacters[i] === findCharacter) { + count++; + } + return count; } diff --git a/practice-tdd/count.test.js b/practice-tdd/count.test.js index cb3aaae59..3b251ca89 100644 --- a/practice-tdd/count.test.js +++ b/practice-tdd/count.test.js @@ -17,6 +17,20 @@ test("should count multiple occurrences of a character", () => { expect(count).toEqual(5); }); +test("should return 0 when character is not found", () => { + const str = "hello"; + const char = "z"; + const count = countChar(str, char); + expect(count).toEqual(0); +}); + +test("should count 2 occurrences of n", () => { + const str = "banana"; + const char = "n"; + const count = countChar(str, char); + expect(count).toEqual(2); +}); + // Scenario: No Occurrences // Given the input string `str`, // And a character `char` that does not exist within `str`. diff --git a/practice-tdd/get-ordinal-number.js b/practice-tdd/get-ordinal-number.js index 5c6291f5e..457291454 100644 --- a/practice-tdd/get-ordinal-number.js +++ b/practice-tdd/get-ordinal-number.js @@ -1,3 +1,21 @@ export function getOrdinalNumber(num) { - return "1st"; + + if (num % 100 === 11 || num % 100 === 12 || num % 100 === 13) { + return num + "th"; + }; + + if (num % 10 === 1) { + return num + "st"; + }; + + if (num % 10 === 2) { + return num + "nd"; + }; + + if (num % 10 === 3) { + return num + "rd"; + }; + + return num + "th"; } + diff --git a/practice-tdd/get-ordinal-number.test.js b/practice-tdd/get-ordinal-number.test.js index e23174a18..3b4c994c5 100644 --- a/practice-tdd/get-ordinal-number.test.js +++ b/practice-tdd/get-ordinal-number.test.js @@ -18,3 +18,64 @@ test("should append 'st' for numbers ending with 1, except those ending with 11" expect(getOrdinalNumber(21)).toEqual("21st"); expect(getOrdinalNumber(131)).toEqual("131st"); }); + +test("should append 'th' for numbers ending with 11", () => { + expect(getOrdinalNumber(11)).toEqual("11th"); + expect(getOrdinalNumber(111)).toEqual("111th"); + expect(getOrdinalNumber(2111)).toEqual("2111th"); +}); + +test("should append 'nd' for numbers ending with 2 except those ending in 12", () => { + expect(getOrdinalNumber(2)).toEqual("2nd"); + expect(getOrdinalNumber(22)).toEqual("22nd"); + expect(getOrdinalNumber(4022)).toEqual("4022nd"); +}); + +test("should append 'th' for numbers ending in 12", () => { + expect(getOrdinalNumber(12)).toEqual("12th"); + expect(getOrdinalNumber(112)).toEqual("112th"); + expect(getOrdinalNumber(1012)).toEqual("1012th"); +}); + +test("should append 'rd' for numbers ending with 3 except those ending in 13", () => { + expect(getOrdinalNumber(3)).toEqual("3rd"); + expect(getOrdinalNumber(33)).toEqual("33rd"); + expect(getOrdinalNumber(3033)).toEqual("3033rd"); +}); + +test("should append 'th' for numbers ending in 13", () => { + expect(getOrdinalNumber(113)).toEqual("113th"); + expect(getOrdinalNumber(13)).toEqual("13th"); + expect(getOrdinalNumber(1013)).toEqual("1013th"); +}); + +test("should append 'th' for numbers ending in 4", () => { + expect(getOrdinalNumber(4)).toEqual("4th"); + expect(getOrdinalNumber(14)).toEqual("14th"); + expect(getOrdinalNumber(24)).toEqual("24th"); +}); + +test("should append 'th' for numbers ending in 5", () => { + expect(getOrdinalNumber(5)).toEqual("5th"); + expect(getOrdinalNumber(15)).toEqual("15th"); + expect(getOrdinalNumber(1025)).toEqual("1025th"); +}); + +test("should append 'th' for numbers ending in 6, 7, 8, 9", () => { + expect(getOrdinalNumber(6)).toEqual("6th"); + expect(getOrdinalNumber(7)).toEqual("7th"); + expect(getOrdinalNumber(8)).toEqual("8th"); + expect(getOrdinalNumber(9)).toEqual("9th"); +}); + +test("should append 'th' for numbers ending in 10", () => { + expect(getOrdinalNumber(10)).toEqual("10th"); + expect(getOrdinalNumber(110)).toEqual("110th"); + expect(getOrdinalNumber(1010)).toEqual("1010th"); +}); + +test("should append 'th' for numbers ending in 20", () => { + expect(getOrdinalNumber(20)).toEqual("20th"); + expect(getOrdinalNumber(120)).toEqual("120th"); + expect(getOrdinalNumber(1120)).toEqual("1120th"); +}); \ No newline at end of file diff --git a/practice-tdd/repeat-str.js b/practice-tdd/repeat-str.js index af273f3b0..88a005f61 100644 --- a/practice-tdd/repeat-str.js +++ b/practice-tdd/repeat-str.js @@ -1,5 +1,12 @@ -export function repeatStr() { - // Your implementation of this function must *not* call String.prototype.repeat (https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/repeat). - // The goal is to re-implement that function, not to use it. - return "hellohellohello"; +export function repeatStr(str, count) { + let result = ""; + + for (let i = 0; i < count; i++) { + result = result + str; + } + + if (count < 0) { + throw new Error("Count cannot be negative"); + } + return result; } diff --git a/practice-tdd/repeat-str.test.js b/practice-tdd/repeat-str.test.js index 8a7036102..22c3092d0 100644 --- a/practice-tdd/repeat-str.test.js +++ b/practice-tdd/repeat-str.test.js @@ -1,13 +1,4 @@ -// Implement a function repeatStr import { repeatStr } from "./repeat-str.js"; -// Given a target string `str` and a positive integer `count`, -// When the repeatStr function is called with these inputs, -// Then it should: - -// Case: handle multiple repetitions: -// Given a target string `str` and a positive integer `count` greater than 1, -// When the repeatStr function is called with these inputs, -// Then it should return a string that contains the original `str` repeated `count` times. test("should repeat the string count times", () => { const str = "hello"; @@ -16,17 +7,56 @@ test("should repeat the string count times", () => { expect(repeatedStr).toEqual("hellohellohello"); }); -// Case: handle count of 1: -// Given a target string `str` and a `count` equal to 1, -// When the repeatStr function is called with these inputs, -// Then it should return the original `str` without repetition. +test("should return the original string when count is 1", () => { + const str = "hello"; + const count = 1; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual("hello"); +}); + +test("should return an empty string", () => { + const str = "hello"; + const count = 0; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual(""); +}); + +test("should throw an error when count is negative", () => { + const str = "hello"; + const count = -2; + expect(() => repeatStr(str, count)).toThrow(); +}); + +test("should return Backstreet Boys lyrics", () => { + const str = "bye"; + const count = 5; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual("byebyebyebyebye"); +}); + +test("should return an empty string when repeating an empty string 3 times", () => { + const str = ""; + const count = 3; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual(""); +}); -// Case: Handle count of 0: -// Given a target string `str` and a `count` equal to 0, -// When the repeatStr function is called with these inputs, -// Then it should return an empty string. +test("should return an empty string when repeating an empty string once", () => { + const str = ""; + const count = 1; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual(""); +}); + +test("should return an empty string when count is zero", () => { + const str = ""; + const count = 0; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual(""); +}); -// Case: Handle negative count: -// Given a target string `str` and a negative integer `count`, -// When the repeatStr function is called with these inputs, -// Then it should throw an error, as negative counts are not valid. +test("should throw an error when repeating an empty string a negative number of times", () => { + const str = ""; + const count = -2; + expect(() => repeatStr(str, count)).toThrow("Count cannot be negative"); +});