Moved duplicate test functions into one file

Updated tests to import common functions

Updated template file

Updated TestRunner method calls

Author: ryunp

testrunner.ahk

@@ -13,6 +13,7 @@ tester := new TestRunner("-Conversion of JavaScript's Array methods to AutoHotke
 
 ; Include test cases
 #Include, tests\
+#Include, _common.ahk
 #Include, array_concat.test.ahk
 #Include, array_every.test.ahk
 #Include, array_fill.test.ahk
@@ -33,7 +34,7 @@ tester := new TestRunner("-Conversion of JavaScript's Array methods to AutoHotke
 #Include, array_unshift.test.ahk
 
 ; Show results
-gui, add, edit, r30, % tester.getResults()
+gui, add, edit, r30, % tester.getAllTestResults()
 gui, show
 
 return

tests/_common.ahk

@@ -0,0 +1,44 @@
+class Person {
+
+	__New(name, age) {
+		this.name := name
+		this.age := age
+	}
+
+	getName() {
+		return this.name
+	}
+	
+	getAge() {
+		return this.age
+	}
+}
+
+addition(a, b) {
+	return a + b
+}
+
+subtract(a, b) {
+	return a - b
+}
+
+multiply(a, b) {
+	return a * b
+}
+
+maximum(a, b) {
+	return ((a > b) ? a : b)
+}
+
+objProp_addition(prop, total, obj) {
+	return total + obj[prop]
+}
+
+objProp_arrayPush(prop, array, obj) {
+	array.push(obj[prop])
+	return array
+}
+
+objProp_get(prop, obj) {
+	return obj[prop]
+}

tests/_test_template.ahk

@@ -1,8 +1,13 @@
-t := new Tester("func(arg1, arg2)")
+group := tester.newGroup("func(arg1, arg2)")
 
-; Setup structures here
+; Setup data structures here
+array := [1,2]
 
-desc := ""
-t.add(desc, Assert.true(1))
+; Setup tests
+group.newTest("test 1", Assert.true(1))
 
-msgbox % t.results()
+group.newTest("test 2", Assert.false(0))
+
+group.newTest("test 3", Assert.equals(1, 1))
+
+group.newTest("test 4", Assert.arrayEquals([1,2], array)

tests/array_map.test.ahk

@@ -5,17 +5,7 @@ arrayObj := [{"name": "bob", "age": 22}, {"name": "tom", "age": 51}]
 
 
 group.newTest("Double integer values"
-	, Assert.arrayEqual([2, 10, 20], array_map(arrayInt, func("doubleInt"))))
+	, Assert.arrayEqual([2, 10, 20], array_map(arrayInt, func("multiply").bind(2))))
 
 group.newTest("Strip object down to single property"
-	, Assert.arrayEqual(["bob", "tom"], array_map(arrayObj, func("getName"))))
-
-
-
-doubleInt(int) {
-	return int * 2
-}
-
-getName(obj) {
-	return obj.name
-}
+	, Assert.arrayEqual(["bob", "tom"], array_map(arrayObj, func("objProp_get").bind("name"))))

tests/array_reduce.test.ahk

@@ -1,43 +1,23 @@
 group := tester.newGroup("array_reduce(array, callback, initialValue:='IAMNULL')")
 
-names := ["bob", "tom", "morty", "rick"]
+names := ["tom", "jerry", "morty", "rick"]
 array := [1,2,3,6,4,5]
-array2 := [{"name": names[1], "age": 22}
-	, {"name": names[2], "age": 51}
-	, {"name": names[3], "age": 15}
-	, {"name": names[4], "age": 55}]
-
+array2 := [new Person(names[1], 22)
+	, new Person(names[2], 51)
+	, new Person(names[3], 15)
+	, new Person(names[4], 55)]
 
 group.newTest("Add all values of array"
-	, Assert.equal(21, array_reduce(array, func("addition_f"))))
+	, Assert.equal(21, array_reduce(array, func("addition"))))
 
 group.newTest("Find maximum value of array"
-	, Assert.equal(6, array_reduce(array, func("maximum_f"))))
+	, Assert.equal(6, array_reduce(array, func("maximum"))))
 
 group.newTest("Add all values of array to initial value"
-	, Assert.equal(41, array_reduce(array, func("addition_f"), 20)))
+	, Assert.equal(41, array_reduce(array, func("addition"), 20)))
 
