Playing with results a bit more. Added some tests.

agarie · May 8, 2012 · 31fa801 · 31fa801
1 parent 6b72da3
commit 31fa801
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/src/typecalc.js b/src/typecalc.js
@@ -19,8 +19,8 @@ var	TYPECALC = {
 			team = TYPECALC.io.walkTheTeam();
 			weaks = TYPECALC.calc.weaknesses(team);
 			count = TYPECALC.calc.reduceWeaknesses(weaks);
-			TYPECALC.io.showResultsOnUi("Resists: " + count.resistCount.toString() + "<br />", true);
-			TYPECALC.io.showResultsOnUi("Weaknesses: " + count.weaknessCount.toString(), false);			
+
+			TYPECALC.io.showResultsOnUi(TYPECALC.calc.print_table(count), true);
 		});						
 	},
 	debug: function () {
@@ -204,6 +204,27 @@ TYPECALC.calc = (function () {
 		return count;
 	};
 
+	// Methods to count how many weaknesses/resists you have for each type
+	var print_table = function (count) {
+		var output = "";
+
+		// Weaknesses list
+		output += "<ul><h2>Your team has some weaknesses...</h2>";
+		count.weaknessCount.forEach(function(entry, index) {
+			output += "<li>" + TYPES[index] + ": " + entry + "</li>";
+		});
+		output += "</ul>";
+
+		// Resists list
+		output += "<ul><h2>And some resists...</h2>";
+		count.resistCount.forEach(function(entry, index) {
+			output += "<li>" + TYPES[index] + ": " + entry + "</li>";
+		});
+		output += "</ul>";
+
+		return output;
+	};
+
 	// Assumes that the input is an object of arrays
 	var	transpose = function (matrix) {
 		if (typeof matrix !== "object") {
@@ -269,6 +290,7 @@ TYPECALC.calc = (function () {
 		weaknesses: weaknesses,
 		mapEffectivity: mapEffectivity,
 		reduceWeaknesses: reduceWeaknesses,
+		print_table: print_table,
 		transpose: transpose,
 		dotProduct: dotProduct
 	};

diff --git a/tests/typecalc-test.js b/tests/typecalc-test.js
@@ -13,6 +13,10 @@ TestCase("CalcTest", {
 		assertObject(this.calc);
 	},
 
+	"test constant TYPES should be hidden": function () {
+		assertUndefined(this.calc.TYPES);
+	},
+
 	"test constant TYPE_ORDER should be hidden": function() {
 		assertUndefined(this.calc.TYPE_ORDER);
 	},
@@ -23,9 +27,14 @@ TestCase("CalcTest", {
 
 	"test matchup should return array": function () {
 		assertNotUndefined(this.calc.matchup("normal").length);
+		assertArray(this.calc.matchup("normal"));
+
 		assertNotUndefined(this.calc.matchup("normal", "fire").length);
+		assertArray(this.calc.matchup("normal", "fire"));
 	},
 
+	// weakness, mapEffectivity and reduceWeaknesses
+
 	"test transpose should return false if input isn't object": function () {
 		assertFalse(this.calc.transpose([]));
 	},