Merge pull request #61 from tinchodias/update_tests

Update tests
pharo-nosql · Sep 21, 2016 · fbf00dd · fbf00dd
2 parents 7f90c15 + e18b1c6
commit fbf00dd
Show file tree

Hide file tree

Showing 42 changed files with 91 additions and 100 deletions.
diff --git a/mc/Voyage-Model-Tests.package/VORepositoryTest.class/instance/testCount.st b/mc/Voyage-Model-Tests.package/VORepositoryTest.class/instance/testCount.st
@@ -3,6 +3,9 @@ testCount
 	| pilot |
 	pilot := VOTestPilot new name: 'Esteban'.
 	self assert: (self repository count: VOTestPilot) equals: 0.
+
 	self repository save: pilot.
+	self waitForWriteOperation.
+
 	self assert: (self repository count: VOTestPilot) equals: 1
 
diff --git a/mc/Voyage-Model-Tests.package/VORepositoryTest.class/instance/testIsLazy.st b/mc/Voyage-Model-Tests.package/VORepositoryTest.class/instance/testIsLazy.st
@@ -7,7 +7,8 @@ testIsLazy
 		lazyPet: (VOTestDog new name: 'LazyDoggie').
 	self repository save: pilot.
 	self repository flushCache.
-
+	self waitForWriteOperation.
+
 	retrievedPilot := self repository selectOne: VOTestPilot where: [ :each | (each at: 'name') = 'Esteban' ].
 	"self assert: (retrievedPilot instVarNamed: 'lazyPet') class equals: VOLazyProxy."
-	self assert: retrievedPilot lazyPet name equals: 'LazyDoggie'.
+	self assert: retrievedPilot lazyPet name equals: 'LazyDoggie'.
diff --git a/mc/Voyage-Model-Tests.package/VORepositoryTest.class/instance/testIsLazyOnToManyRelations.st b/mc/Voyage-Model-Tests.package/VORepositoryTest.class/instance/testIsLazyOnToManyRelations.st
@@ -1,6 +1,6 @@
 tests
 testIsLazyOnToManyRelations
-	| pilot pilots retrievedPilot |
+	| pilot retrievedPilot |
 	pilot := VOTestPilot new
 		name: 'Esteban';
 		pastPets: (Array with: (VOTestDog new name: 'Doggie') with: (VOTestDog new name: 'Kittie')).

diff --git a/mc/Voyage-Model-Tests.package/VORepositoryTest.class/instance/testIsNew.st b/mc/Voyage-Model-Tests.package/VORepositoryTest.class/instance/testIsNew.st
@@ -8,6 +8,7 @@ testIsNew
 	self assert: (self repository isNew: pilot pet).
 
 	self repository save: pilot.
-
+	self waitForWriteOperation.
+
 	self deny: (self repository isNew: pilot).
 	self deny: (self repository isNew: pilot pet).
diff --git a/mc/Voyage-Model-Tests.package/VORepositoryTest.class/instance/testSave.st b/mc/Voyage-Model-Tests.package/VORepositoryTest.class/instance/testSave.st
@@ -6,7 +6,8 @@ testSave
 		name: 'Esteban';
 		pet: (VOTestDog new name: 'Doggie').
 	self repository save: pilot.
-
+	self waitForWriteOperation.
+
 	pilots := self repository selectAll: VOTestPilot.
 	self assert: pilots size equals: 1.
 	self assert: pilots first name equals: 'Esteban'.

diff --git a/mc/Voyage-Model-Tests.package/VORepositoryTest.class/instance/testSaveCircular.st b/mc/Voyage-Model-Tests.package/VORepositoryTest.class/instance/testSaveCircular.st
@@ -11,14 +11,21 @@ testSaveCircular
 			name: 'Miau';
 			yourself);
 		yourself.
-
+
+	self 
+		assert: (self repository count: VOTestOwner)
+		equals: 0.
+
 	self repository save: owner.
+	self waitForWriteOperation.
 