-group.newTest("sum a property of all objects"
-	, Assert.equal(143, array_reduce(array2, func("addObjAge_f"), 0)))
+group.newTest("Sum a property of all objects"
+	, Assert.equal(143, array_reduce(array2, func("objProp_addition").bind("age"), 0)))
 
 group.newTest("Copy a string property of all objects into an array"
-	, Assert.arrayEqual(names, array_reduce(array2, func("pushObjName_f"), [])))
-
-
-
-addition_f(a, b) {
-	return a + b
-}
-
-maximum_f(max, cur) {
-	return ((max > cur) ? max : cur)
-}
-
-addObjAge_f(total, obj) {
-	return total + obj.age
-}
-
-pushObjName_f(names, obj) {
-	names.push(obj.name)
-	return names
-}
+	, Assert.arrayEqual(names, array_reduce(array2, func("objProp_arrayPush").bind("name"), [])))

tests/array_reduceRight.test.ahk

@@ -1,43 +1,23 @@
 group := tester.newGroup("array_reduceRight(array, callback, initialValue:='IAMNULL')")
 
-names := ["bob", "tom", "morty", "rick"]
+names := ["tom", "jerry", "morty", "rick"]
 array := [1,2,3,6,4,5]
-array2 := [{"name": names[4], "age": 22}
-	, {"name": names[3], "age": 51}
-	, {"name": names[2], "age": 15}
-	, {"name": names[1], "age": 55}]
-
+array2 := [new Person(names[4], 22)
+	, new Person(names[3], 51)
+	, new Person(names[2], 15)
+	, new Person(names[1], 55)]
 
 group.newTest("Add all values of array"
-	, Assert.equal(21, array_reduceRight(array, func("addition_fr"))))
+	, Assert.equal(21, array_reduceRight(array, func("addition"))))
 
 group.newTest("Find maximum value of array"
-	, Assert.equal(6, array_reduceRight(array, func("maximum_fr"))))
+	, Assert.equal(6, array_reduceRight(array, func("maximum"))))
 
 group.newTest("Add all values of array to initial value"
-	, Assert.equal(41, array_reduceRight(array, func("addition_fr"), 20)))
-
-group.newTest("Add a integer property of all objects"
-	, Assert.equal(143, array_reduceRight(array2, func("addObjAge_fr"), 0)))
-
-group.newTest("Add a string property of all objects into an array"
-	, Assert.arrayEqual(names, array_reduceRight(array2, func("pushObjName_fr"), [])))
-
-
-
-addition_fr(a, b) {
-	return a + b
-}
-
-maximum_fr(max, cur) {
-	return ((max > cur) ? max : cur)
-}
+	, Assert.equal(41, array_reduceRight(array, func("addition"), 20)))
 
-addObjAge_fr(total, obj) {
-	return total + obj.age
-}
+group.newTest("Sum a property of all objects"
+	, Assert.equal(143, array_reduceRight(array2, func("objProp_addition").bind("age"), 0)))
 
-pushObjName_fr(names, obj) {
-	names.push(obj.name)
-	return names
-}
+group.newTest("Copy a string property of all objects into an array"
+	, Assert.arrayEqual(names, array_reduceRight(array2, func("objProp_arrayPush").bind("name"), [])))

tests/array_slice.test.ahk

@@ -16,4 +16,10 @@ group.newTest("Negative start"
 	, Assert.arrayEqual([3,4,5], array_slice(array, -3)))
 
 group.newTest("Negative start & end"
-	, Assert.arrayEqual([4], array_slice(array, -2, -1)))
+	, Assert.arrayEqual([4], array_slice(array, -2, -1)))
+
+group.newTest("Positive start & negative end"
+	, Assert.arrayEqual([2,3], array_slice(array, 2, -2)))
+
+group.newTest("Negative start & positive end"
+	, Assert.arrayEqual([2], array_slice(array, -4, 3)))

tests/array_some.test.ahk

@@ -4,24 +4,10 @@ array := [1,2,3,4,5]
 
 
 group.newTest("Detect one even number"
-	, Assert.true(array_some(array, func("isEven_s"))))
+	, Assert.true(array_some(array, objBindMethod(Assert, "isEven"))))
 
 group.newTest("Detect one odd number"
-	, Assert.true(array_some(array, func("isOdd_s"))))
+	, Assert.true(array_some(array, objBindMethod(Assert, "isOdd"))))
 
 group.newTest("Fails to find large enough number"
-	, Assert.true(array_some(array, func("greaterThanSix"))))
-
-
-
-isEven_s(num) {
-	return (mod(num, 2) == 0)
-}
-
-isOdd_s(num) {
-	return (mod(num, 2) == 1)
-}
-
-greaterThanSix(num) {
-	return num < 5
-}
+	, Assert.true(array_some(array, objBindMethod(Assert, "greaterThan", 6))))