class library: fix issues with asPairs, asAssociations, asDict create…

…d collection size (#3101)
supercollider · Aug 11, 2017 · f207182 · f207182
1 parent 6ea3780
commit f207182
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/SCClassLibrary/Common/Collections/Collection.sc b/SCClassLibrary/Common/Collections/Collection.sc
@@ -565,7 +565,7 @@ Collection {
 			^if(class == this.class) { this } { this.as(class) }
 		};
 		res = class.new(this.size div: 2);
-		this.pairsDo { |key, val| res.add(key -> val) }
+		this.pairsDo { |key, val| res = res.add(key -> val) }
 		^res
 	}
 
@@ -575,8 +575,8 @@ Collection {
 		if(this.isAssociationArray.not) {
 			^if(class == this.class) { this } { this.as(class) }
 		};
-		res = class.new(this.size div: 2);
-		this.do { |assoc| res.add(assoc.key).add(assoc.value) }
+		res = class.new(this.size * 2);
+		this.do { |assoc| res = res.add(assoc.key).add(assoc.value) }
 		^res
 	}
 

diff --git a/testsuite/classlibrary/TestCollection.sc b/testsuite/classlibrary/TestCollection.sc
@@ -0,0 +1,10 @@
+TestCollection : UnitTest {
+
+	test_asPairs {
+
+		this.assert([2,10,100,1000].collect{ |size| size.collect{ |i| i -> i }.asPairs.size >= (size * 2) }.reduce('&&')
+, "asPairs on an array of associations should create an array with size higher or equal to twice the number of elements in the original array");
+
+	}
+
+}
diff --git a/testsuite/classlibrary/TestDictionary.sc b/testsuite/classlibrary/TestDictionary.sc
@@ -13,4 +13,16 @@ TestDictionary : UnitTest {
 
 	}
 
+	test_asAssociations {
+
+		this.assert(
+			[2,10,100,1000].collect{ |size|
+				var dict = Dictionary.new(size);
+				size.do{ |i| dict.put(i,i) };
+				dict.asAssociations.size >= size
+			}.reduce('&&')
+			, "asAssociations on a dictionary should create array of associations with size higher or equal to the number of elements in the original dictionary");
+
+	}
+
 }