+	self 
+		assert: (self repository count: VOTestOwner)
+		equals: 1.
 	self 
 		assert: (self repository selectOne: VOTestOwner where: [ :each | (each at: 'name') = 'test owner' ])
 		equals: owner.
+
 	self 
-		assert: (self repository selectAll: VOTestPet) size
-		equals: 2.
-
-
+		assert: (self repository count: VOTestPet)
+		equals: 2.
diff --git a/mc/Voyage-Model-Tests.package/VORepositoryTest.class/instance/testSaveWithClasses.st b/mc/Voyage-Model-Tests.package/VORepositoryTest.class/instance/testSaveWithClasses.st
@@ -1,5 +1,7 @@
 tests
 testSaveWithClasses
 	self repository save: (VOTestPilot new currency: VOTestEuro).
+	self waitForWriteOperation.
+
 	self assert: (self repository selectAll: VOTestPilot) first currency equals: VOTestEuro.
 
diff --git a/mc/Voyage-Model-Tests.package/VORepositoryTest.class/instance/testSaveWithSubclasses.st b/mc/Voyage-Model-Tests.package/VORepositoryTest.class/instance/testSaveWithSubclasses.st
@@ -4,6 +4,7 @@ testSaveWithSubclasses
 	self repository save: (VOTestDog new name: 'Rantanplan').
 	self repository save: (VOTestDog new name: 'Medor').
 	self repository save: (VOTestCat new name: 'Pizza').
+	self waitForWriteOperation.
 
  	self assert: (self repository selectAll: VOTestPet) size equals: 3.
 	self assert: (self repository selectAll: VOTestDog) size equals: 2.

diff --git a/...Model-Tests.package/VORepositoryTest.class/instance/testSaveWithSubclassesAndRelations.st b/...Model-Tests.package/VORepositoryTest.class/instance/testSaveWithSubclassesAndRelations.st
@@ -4,8 +4,8 @@ testSaveWithSubclassesAndRelations
 	mozart := VOTestPilot new
 		name: 'Mozart';
 		pet: (VOTestDog new name: 'Medor').
-
 	self repository save: mozart.
+	self waitForWriteOperation.
 
 	"Make sure we got a dog back"
 	self assert: (self repository selectAll: VOTestPilot) first pet bark equals: 'Wouf!'.
diff --git a/...oyage-Model-Tests.package/VORepositoryTest.class/instance/testSelectManyWithAllKeyword.st b/...oyage-Model-Tests.package/VORepositoryTest.class/instance/testSelectManyWithAllKeyword.st
@@ -14,6 +14,7 @@ testSelectManyWithAllKeyword
 	self repository save: pilot2.
 	self repository save: pilot3.
 	self repository flushCache.
