Revised all 2-practice-tdd exercises

Author: lintsang

Sprint-3/2-practice-tdd/count.js

@@ -1,7 +1,7 @@
 function countChar(stringOfCharacters, findCharacter) {
   let countTime = 0;
   for (let i = 0; i < stringOfCharacters.length; i++) {
-    if (stringOfCharacters.slice(i, i + 1) == findCharacter) {//take each character out from string to compare with the given character. If true, then add one to countTime.
+    if (stringOfCharacters[i] == findCharacter) {//take each character out from string to compare with the given character. If true, then add one to countTime.
       countTime = countTime + 1;
     }
   }

Sprint-3/2-practice-tdd/count.test.js

@@ -15,27 +15,21 @@ test("should count multiple occurrences of a character", () => {
   const char = "a";
   const count = countChar(str, char);
   expect(count).toEqual(5);
-});
 
-test("should count multiple occurrences of a character", () => {
-  const str = "aaabcde";
-  const char = "c";
-  const count = countChar(str, char);
-  expect(count).toEqual(1);
-});
+  const str2 = "4444444444444444444";
+  const char2 = "4";
+  const count2 = countChar(str2, char2);
+  expect(count2).toEqual(19);
 
-test("should count multiple occurrences of a character", () => {
-  const str = "a2b3c4";
-  const char = "3";
-  const count = countChar(str, char);
-  expect(count).toEqual(1);
-});
+  const str3 = "aaabcde";
+  const char3 = "c";
+  const count3 = countChar(str3, char3);
+  expect(count3).toEqual(1);
 
-test("should count multiple occurrences of a character", () => {
-  const str = "4444444444444444444";
-  const char = "4";
-  const count = countChar(str, char);
-  expect(count).toEqual(19);
+  const str4 = "a2b3c43";
+  const char4 = "3";
+  const count4 = countChar(str4, char4);
+  expect(count4).toEqual(2);
 });
 
 // Scenario: No Occurrences

Sprint-3/2-practice-tdd/get-ordinal-number.js

@@ -1,38 +1,17 @@
 function getOrdinalNumber(num) {
-  let onesDigit;
-
+  let onesDigit = Number(String(num).slice(-1)); //extract the figure at the tens digit, and convert it into a number.
+  let tensDigit;
   if (String(num).length > 1) {
-    //check if the number has more than 1 digit
-    onesDigit = Number(String(num).slice(-1)); //extract the figure at the tens digit, and convert it into a number.
-    const tensDigit = Number(String(num).slice(-2, -1)); //extract the figure at the tens digit, and convert it into a number.
-
-    if (onesDigit == 1) {
-      if (tensDigit == 1) {
-        return num + "th";
-      } else {
-        return num + "st";
-      }
-    } else if (onesDigit == 2) {
-      if (tensDigit == 1) {
-        return num + "th";
-      }
-      return num + "nd";
-    } else if (onesDigit == 3) {
-      if (tensDigit == 1) {
-        return num + "th";
-      }
-      return num + "rd";
-    } else {
-      ("th");
-    }
-  } else if (String(num).length == 1) {
-    onesDigit = Number(String(num)[0]); //extract the figure at the tens digit, and convert it into a number.
-    if (onesDigit == 1) {
+    tensDigit = Number(String(num).slice(-2, -1)); //extract the figure at the tens digit, and convert it into a number.
+  }
+  if (tensDigit === 1) {
+    return num + "th";
+  } else {
+    if (onesDigit === 1) {
       return num + "st";
-      console.log("Yeah youre in");
-    } else if (onesDigit == 2) {
+    } else if (onesDigit === 2) {
       return num + "nd";
-    } else if (onesDigit == 3) {
+    } else if (onesDigit === 3) {
       return num + "rd";
     } else {
       return num + "th";

Sprint-3/2-practice-tdd/get-ordinal-number.test.js

@@ -13,25 +13,25 @@ const getOrdinalNumber = require("./get-ordinal-number");
 // Case 1: Numbers ending with 1 (but not 11)
 // When the number ends with 1, except those ending with 11,
 // Then the function should return a string by appending "st" to the number.
-test("should append 'st' for numbers ending with 1, except those ending with 11", () => {
+test("should append 'st' for numbers ending with 1, except those having figure 1 in tens digit", () => {
   expect(getOrdinalNumber(1)).toEqual("1st");
   expect(getOrdinalNumber(21)).toEqual("21st");
   expect(getOrdinalNumber(131)).toEqual("131st");
 });
 
-test("should append 'nd' for numbers ending with 2, except those ending with 12", () => {
+test("should append 'nd' for numbers ending with 2, except those having figure 1 in tens digit", () => {
   expect(getOrdinalNumber(2)).toEqual("2nd");
   expect(getOrdinalNumber(22)).toEqual("22nd");
   expect(getOrdinalNumber(132)).toEqual("132nd");
 });
 
-test("should append 'rd' for numbers ending with 3, except those ending with 13", () => {
+test("should append 'rd' for numbers ending with 3, except those having figure 1 in tens digit", () => {
   expect(getOrdinalNumber(3)).toEqual("3rd");
   expect(getOrdinalNumber(23)).toEqual("23rd");
   expect(getOrdinalNumber(133)).toEqual("133rd");
 });
 
-test("should append 'th' for other numbers without ending with 1,2 or 3, except those ending with 1 in tens digit", () => {
+test("should append 'th' for other numbers ending with 1,2 or 3, except those having figure 1 in tens digit", () => {
   expect(getOrdinalNumber(11)).toEqual("11th");
   expect(getOrdinalNumber(12)).toEqual("12th");
   expect(getOrdinalNumber(13)).toEqual("13th");
@@ -40,3 +40,16 @@ test("should append 'th' for other numbers without ending with 1,2 or 3, except
   expect(getOrdinalNumber(313)).toEqual("313th");
   expect(getOrdinalNumber(1113)).toEqual("1113th");
 });
+
+test("should append 'th' for other numbers ending other than 1,2 or 3", () => {
+  expect(getOrdinalNumber(5)).toEqual("5th");
+  expect(getOrdinalNumber(8)).toEqual("8th");
+  expect(getOrdinalNumber(9)).toEqual("9th"); 
+  expect(getOrdinalNumber(10)).toEqual("10th"); 
+  expect(getOrdinalNumber(57)).toEqual("57th");
+  expect(getOrdinalNumber(79)).toEqual("79th");
+  expect(getOrdinalNumber(94)).toEqual("94th");
+  expect(getOrdinalNumber(266)).toEqual("266th");
+  expect(getOrdinalNumber(465)).toEqual("465th");
+  expect(getOrdinalNumber(1070)).toEqual("1070th");
+});

Sprint-3/2-practice-tdd/repeat-str.js

@@ -2,15 +2,13 @@ function repeatStr(str, count) {
   // 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.
   let strOutput = "";
-  if (count > 0){
+  if (count >= 0){
     for (let i=0 ; i<count ; i++){
       strOutput = strOutput + str; 
     }
     return strOutput;
-  } else if (count == 0){
-    return "";
   }else{
-    return "error";
+    throw new Error("Negative count is not valid");
   }
 }
 

Sprint-3/2-practice-tdd/repeat-str.test.js

@@ -42,9 +42,8 @@ test("should return empty string as the count is zero", () => {
 // 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 return the string with no reptition", () => {
-  const str = "evening";
-  const count = -1;
-  const repeatedStr = repeatStr(str, count);
-  expect(repeatedStr).toEqual("error");
-});
+test("should throw an error as a negative count is not valid", () => {
+  expect(() => {
+    repeatStr("evening", -1);
+  }).toThrow();
+});