From f15966029fc6a1e137b462621e59f52bc273c581 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 5 Apr 2011 00:31:15 -0700
Subject: [PATCH] Fixed test names and removed duplicates

---
 frameworks/runtime/tests/core/guidFor.js      |  2 +-
 .../tests/mixins/enumerable/enumerable.js     | 34 -------------------
 .../mixins/observable/propertyChanges.js      |  2 +-
 .../runtime/tests/mixins/propertyChanges.js   |  2 +-
 .../runtime/tests/system/object/bindings.js   |  5 +++
 .../runtime/tests/system/object/enhance.js    |  2 +-
 6 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/frameworks/runtime/tests/core/guidFor.js b/frameworks/runtime/tests/core/guidFor.js
index b1006998f6..e4d622c7ac 100644
--- a/frameworks/runtime/tests/core/guidFor.js
+++ b/frameworks/runtime/tests/core/guidFor.js
@@ -50,7 +50,7 @@ test("numbers", function() {
   nanGuid( a );
 });
 
-test("numbers", function() {
+test("booleans", function() {
   var a = true, aprime = true, b = false;
 
   sameGuid( a, a,      "same booleans always yields same guid" );
diff --git a/frameworks/runtime/tests/mixins/enumerable/enumerable.js b/frameworks/runtime/tests/mixins/enumerable/enumerable.js
index f19874d327..6125e8fed0 100644
--- a/frameworks/runtime/tests/mixins/enumerable/enumerable.js
+++ b/frameworks/runtime/tests/mixins/enumerable/enumerable.js
@@ -520,40 +520,6 @@ test("should trigger observer of reduced prop when array changes once property r
   }
 });
 
-test("should trigger observer of reduced prop when array changes once property retrieved once", function() {
-  var src, ary2 = enumerables ;
-  for (var idx2=0, len2=ary2.length; idx2<len2; idx2++) {
-    src = ary2[idx2] ;
-    // get the property...this will install the reducer property...
-    src.get("@max(balance)") ;
-    
-    // install observer
-    var observedValue = null ;
-    src.addObserver("@max(balance)", function() { 
-      observedValue = src.get("@max(balance)");
-    }) ;
-    
-    //src.addProbe('[]') ;
-    //src.addProbe('@max(balance)');
-    
-    // add record to array
-    src.pushObject({ 
-      first: "John", 
-      gender: "male", 
-      californian: NO, 
-      ready: YES, 
-      visited: "Paris", 
-      balance: 5
-    }) ;
-    
-    //SC.NotificationQueue.flush() ; // force observers to trigger
-    
-    // observed value should now be set because the reduced property observer
-    // was triggered when we changed the array contents.
-    equals(5, observedValue, "observedValue") ;
-  }
-});
-
 
 test("should trigger observer of reduced prop when array changes - even if you never retrieved the property before", function() {
   var src, ary2 = enumerables ;
diff --git a/frameworks/runtime/tests/mixins/observable/propertyChanges.js b/frameworks/runtime/tests/mixins/observable/propertyChanges.js
index 6564ed23f4..611ac4e5a5 100644
--- a/frameworks/runtime/tests/mixins/observable/propertyChanges.js
+++ b/frameworks/runtime/tests/mixins/observable/propertyChanges.js
@@ -68,7 +68,7 @@ test("should increment the indicator before begining the changes to the object",
     equals(ObjectA.beginPropertyChanges()._kvo_changeLevel, 1) ;
 });
 
-test("should increment the indicator before begining the changes to the object", function() {
+test("should decrement the indicator after ending the changes to the object", function() {
     equals(ObjectA.endPropertyChanges()._kvo_changeLevel, 0) ;
 });
 
diff --git a/frameworks/runtime/tests/mixins/propertyChanges.js b/frameworks/runtime/tests/mixins/propertyChanges.js
index 82523b4ca0..06a34bf16b 100644
--- a/frameworks/runtime/tests/mixins/propertyChanges.js
+++ b/frameworks/runtime/tests/mixins/propertyChanges.js
@@ -54,7 +54,7 @@ test("should increment the indicator before begining the changes to the object",
     equals(ObjectA.beginPropertyChanges()._kvo_changeLevel, 1) ;
 });
 
-test("should increment the indicator before begining the changes to the object", function() {
+test("should decrement the indicator after ending the changes to the object", function() {
     equals(ObjectA.endPropertyChanges()._kvo_changeLevel, 0) ;
 });
 
diff --git a/frameworks/runtime/tests/system/object/bindings.js b/frameworks/runtime/tests/system/object/bindings.js
index d172a405af..1fa764b7bf 100644
--- a/frameworks/runtime/tests/system/object/bindings.js
+++ b/frameworks/runtime/tests/system/object/bindings.js
@@ -103,6 +103,10 @@ test("bind(*extraObject.foo) should create locally chained binding", function()
   equals("extraObjectValue", testObject.get("foo"), "testObject.foo") ;
 });
 
+
+test("bind(*extraObject.foo) should be disconnectable");
+// The following contains no test
+/*
 test("bind(*extraObject.foo) should be disconnectable", function() {
   var binding = testObject.bind("foo", "*extraObject.foo");
   SC.Binding.flushPendingChanges() ; // actually sets up up the binding
@@ -110,6 +114,7 @@ test("bind(*extraObject.foo) should be disconnectable", function() {
   binding.disconnect();
   SC.Binding.flushPendingChanges() ;
 });
+*/
 
 module("fooBinding method", {
   
diff --git a/frameworks/runtime/tests/system/object/enhance.js b/frameworks/runtime/tests/system/object/enhance.js
index 0938fa29bf..599929f299 100644
--- a/frameworks/runtime/tests/system/object/enhance.js
+++ b/frameworks/runtime/tests/system/object/enhance.js
@@ -91,7 +91,7 @@ test("calling sc_super inside a reopened class", function() {
   equals(obj.loudly("foo"), "OHAI: ZOMG HAHA FOO!");
 });
 
-test("calling sc_super inside a reopened class", function() {
+test("calling sc_super inside a reopened class, reverse", function() {
   var Klass = SC.Object.extend();
 
   var object = Klass.create({