+	self waitForWriteOperation.
 
 	mongoQuery :=  Dictionary new
 		at: 'keywords' put: (Dictionary new 

diff --git a/...e-Model-Tests.package/VORepositoryTest.class/instance/testSelectManyWithLimitAndOffset.st b/...e-Model-Tests.package/VORepositoryTest.class/instance/testSelectManyWithLimitAndOffset.st
@@ -10,6 +10,7 @@ testSelectManyWithLimitAndOffset
 		save: (VOTestPilot new name: 'Markus');
 		yourself.
 	self repository flushCache.
+	self waitForWriteOperation.
 
 	firstBatch := self repository selectMany: VOTestPilot where: Dictionary new limit: 2. 
 	secondBatch := self repository selectMany: VOTestPilot where: Dictionary new limit: 2 offset: 2.

diff --git a/mc/Voyage-Model-Tests.package/VORepositoryTest.class/instance/testSelectOneWithSubclass.st b/mc/Voyage-Model-Tests.package/VORepositoryTest.class/instance/testSelectOneWithSubclass.st
@@ -2,6 +2,8 @@ tests
 testSelectOneWithSubclass
 	| retrieved |
 	self repository save: (VOTestCat new name: 'Pizza').
+	self waitForWriteOperation.
+
 	retrieved := self repository selectOne: VOTestPet where: [ :each | (each at: 'name') = 'Pizza' ].
 	self deny: retrieved isNil.
 	self assert: retrieved class equals: VOTestCat. "object is still in cache with the good class."

diff --git a/mc/Voyage-Model-Tests.package/VORepositoryTest.class/instance/testUpdate.st b/mc/Voyage-Model-Tests.package/VORepositoryTest.class/instance/testUpdate.st
@@ -6,11 +6,13 @@ testUpdate
 		name: 'Esteban';
 		pet: (VOTestDog new name: 'Doggie').
 	self repository save: pilot.
+	self waitForWriteOperation.
 
 	id := self repository idOf: pilot.
 
 	pilot name: 'Another Pilot'.
 	self repository save: pilot.
+	self waitForWriteOperation.
 
 	pilots := self repository selectAll: VOTestPilot.
 	self assert: pilots size equals: 1.

diff --git a/mc/Voyage-Model-Tests.package/VORepositoryTest.class/instance/waitForWriteOperation.st b/mc/Voyage-Model-Tests.package/VORepositoryTest.class/instance/waitForWriteOperation.st
@@ -0,0 +1,5 @@
+running
+waitForWriteOperation
+	"Write operations can require some time to be applied by backend, and this template method can be overriden by subclasses to do something."
+
+	"Do nothing by default"
diff --git a/mc/Voyage-Model-Tests.package/VORepositoryTest.class/methodProperties.json b/mc/Voyage-Model-Tests.package/VORepositoryTest.class/methodProperties.json
@@ -6,7 +6,7 @@
 		"testCount" : "FrancoisStephany 9/6/2012 15:30",
 		"testCountWhere" : "EstebanLorenzano 6/14/2016 14:42",
 		"testIsLazy" : "EstebanLorenzano 6/14/2016 13:05",
-		"testIsLazyOnToManyRelations" : "EstebanLorenzano 6/14/2016 15:02",
+		"testIsLazyOnToManyRelations" : "MartinDias 9/19/2016 01:12",
 		"testIsNew" : "FrancoisStephany 11/14/2012 20:26",
 		"testSave" : "EstebanLorenzano 6/13/2016 18:27",
 		"testSaveCircular" : "EstebanLorenzano 6/14/2016 13:41",
@@ -18,4 +18,5 @@
 		"testSelectOneWithSubclass" : "EstebanLorenzano 6/14/2016 14:43",
 		"testUpdate" : "EstebanLorenzano 2/11/2016 19:01",
 		"testVersionAt" : "MartinDias 4/15/2016 01:23",
-		"testVersionGenerator" : "EstebanLorenzano 6/15/2016 14:18" } }
+		"testVersionGenerator" : "EstebanLorenzano 6/15/2016 14:18",
+		"waitForWriteOperation" : "MartinDias 9/3/2016 15:57" } }
diff --git a/mc/Voyage-Model-Tests.package/monticello.meta/version b/mc/Voyage-Model-Tests.package/monticello.meta/version
@@ -1,2 +1,2 @@
-(name 'Voyage-Model-Tests-MartinDias.5' message 'Remove #testSelectAllJustAfterRemove, it does not show anything relevant, we know there are concurrency problems when no "write concerns" or equivalent is used to check that mongodb database finished a write operation.' id 'c31ddca0-5ae3-41a3-a97a-e5c74da0b275' date '5 September 2016' time '4:17:40.782815 pm' author 'MartinDias' ancestors ((name 'Voyage-Model-Tests-EstebanLorenzano.4' message 'using new descriptions for test' id 'e102d37d-d7d3-4845-917e-6bcd0d914010' date '3 August 2016' time '6:27:20.650685 pm' author 'EstebanLorenzano' ancestors ((name 'Voyage-Model-Tests-EstebanLorenzano.3' message 'model for test moved to generic package
-' id 'aea8069f-9aa9-5ef7-bc47-36932e3bf144' date '3 August 2016' time '6:19:41 pm' author 'EstebanLorenzano' ancestors () stepChildren ())) stepChildren ())) stepChildren ())
+(name 'Voyage-Model-Tests-MartinDias.6' message 'Adding VORepositoryTest>>waitForWriteOperation. Purpose: Write operations can require some time to be applied by backend, and this template method can be overriden by subclasses to do something. Do nothing by default.' id '66f21a79-5079-46ff-9625-d8726363e4cb' date '19 September 2016' time '9:22:27.214928 pm' author 'MartinDias' ancestors ((name 'Voyage-Model-Tests-MartinDias.5' message 'Remove #testSelectAllJustAfterRemove, it does not show anything relevant, we know there are concurrency problems when no "write concerns" or equivalent is used to check that mongodb database finished a write operation.' id 'c31ddca0-5ae3-41a3-a97a-e5c74da0b275' date '5 September 2016' time '4:17:40.782815 pm' author 'MartinDias' ancestors ((name 'Voyage-Model-Tests-EstebanLorenzano.4' message 'using new descriptions for test' id 'e102d37d-d7d3-4845-917e-6bcd0d914010' date '3 August 2016' time '6:27:20.650685 pm' author 'EstebanLorenzano' ancestors ((name 'Voyage-Model-Tests-EstebanLorenzano.3' message 'model for test moved to generic package
+' id 'aea8069f-9aa9-5ef7-bc47-36932e3bf144' date '3 August 2016' time '6:19:41 pm' author 'EstebanLorenzano' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
diff --git a/...-Tests.package/VOMongoReplicationDiscoverPrimaryScenarioTest.class/instance/repository.st b/...-Tests.package/VOMongoReplicationDiscoverPrimaryScenarioTest.class/instance/repository.st
diff --git a/...imaryScenarioTest.class/instance/setUp.st → ...rioTest.class/instance/setUpRepository.st b/...imaryScenarioTest.class/instance/setUp.st → ...rioTest.class/instance/setUpRepository.st
@@ -1,6 +1,5 @@
 running
-setUp
-	super setUp.
-
+setUpRepository
 	"Note that `mongo B` is a secondary member, then the repository must figure out this fact, and discover the primary member in the replica set."
-	repository := MongoReplicationTestResources newRepositoryOnB.
+
+	repository := MongoReplicationTestResources newRepositoryOnB
diff --git a/...o-Tests.package/VOMongoReplicationDiscoverPrimaryScenarioTest.class/methodProperties.json b/...o-Tests.package/VOMongoReplicationDiscoverPrimaryScenarioTest.class/methodProperties.json
@@ -2,5 +2,4 @@
 	"class" : {
 		 },
 	"instance" : {
-		"repository" : "MartinDias 6/15/2016 10:18",
-		"setUp" : "MartinDias 6/17/2016 15:35" } }
+		"setUpRepository" : "MartinDias 9/19/2016 20:04" } }
diff --git a/...e-Mongo-Tests.package/VOMongoReplicationDiscoverPrimaryScenarioTest.class/properties.json b/...e-Mongo-Tests.package/VOMongoReplicationDiscoverPrimaryScenarioTest.class/properties.json
@@ -7,7 +7,7 @@
 		 ],
 	"commentStamp" : "MartinDias 6/17/2016 15:44",
 	"instvars" : [
-		"repository" ],
+		 ],
 	"name" : "VOMongoReplicationDiscoverPrimaryScenarioTest",
 	"pools" : [
 		 ],

diff --git a/...e-Mongo-Tests.package/VOMongoReplicationSimplestScenarioTest.class/instance/repository.st b/...e-Mongo-Tests.package/VOMongoReplicationSimplestScenarioTest.class/instance/repository.st
diff --git a/mc/Voyage-Mongo-Tests.package/VOMongoReplicationSimplestScenarioTest.class/instance/setUp.st b/mc/Voyage-Mongo-Tests.package/VOMongoReplicationSimplestScenarioTest.class/instance/setUp.st
diff --git a/...go-Tests.package/VOMongoReplicationSimplestScenarioTest.class/instance/setUpRepository.st b/...go-Tests.package/VOMongoReplicationSimplestScenarioTest.class/instance/setUpRepository.st
@@ -0,0 +1,5 @@
+running
+setUpRepository
+	"Simplest scenario: Specify primary member in the replica set."
+
+	repository := MongoReplicationTestResources newRepositoryOnA
diff --git a/...ge-Mongo-Tests.package/VOMongoReplicationSimplestScenarioTest.class/methodProperties.json b/...ge-Mongo-Tests.package/VOMongoReplicationSimplestScenarioTest.class/methodProperties.json
@@ -2,5 +2,4 @@
 	"class" : {
 		 },
 	"instance" : {
-		"repository" : "MartinDias 5/11/2016 19:35",
-		"setUp" : "MartinDias 6/17/2016 15:49" } }
+		"setUpRepository" : "MartinDias 9/19/2016 20:04" } }
diff --git a/mc/Voyage-Mongo-Tests.package/VOMongoReplicationSimplestScenarioTest.class/properties.json b/mc/Voyage-Mongo-Tests.package/VOMongoReplicationSimplestScenarioTest.class/properties.json
@@ -7,7 +7,7 @@
 		 ],
 	"commentStamp" : "MartinDias 6/17/2016 15:45",
 	"instvars" : [
-		"repository" ],
+		 ],
 	"name" : "VOMongoReplicationSimplestScenarioTest",
 	"pools" : [
 		 ],

diff --git a/...ngoTestResource.class/class/mongoHost..st → ...age/VOMongoTest.class/class/mongoHost..st b/...ngoTestResource.class/class/mongoHost..st → ...age/VOMongoTest.class/class/mongoHost..st
diff --git a/...ongoTestResource.class/class/mongoHost.st → ...kage/VOMongoTest.class/class/mongoHost.st b/...ongoTestResource.class/class/mongoHost.st → ...kage/VOMongoTest.class/class/mongoHost.st
diff --git a/mc/Voyage-Mongo-Tests.package/VOMongoTest.class/class/resources.st b/mc/Voyage-Mongo-Tests.package/VOMongoTest.class/class/resources.st
diff --git a/mc/Voyage-Mongo-Tests.package/VOMongoTest.class/instance/repository.st b/mc/Voyage-Mongo-Tests.package/VOMongoTest.class/instance/repository.st
@@ -1,3 +1,3 @@
 accessing
 repository 
-	^ VOMongoTestResource current repository
+	^ repository
diff --git a/mc/Voyage-Mongo-Tests.package/VOMongoTest.class/instance/setUp.st b/mc/Voyage-Mongo-Tests.package/VOMongoTest.class/instance/setUp.st
@@ -0,0 +1,4 @@
+running
+setUp
+	super setUp.
+	self setUpRepository.
diff --git a/mc/Voyage-Mongo-Tests.package/VOMongoTest.class/instance/setUpRepository.st b/mc/Voyage-Mongo-Tests.package/VOMongoTest.class/instance/setUpRepository.st
@@ -0,0 +1,8 @@
+running
+setUpRepository
+	"Hook: subclasses can override with special ways of building the test repository"
+
+	repository := VOMongoRepository 
+		host: self class mongoHost
+		database: 'Voyage-Tests'.
+	repository debug: true.
diff --git a/mc/Voyage-Mongo-Tests.package/VOMongoTest.class/instance/tearDown.st b/mc/Voyage-Mongo-Tests.package/VOMongoTest.class/instance/tearDown.st
@@ -1,13 +1,14 @@
 running
 tearDown
 	"Reset the DB after each test"
-	"self repository dropDatabase --> this works but it's slow and... leaks open Sockets!"
+	"self repository dropDatabase"
 
-	self repository
-		removeAll: VOTestOwner;
-		removeAll: VOTestPet;
-		removeAll: VOTestPilot;
-		flush.
+	super tearDown.
+
+	(VOTestObject allSubclasses
+		collect: [ :each | each persistentClass ] as: Set)
+		do: [ :each | repository removeAll: each ].
+
 	Smalltalk garbageCollect.
 
-	800 milliseconds asDelay wait. "Wait to reduce the probability of a concurrency conflict"
+	self waitForWriteOperation.
diff --git a/mc/Voyage-Mongo-Tests.package/VOMongoTest.class/instance/waitForWriteOperation.st b/mc/Voyage-Mongo-Tests.package/VOMongoTest.class/instance/waitForWriteOperation.st
@@ -0,0 +1,5 @@
+running
+waitForWriteOperation
+	"Write operations can be performed in a fire-and-forget mode, and it's convenient to wait a bit to ensure mongodb performed it before asserting on the results."
+
+	50 milliSeconds wait
diff --git a/mc/Voyage-Mongo-Tests.package/VOMongoTest.class/methodProperties.json b/mc/Voyage-Mongo-Tests.package/VOMongoTest.class/methodProperties.json
@@ -1,6 +1,10 @@
 {
 	"class" : {
-		"resources" : "FrancoisStephany 8/8/2012 15:03" },
+		"mongoHost" : "MartinDias 9/19/2016 19:33",
+		"mongoHost:" : "MartinDias 9/19/2016 19:34" },
 	"instance" : {
-		"repository" : "EstebanLorenzano 4/21/2015 16:43",
-		"tearDown" : "MartinDias 5/16/2016 00:40" } }
+		"repository" : "MartinDias 9/19/2016 19:26",
+		"setUp" : "MartinDias 9/19/2016 20:05",
+		"setUpRepository" : "MartinDias 9/19/2016 20:06",
+		"tearDown" : "MartinDias 9/19/2016 19:32",
+		"waitForWriteOperation" : "MartinDias 9/21/2016 16:04" } }
diff --git a/mc/Voyage-Mongo-Tests.package/VOMongoTest.class/properties.json b/mc/Voyage-Mongo-Tests.package/VOMongoTest.class/properties.json
@@ -3,10 +3,10 @@
 	"classinstvars" : [
 		 ],
 	"classvars" : [
-		 ],
+		"MongoHost" ],
 	"commentStamp" : "EstebanLorenzano 8/3/2016 17:43",
 	"instvars" : [
-		 ],
+		"repository" ],
 	"name" : "VOMongoTest",
 	"pools" : [
 		 ],

