Sheffield | 25-ITP-Sep | Xiayidan Abuduxukuer | Sprint 3 | Coursework implement and rewrite

Sprint-1/1-key-exercises/1-count.js

@@ -4,3 +4,4 @@ count = count + 1;
 
 // Line 1 is a variable declaration, creating the count variable with an initial value of 0
 // Describe what line 3 is doing, in particular focus on what = is doing
+//Line 3 taking the current value to count, then make the count to new value

Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js

@@ -8,11 +8,29 @@
 // Then, write the next test! :) Go through this process until all the cases are implemented
 
 function getAngleType(angle) {
-  if (angle === 90) {
+
+  if (angle ===90){
+
     return "Right angle";
+
+  } else if (angle <90){
+
+    return "Acute angle";
+
+  } else if (angle >90 && angle <180){
+
+    return "Obtuse angle";
+
+  } else if (angle ===180){
+
+    return "Straight angle";
+
+  } else if (angle >180 && angle <360){
+
+    return "Reflex angle";
   }
-   // Run the tests, work out what Case 2 is testing, and implement the required code here.
-   // Then keep going for the other cases, one at a time.
+  // Run the tests, work out what Case 2 is testing, and implement the required code here.
+  // Then keep going for the other cases, one at a time.
 }
 
 // The line below allows us to load the getAngleType function into tests in other files.
@@ -21,9 +39,11 @@ module.exports = getAngleType;
 
 // we're going to use this helper function to make our assertions easier to read
 // if the actual output matches the target output, the test will pass
+
 function assertEquals(actualOutput, targetOutput) {
   console.assert(
     actualOutput === targetOutput,
+
     `Expected ${actualOutput} to equal ${targetOutput}`
   );
 }
@@ -37,27 +57,42 @@ function assertEquals(actualOutput, targetOutput) {
 // Case 1: Identify Right Angles:
 // When the angle is exactly 90 degrees,
 // Then the function should return "Right angle"
+
 const right = getAngleType(90);
+
 assertEquals(right, "Right angle");
 
 // Case 2: Identify Acute Angles:
 // When the angle is less than 90 degrees,
 // Then the function should return "Acute angle"
+
 const acute = getAngleType(45);
+
 assertEquals(acute, "Acute angle");
 
 // Case 3: Identify Obtuse Angles:
 // When the angle is greater than 90 degrees and less than 180 degrees,
 // Then the function should return "Obtuse angle"
+
 const obtuse = getAngleType(120);
+
+assertEquals(obtuse, "Obtuse angle");
 // ====> write your test here, and then add a line to pass the test in the function above
 
 // Case 4: Identify Straight Angles:
 // When the angle is exactly 180 degrees,
 // Then the function should return "Straight angle"
 // ====> write your test here, and then add a line to pass the test in the function above
 
+const straight = getAngleType(180);
+
+assertEquals(straight, "Straight angle");
+
 // Case 5: Identify Reflex Angles:
 // When the angle is greater than 180 degrees and less than 360 degrees,
 // Then the function should return "Reflex angle"
-// ====> write your test here, and then add a line to pass the test in the function above
+// ====> write your test here, and then add a line to pass the test in the function above
+
+const reflex = getAngleType(270);
+
+assertEquals(reflex, "Reflex angle");

Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js

@@ -7,21 +7,32 @@
 // complete the rest of the tests and cases
 // write one test at a time, and make it pass, build your solution up methodically
 
-function isProperFraction(numerator, denominator) {
-  if (numerator < denominator) {
+function isProperFraction(numerator,denominator) {
+
+  if (numerator <denominator){
+
     return true;
+  } 
+
+  else {
+
+    return false;
   }
 }
 
 // The line below allows us to load the isProperFraction function into tests in other files.
 // This will be useful in the "rewrite tests with jest" step.
-module.exports = isProperFraction;
+module.exports =isProperFraction;
 
 // here's our helper again
-function assertEquals(actualOutput, targetOutput) {
+
+function assertEquals(actualOutput,targetOutput){
+
   console.assert(
-    actualOutput === targetOutput,
-    `Expected ${actualOutput} to equal ${targetOutput}`
+
+    actualOutput ===targetOutput,
+
+    `Expected ${actualOutput} to equal${targetOutput}`
   );
 }
 
@@ -31,29 +42,43 @@ function assertEquals(actualOutput, targetOutput) {
 // Input: numerator = 2, denominator = 3
 // target output: true
 // Explanation: The fraction 2/3 is a proper fraction, where the numerator is less than the denominator. The function should return true.
-const properFraction = isProperFraction(2, 3);
-assertEquals(properFraction, true);
+
+const properFraction =isProperFraction(2,3);
+
+assertEquals(properFraction,true);
+
 
 // Improper Fraction check:
 // Input: numerator = 5, denominator = 2
 // target output: false
 // Explanation: The fraction 5/2 is an improper fraction, where the numerator is greater than or equal to the denominator. The function should return false.
-const improperFraction = isProperFraction(5, 2);
-assertEquals(improperFraction, false);
+
+const improperFraction =isProperFraction(5,2);
+
+assertEquals(improperFraction,false);
+
 
 // Negative Fraction check:
 // Input: numerator = -4, denominator = 7
 // target output: true
 // Explanation: The fraction -4/7 is a proper fraction because the absolute value of the numerator (4) is less than the denominator (7). The function should return true.
-const negativeFraction = isProperFraction(-4, 7);
 // ====> complete with your assertion
 
+const negativeFraction =isProperFraction(-4,7);
+
+assertEquals(negativeFraction,true);
+
+
 // Equal Numerator and Denominator check:
 // Input: numerator = 3, denominator = 3
 // target output: false
 // Explanation: The fraction 3/3 is not a proper fraction because the numerator is equal to the denominator. The function should return false.
-const equalFraction = isProperFraction(3, 3);
 // ====> complete with your assertion
 
+const equalFraction =isProperFraction(3,3);
+
+assertEquals(equalFraction,false);
+
+
 // Stretch:
 // What other scenarios could you test for?

Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js

@@ -7,38 +7,46 @@
 // complete the rest of the tests and cases
 // write one test at a time, and make it pass, build your solution up methodically
 // just make one change at a time -- don't rush -- programmers are deep and careful thinkers
-function getCardValue(card) {
-  if (rank === "A") {
-    return 11;
-  }
+
+function getCardValue(card){
+  const rank = card.slice(0, -1);
+
+  if (rank === "A") return11;
+
+  if (["10", "J", "Q", "K"].includes(rank)) return 10;
+
+
+  if (["2","3","4","5","6","7","8","9"].includes(rank)) return Number(rank);
+
+  throw new Error("Invalid card rank");
 }
 
+module.exports = getCardValue;
+
 // The line below allows us to load the getCardValue function into tests in other files.
 // This will be useful in the "rewrite tests with jest" step.
-module.exports = getCardValue;
 
 // You need to write assertions for your function to check it works in different cases
 // we're going to use this helper function to make our assertions easier to read
 // if the actual output matches the target output, the test will pass
-function assertEquals(actualOutput, targetOutput) {
-  console.assert(
-    actualOutput === targetOutput,
-    `Expected ${actualOutput} to equal ${targetOutput}`
-  );
+
+function assertEquals(actual, expected){
+
+  console.assert(actual === expected, `Expected ${actual} to equal ${expected}`);
+
 }
+
 // Acceptance criteria:
 
 // Given a card string in the format "A♠" (representing a card in blackjack - the last character will always be an emoji for a suit, and all characters before will be a number 2-10, or one letter of J, Q, K, A),
 // When the function getCardValue is called with this card string as input,
 // Then it should return the numerical card value
-const aceofSpades = getCardValue("A♠");
-assertEquals(aceofSpades, 11);
 
 // Handle Number Cards (2-10):
 // Given a card with a rank between "2" and "9",
 // When the function is called with such a card,
 // Then it should return the numeric value corresponding to the rank (e.g., "5" should return 5).
-const fiveofHearts = getCardValue("5♥");
+
 // ====> write your test here, and then add a line to pass the test in the function above
 
 // Handle Face Cards (J, Q, K):
@@ -55,3 +63,4 @@ const fiveofHearts = getCardValue("5♥");
 // Given a card with an invalid rank (neither a number nor a recognized face card),
 // When the function is called with such a card,
 // Then it should throw an error indicating "Invalid card rank."
+

Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js

@@ -12,15 +12,31 @@ test("should identify right angle (90°)", () => {
 // Case 2: Identify Acute Angles:
 // When the angle is less than 90 degrees,
 // Then the function should return "Acute angle"
+test("should identify acute angles (<90°)",() =>{
 
+  expect(getAngleType(45)).toEqual("Acute angle");
+});
 // Case 3: Identify Obtuse Angles:
 // When the angle is greater than 90 degrees and less than 180 degrees,
 // Then the function should return "Obtuse angle"
+test("should identify obtuse angles (90°<angle<180°)",() =>{
+
+  expect(getAngleType(120)).toEqual("Obtuse angle");
+});
 
 // Case 4: Identify Straight Angles:
 // When the angle is exactly 180 degrees,
 // Then the function should return "Straight angle"
+test("should identify straight angles (180°)",() =>{
+
+  expect(getAngleType(180)).toEqual("Straight angle");
+});
 
 // Case 5: Identify Reflex Angles:
 // When the angle is greater than 180 degrees and less than 360 degrees,
 // Then the function should return "Reflex angle"
+
+test("should identify reflex angles (180°<angle<360°)",() =>{
+
+  expect(getAngleType(270)).toEqual("Reflex angle");
+});

Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js

@@ -2,12 +2,24 @@
 // We will use the same function, but write tests for it using Jest in this file.
 const isProperFraction = require("../implement/2-is-proper-fraction");
 
-test("should return true for a proper fraction", () => {
+test("should return true for a proper fraction",() => {
   expect(isProperFraction(2, 3)).toEqual(true);
 });
 
 // Case 2: Identify Improper Fractions:
+test("should return false for an improper fraction (numerator > denominator)",()=>{
+
+  expect(isProperFraction(5, 2)).toEqual(false);
+});
 
 // Case 3: Identify Negative Fractions:
+test("should return true for a negative proper fraction (|numerator| < denominator)",()=>{
+
+  expect(isProperFraction(-4, 7)).toEqual(true);
+});
 
 // Case 4: Identify Equal Numerator and Denominator:
+test("should return false when numerator equals denominator",()=>{
+
+  expect(isProperFraction(3, 3)).toEqual(false);
+});

Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js

@@ -2,12 +2,45 @@
 // We will use the same function, but write tests for it using Jest in this file.
 const getCardValue = require("../implement/3-get-card-value");
 
-test("should return 11 for Ace of Spades", () => {
+test("should return 11 for Ace of Spades",() =>{
   const aceofSpades = getCardValue("A♠");
   expect(aceofSpades).toEqual(11);
 });
 
 // Case 2: Handle Number Cards (2-10):
+test("should return the number value for number cards",() =>{
+
+  expect(getCardValue("5♥")).toEqual(5);
+
+  expect(getCardValue("10♦")).toEqual(10);
+
+});
+
 // Case 3: Handle Face Cards (J, Q, K):
+test("should return 10 for face cards J, Q, K",() =>{
+
+  expect(getCardValue("J♣")).toEqual(10);
+
+  expect(getCardValue("Q♠")).toEqual(10);
+
+  expect(getCardValue("K♦")).toEqual(10);
+
+});
+
 // Case 4: Handle Ace (A):
+test("should return 11 for any Ace",() =>{
+
+  expect(getCardValue("A♦")).toEqual(11);
+
+  expect(getCardValue("A♥")).toEqual(11);
+
+});
+
 // Case 5: Handle Invalid Cards:
+test("Invalid cards throw error",() =>{
+
+  expect(() => getCardValue("Z♠")).toThrow("Invalid card rank");
+
+  expect(() => getCardValue("1♣")).toThrow("Invalid card rank");
+
+});

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

@@ -1,5 +1,21 @@
-function countChar(stringOfCharacters, findCharacter) {
-  return 5
+function countChar(stringOfCharacters, findCharacter){
+
+  let count =0; 
+
+  for (let i = 0;i<stringOfCharacters.length;i++){
+
+    if (stringOfCharacters[i] ===findCharacter){
+
+      count =count +1;
+    }
+  }
+
+  return count; 
 }
 
 module.exports = countChar;
+
+
+
+
+