From 6ce45d32dac642923c8d1b6f346ba01ad1bcb1dc Mon Sep 17 00:00:00 2001
From: Tom Robinson <tom@280north.com>
Date: Fri, 13 Aug 2010 15:40:33 -0700
Subject: [PATCH] Add comparison test for native sorting.

---
 Tests/Foundation/CPArrayPerformanceTest.j | 79 +++++++++++++++++------
 1 file changed, 58 insertions(+), 21 deletions(-)

diff --git a/Tests/Foundation/CPArrayPerformanceTest.j b/Tests/Foundation/CPArrayPerformanceTest.j
index f350e7ff5..e4d014aa5 100644
--- a/Tests/Foundation/CPArrayPerformanceTest.j
+++ b/Tests/Foundation/CPArrayPerformanceTest.j
@@ -3,20 +3,14 @@
 @import <Foundation/CPNumber.j>
 @import <Foundation/CPSortDescriptor.j>
 
+var ELEMENTS = 100,
+    REPEATS = 10;
+
 @implementation CPArrayPerformanceTest : OJTestCase
 
 - (void)testSortUsingDescriptorsSpeed
 {
-
-    var ELEMENTS = 1000,
-        REPEATS = 10,
-        array = [];
-    for (var i=0; i<ELEMENTS; i++) {
-        var s = [Sortable new];
-        [s setA:(i % 5)];
-        [s setB:(ELEMENTS-i)];
-        array.push(s);
-    }
+    var array = [self makeUnsorted];
 
     var descriptors = [
         [CPSortDescriptor sortDescriptorWithKey:"a" ascending:NO],
@@ -28,21 +22,64 @@
     for (var i=0; i<REPEATS; i++)
     {
         var sorted = [array sortedArrayUsingDescriptors:descriptors];
-
-        // Verify it really got sorted.
-        for (var j=0; j<ELEMENTS; j++) {
-            var expectedA = 4-FLOOR(j * 5 / ELEMENTS);
-            if (sorted[j].a != expectedA)
-                [self fail:"a out of order: "+expectedA+" != "+sorted[j].a];
-            var expectedB = (5-expectedA) + 5 * (j % (ELEMENTS / 5))
-            if (sorted[j].b != expectedB)
-                [self fail:"b out of order: "+expectedB+" != "+sorted[j].b];
-        }
+        [self checkSorted:sorted];
     }
 
     var end = (new Date).getTime();
 
-    CPLog.warn("testSortUsingDescriptorsSpeed: "+(end-start)+"ms");
+    CPLog.warn(_cmd+": "+(end-start)+"ms");
+}
+
+- (void)testSortUsingNativeSort
+{
+    var array = [self makeUnsorted];
+
+    var descriptors = [
+        [CPSortDescriptor sortDescriptorWithKey:"a" ascending:NO],
+        [CPSortDescriptor sortDescriptorWithKey:"b" ascending:YES]
+    ];
+    
+    function sortFunction(lhs, rhs) {
+        return ([lhs a] === [rhs a]) ? ([lhs b] - [rhs b]) : ([rhs a] - [lhs a]);
+    }
+
+    var start = (new Date).getTime();
+
+    for (var i=0; i<REPEATS; i++)
+    {
+        var sorted = [array copy];
+        sorted.sort(sortFunction)
+        [self checkSorted:sorted];
+    }
+
+    var end = (new Date).getTime();
+
+    CPLog.warn(_cmd+": "+(end-start)+"ms");
+}
+
+- (CPArray)makeUnsorted
+{
+    var array = [];
+    for (var i=0; i<ELEMENTS; i++) {
+        var s = [Sortable new];
+        [s setA:(i % 5)];
+        [s setB:(ELEMENTS-i)];
+        array.push(s);
+    }
+    return array;
+}
+
+- (void)checkSorted:(CPArray)sorted
+{
+    // Verify it really got sorted.
+    for (var j=0; j<ELEMENTS; j++) {
+        var expectedA = 4-FLOOR(j * 5 / ELEMENTS);
+        if (sorted[j].a != expectedA)
+            [self fail:"a out of order: "+expectedA+" != "+sorted[j].a];
+        var expectedB = (5-expectedA) + 5 * (j % (ELEMENTS / 5))
+        if (sorted[j].b != expectedB)
+            [self fail:"b out of order: "+expectedB+" != "+sorted[j].b];
+    }
 }
 
 @end