Merge pull request #797 from moosetechnology/redo-467-with-test

redo #467

src/Moose-Core-Tests/MooseGroupStorageTest.class.st

@@ -0,0 +1,21 @@
+"
+A MooseGroupStorageTest is a test class for testing the behavior of MooseGroupStorage
+"
+Class {
+	#name : #MooseGroupStorageTest,
+	#superclass : #TestCase,
+	#category : #'Moose-Core-Tests'
+}
+
+{ #category : #test }
+MooseGroupStorageTest >> testSpecies [
+
+	| groupA anEntity |
+	groupA := MooseModel new.
+	anEntity := MooseEntity new.
+	groupA add: anEntity.
+	groupA add: anEntity.
+	self assert: groupA size equals: 2.
+	groupA entityStorage species: Set.
+	self assert: groupA size equals: 1.
+]

src/Moose-Core/MooseGroupStorage.class.st

@@ -31,7 +31,8 @@ Class {
 	#instVars : [
 		'byName',
 		'elements',
-		'byType'
+		'byType',
+		'species'
 	],
 	#category : #'Moose-Core'
 }
@@ -125,6 +126,7 @@ MooseGroupStorage >> initialize: capacity [
 
 	byType := IdentityDictionary new: 24.
 	byName := IdentityHashTable new: capacity.
+	species := OrderedCollection.
 	elements := self species new: capacity
 ]
 
@@ -204,7 +206,13 @@ MooseGroupStorage >> sort: aBlock [
 { #category : #private }
 MooseGroupStorage >> species [
 
-	^ OrderedCollection
+	^ species
+]
+
+{ #category : #private }
+MooseGroupStorage >> species: aCollectionClass [
+	species := aCollectionClass.
+	^ elements := self species withAll: elements
 ]
 
 { #category : #private }