diff --git a/mc/Voyage-Mongo-Tests.package/VOMongoTestResource.class/README.md b/mc/Voyage-Mongo-Tests.package/VOMongoTestResource.class/README.md
diff --git a/mc/Voyage-Mongo-Tests.package/VOMongoTestResource.class/instance/repository.st b/mc/Voyage-Mongo-Tests.package/VOMongoTestResource.class/instance/repository.st
diff --git a/mc/Voyage-Mongo-Tests.package/VOMongoTestResource.class/instance/setUp.st b/mc/Voyage-Mongo-Tests.package/VOMongoTestResource.class/instance/setUp.st
diff --git a/mc/Voyage-Mongo-Tests.package/VOMongoTestResource.class/instance/tearDown.st b/mc/Voyage-Mongo-Tests.package/VOMongoTestResource.class/instance/tearDown.st
diff --git a/mc/Voyage-Mongo-Tests.package/VOMongoTestResource.class/methodProperties.json b/mc/Voyage-Mongo-Tests.package/VOMongoTestResource.class/methodProperties.json
diff --git a/mc/Voyage-Mongo-Tests.package/VOMongoTestResource.class/properties.json b/mc/Voyage-Mongo-Tests.package/VOMongoTestResource.class/properties.json
diff --git a/mc/Voyage-Mongo-Tests.package/monticello.meta/version b/mc/Voyage-Mongo-Tests.package/monticello.meta/version