merge

Author: zubedauk

week-1/2-mandatory/1-syntax-errors.js

@@ -1,5 +1,3 @@
-
-
 // There are syntax errors in this code - can you fix it to pass the tests?
 
 function addNumbers(a, b, c) {
@@ -13,26 +11,42 @@ return "Hello, my name is " + name + " and I am " + age + " years old";
 function getRemainder(a, b) {
 
 
+function getTotal(a, b) {
+    total = a ++ b;
+
+
     // Use string interpolation here
     let Reminder=a%b;
     return `The remainder is ${a%b}`;
 }
 
-/* ======= TESTS - DO NOT MODIFY ===== */
-// 
-// To run these tests type `node 1-syntax-errors.js` into your terminal
+/* ======= TESTS - DO NOT MODIFY =====
+There are some Tests in this file that will help you work out if your code is working.
 
-function test(test_name, expr) {
+To run these tests type `node 1-syntax-errors.js` into your terminal
+*/
+
+const util = require('util');
+
+function test(test_name, actual, expected) {
     let status;
     if (expr) {
         status = "PASSED";
     } else {
         status = "FAILED";
+    if (actual === expected) {
+        status = "PASSED";
+    } else {
+        status = `FAILED: expected: ${util.inspect(expected)} but your function returned: ${util.inspect(actual)}`;
     }
 
     console.log(`${test_name}: ${status}`);
 }
 
 test("fixed addNumbers function - case 1", addNumbers(3,4,6) === 13);
 test("fixed introduceMe function", introduceMe("Sonjide",27) === "Hello, my name is Sonjide and I am 27 years old");
-test("fixed getRemainder function", getRemainder(23,5) === "The remainder is 3");
+test("fixed getRemainder function", getRemainder(23,5) === "The remainder is 3");
+=======
+test("fixed addNumbers function - case 1", addNumbers(3, 4, 6), 13);
+test("fixed introduceMe function", introduceMe("Sonjide", 27), "Hello, my name is Sonjide and I am 27 years old");
+test("fixed getTotal function", getTotal(23, 5), "The total is 28");

week-1/2-mandatory/2-logic-error.js

@@ -13,7 +13,7 @@ function multiply(a, b, c) {
   return a * b * c;
 }
 
-/* ======= TESTS - DO NOT MODIFY ===== 
+/* ======= TESTS - DO NOT MODIFY =====
 There are some Tests in this file that will help you work out if your code is working.
 
 To run these tests type `node 2-logic-error` into your terminal
@@ -32,4 +32,20 @@ function test(test_name, expr) {
 
 test("fixed trimWord function", trimWord("  CodeYourFuture ") === "CodeYourFuture");
 test("fixed wordLength function", getWordLength("A wild sentence appeared!") === 25);
-test("fixed multiply function", multiply(2,3,6) === 36);
+test("fixed multiply function", multiply(2,3,6) === 36);
+const util = require('util');
+
+function test(test_name, actual, expected) {
+    let status;
+    if (actual === expected) {
+        status = "PASSED";
+    } else {
+        status = `FAILED: expected: ${util.inspect(expected)} but your function returned: ${util.inspect(actual)}`;
+    }
+
+    console.log(`${test_name}: ${status}`);
+}
+
+test("fixed trimWord function", trimWord("  CodeYourFuture "), "CodeYourFuture");
+test("fixed wordLength function", getWordLength("A wild sentence appeared!"), 25);
+test("fixed multiply function", multiply(2, 3, 6), 36);

week-1/2-mandatory/3-function-output.js

@@ -12,36 +12,42 @@ function concatenate(firstWord, secondWord, thirdWord) {
 
   console.log(firstWord.concat(" ").concat(secondWord).concat(" ").concat(thirdWord));
   return firstWord.concat(" ").concat(secondWord).concat(" ").concat(thirdWord);
+  // Write the body of this function to concatenate three words together.
+  // Look at the test case below to understand what this function is expected to return.
 }
 
-/* ======= TESTS - DO NOT MODIFY ===== 
+/* ======= TESTS - DO NOT MODIFY =====
 There are some Tests in this file that will help you work out if your code is working.
-
 To run these tests type `node 3-function-output` into your terminal
 */
 
-function test(test_name, expr) {
-  let status;
-  if (expr) {
-    status = "PASSED";
-  } else {
-    status = "FAILED";
-  }
+const util = require('util');
+
+function test(test_name, actual, expected) {
+    let status;
+    if (actual === expected) {
+        status = "PASSED";
+    } else {
+        status = `FAILED: expected: ${util.inspect(expected)} but your function returned: ${util.inspect(actual)}`;
+    }
 
-  console.log(`${test_name}: ${status}`);
+    console.log(`${test_name}: ${status}`);
 }
 
 test(
   "concatenate function - case 1 works",
-  concatenate("code", "your", "future") === "code your future"
+  concatenate('code', 'your', 'future'),
+  "code your future"
 );
 
 test(
   "concatenate function - case 2 works",
-  concatenate("I", "like", "pizza") === "I like pizza"
+  concatenate('I', 'like', 'pizza'),
+  "I like pizza"
 );
 
 test(
   "concatenate function - case 3 works",
-  concatenate("I", "am", 13) === "I am 13"
+  concatenate('I', 'am', 13),
+  "I am 13"
 );

week-1/2-mandatory/4-tax.js

@@ -16,7 +16,7 @@ function calculateSalesTax(priceOfProduct) {
   ===================
   The business has informed you that prices must have 2 decimal places
   They must also start with the currency symbol
-  Write a function that transforms numbers into the format £0.00
+  Write a function that adds tax to a number, and then transforms the total into the format £0.00
 
   Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
 */
@@ -26,37 +26,31 @@ var price=calculateSalesTax(a);
 
 return `£${price.toFixed(2)}`;
 }
+=======
+function addTaxAndFormatCurrency() {}
 
-/* ======= TESTS - DO NOT MODIFY ===== 
+/* ======= TESTS - DO NOT MODIFY =====
 There are some Tests in this file that will help you work out if your code is working.
-
 To run these tests type `node 4-tax.js` into your terminal
 */
 
-function test(test_name, expr) {
-  let status;
-  if (expr) {
-    status = "PASSED";
-  } else {
-    status = "FAILED";
-  }
+const util = require('util');
+
+function test(test_name, actual, expected) {
+    let status;
+    if (actual === expected) {
+        status = "PASSED";
+    } else {
+        status = `FAILED: expected: ${util.inspect(expected)} but your function returned: ${util.inspect(actual)}`;
+    }
 
-  console.log(`${test_name}: ${status}`);
+    console.log(`${test_name}: ${status}`);
 }
 
-test("calculateSalesTax function - case 1 works", calculateSalesTax(15) === 18);
-test(
-  "calculateSalesTax function - case 2 works",
-  calculateSalesTax(17.5) === 21
-);
-test(
-  "calculateSalesTax function - case 3 works",
-  calculateSalesTax(34) === 40.8
-);
-
-test("formatCurrency function - case 1 works", formatCurrency(15) === "£18.00");
-test(
-  "formatCurrency function - case 2 works",
-  formatCurrency(17.5) === "£21.00"
-);
-test("formatCurrency function - case 3 works", formatCurrency(34) === "£40.80");
+test("calculateSalesTax function - case 1 works", calculateSalesTax(15), 18)
+test("calculateSalesTax function - case 2 works", calculateSalesTax(17.5), 21)
+test("calculateSalesTax function - case 3 works", calculateSalesTax(34), 40.8)
+
+test("addTaxAndFormatCurrency function - case 1 works", addTaxAndFormatCurrency(15), "£18.00")
+test("addTaxAndFormatCurrency function - case 2 works", addTaxAndFormatCurrency(17.5), "£21.00")
+test("addTaxAndFormatCurrency function - case 3 works", addTaxAndFormatCurrency(34), "£40.80")

week-1/3-extra/1-currency-conversion.js

@@ -15,8 +15,7 @@ function convertToUSD(price) {
   ===================
   The business is now breaking into the Brazilian market
   Write a new function for converting to the Brazilian real (exchange rate is 5.7 BRL to £)
-  They have also decided that they should add a 1% fee to all foreign transactions
-  Find a way to add 1% to all currency conversions (think about the DRY principle)
+  They have also decided that they should add a 1% fee to all foreign transactions, which means you only convert 99% of the £ to BRL.
 */
 
 function convertToBRL(price) {
@@ -32,16 +31,18 @@ There are some Tests in this file that will help you work out if your code is wo
 To run these tests type `node 1-currency-conversion` into your terminal
 */
 
-function test(test_name, expr) {
-  let status;
-  if (expr) {
-    status = "PASSED";
-  } else {
-    status = "FAILED";
-  }
+const util = require('util');
 
-  console.log(`${test_name}: ${status}`);
+function test(test_name, actual, expected) {
+    let status;
+    if (actual === expected) {
+        status = "PASSED";
+    } else {
+        status = `FAILED: expected: ${util.inspect(expected)} but your function returned: ${util.inspect(actual)}`;
+    }
+
+    console.log(`${test_name}: ${status}`);
 }
 
-test("convertToUSD function works", convertToUSD(32) === 44.8);
-test("convertToBRL function works", convertToBRL(30) === 172.71);
+test("convertToUSD function works", convertToUSD(32), 44.8);
+test("convertToBRL function works", convertToBRL(30), 169.29);

week-1/3-extra/2-piping.js

@@ -60,4 +60,24 @@ test('add function - case 2 works', add(2.4,5.3) === 7.7);
 test('multiply function works', multiply(2,3) === 6);
 test('format function works', format(16) === "£16");
 test('badCode variable correctly assigned', badCode === "£24");
-test('goodCode variable correctly assigned', goodCode === "£24");
+test('goodCode variable correctly assigned', goodCode === "£24");
+=======
+const util = require('util');
+
+function test(test_name, actual, expected) {
+    let status;
+    if (actual === expected) {
+        status = "PASSED";
+    } else {
+        status = `FAILED: expected: ${util.inspect(expected)} but your code returned: ${util.inspect(actual)}`;
+    }
+
+    console.log(`${test_name}: ${status}`);
+}
+
+test('add function - case 1 works', add(1,3), 4)
+test('add function - case 2 works', add(2.4,5), 7.4)
+test('multiply function works', multiply(2,3), 6)
+test('format function works', format(16), "£16")
+test('badCode variable correctly assigned', badCode, "£24")
+test('goodCode variable correctly assigned', goodCode, "£24")

week-1/3-extra/3-magic-8-ball.js

@@ -58,8 +58,9 @@ function shakeBall() {
 //answers[Math.floor(Math.random()*answers.length)]
 // The answer should come from shaking the ball
 //let answer;
+}
 
-// When checking the answer, we should tell someone if the answer is
+// This function should say whether the answer it is given is
 // - very positive
 // - positive
 // - negative
@@ -112,17 +113,20 @@ if(answer==3){
   return "very negative";
 }
 
+=======
+// This function should expect to be called with any value which was returned by the shakeBall function.
+function checkAnswer(answer) {
 }
 
-/* ======= TESTS - DO NOT MODIFY ===== 
+/* ======= TESTS - DO NOT MODIFY =====
 There are some Tests in this file that will help you work out if your code is working.
 
 To run these tests type `node 3-magic-8-ball.js` into your terminal
 */
 
 const log = console.log;
 let logged;
-console.log = function () {
+console.log = function() {
   log(...arguments);
   logged = arguments[0];
 };
@@ -148,12 +152,37 @@ function testAll() {
   );
 
   test(`shakeBall returns an string answer"`, typeof answer === "string");
+
+  test(`shakeBall returns an string answer`, typeof answer === "string");
+
+  test(
+    `checkAnswer("It is decidedly so.") returns "very positive`,
+    checkAnswer("It is decidedly so.") === "very positive"
+  )
+
+  test(
+    `checkAnswer("My reply is no.") returns "very negative`,
+    checkAnswer("My reply is no.") === "very negative"
+  )
+
   test(
     `checkAnswer returns the level of positivity"`,
     ["very positive", "positive", "negative", "very negative"].includes(
       checkAnswer(answer)
     )
   );
+  const answers = new Set();
+  for (let i = 0; i < 10; ++i) {
+    answers.add(shakeBall());
+  }
+  test(
+    `shakeBall returns different answers`,
+    answers.size > 1,
+  );
+  test(
+    `checkAnswer returns different answers`,
+    new Set(Array.from(answers.values()).map(checkAnswer)).size > 1,
+  );
 }
 
 testAll();