Tests are improved to not rely on waiting duration.

dionisiydk · dionisiydk · commit 12830cf637ec · 2018-02-05T11:33:47.000+01:00
And there is one failed test which  probably shows the real problem:
testTerminatingReadWhichWaitingWriteAndAnotherRead
diff --git a/ReadWriteLock-Tests.package/LocksTestCase.class/instance/passForkedProcesses.st b/ReadWriteLock-Tests.package/LocksTestCase.class/instance/passForkedProcesses.st
@@ -0,0 +1,6 @@
+helpers
+passForkedProcesses
+	"While this trick looks bad it is quite difficult to control processes which are forked by tested code.
+	This yield loop works well in practice.
+	It allow all forked processes proceed"
+	10 timesRepeat: [Processor yield]
diff --git a/ReadWriteLock-Tests.package/LocksTestCase.class/instance/waitForkedProcesses.st b/ReadWriteLock-Tests.package/LocksTestCase.class/instance/waitForkedProcesses.st
@@ -0,0 +1,6 @@
+helpers
+waitForkedProcesses
+
+	[CurrentExecutionEnvironment value forkedProcesses 
+		allSatisfy: [ :each | each isTerminated ]] whileFalse: [ 
+			Processor yield ]
diff --git a/ReadWriteLock-Tests.package/LocksTestCase.class/instance/waitUntil..st b/ReadWriteLock-Tests.package/LocksTestCase.class/instance/waitUntil..st
@@ -0,0 +1,4 @@
+helpers
+waitUntil: conditionBlock
+	
+	conditionBlock whileFalse: [Processor yield]
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testFailedReadShouldUnblockWrite.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testFailedReadShouldUnblockWrite.st
@@ -6,7 +6,7 @@ testFailedReadShouldUnblockWrite
 		[lock criticalRead: [ 10 milliSeconds wait. self error: 'failed read']] ifError: [  ]
 	].	
 	self fork: [lock criticalWrite: [ executed := true ]].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	executed should be: true
 	
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testFailedWriteShouldUnblockRead.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testFailedWriteShouldUnblockRead.st
@@ -6,7 +6,7 @@ testFailedWriteShouldUnblockRead
 		[lock criticalWrite: [ 10 milliSeconds wait. self error: 'failed write']] ifError: [  ]
 	].	
 	self fork: [lock criticalRead: [ executed := true ]].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	executed should be: true
 	
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testMultipleReadsShouldNotBlockEachOthers.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testMultipleReadsShouldNotBlockEachOthers.st
@@ -10,7 +10,7 @@ testMultipleReadsShouldNotBlockEachOthers
 			firstReadExecutedAfterLast := lastReadExecuted]
 	].	
 	self fork: [lock criticalRead: [ lastReadExecuted := true ]].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	lastReadExecuted should be: true.
 	firstReadExecutedAfterLast should be: true
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testMultipleWritesShouldWaitEachOther.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testMultipleWritesShouldWaitEachOther.st
@@ -10,7 +10,7 @@ testMultipleWritesShouldWaitEachOther
 			lastWriteExecutedAfterFirst := lastWriteExecuted not]
 	].	
 	self fork: [lock criticalWrite: [ lastWriteExecuted := true ]].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	lastWriteExecuted should be: true.
 	lastWriteExecutedAfterFirst should be: true.
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testReadShouldWaitTwoRecursiveWritesInSameProcess.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testReadShouldWaitTwoRecursiveWritesInSameProcess.st
@@ -12,7 +12,7 @@ testReadShouldWaitTwoRecursiveWritesInSameProcess
 		].
 	].
 	self fork: [ lock criticalRead: [ readExecuted := true ] ].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	readExecuted should be: true.
 	readExecutedAfterWrites should be: true
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testReadShouldWaitWrite.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testReadShouldWaitWrite.st
@@ -10,7 +10,7 @@ testReadShouldWaitWrite
 			readExecutedAfterWrite := readExecuted not]
 	].	
 	self fork: [lock criticalRead: [ readExecuted := true ]].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	readExecuted should be: true.
 	readExecutedAfterWrite should be: true.
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testRecursiveReadAndWriteInsideSameProcess.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testRecursiveReadAndWriteInsideSameProcess.st
@@ -6,6 +6,6 @@ testRecursiveReadAndWriteInsideSameProcess
 		lock criticalRead: [ 
 			lock criticalWrite: [executed := true]].
 	].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	executed should be: true
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testRecursiveReadsInsideSameProcess.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testRecursiveReadsInsideSameProcess.st
@@ -6,6 +6,6 @@ testRecursiveReadsInsideSameProcess
 		lock criticalRead: [ 
 			lock criticalRead: [executed := true]].
 	].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	executed should be: true
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testRecursiveWriteAndReadInsideSameProcess.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testRecursiveWriteAndReadInsideSameProcess.st
@@ -7,6 +7,6 @@ testRecursiveWriteAndReadInsideSameProcess
 			lock criticalRead: [executed := true]
 		].
 	].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	executed should be: true
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testRecursiveWritesInsideSameProcess.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testRecursiveWritesInsideSameProcess.st
@@ -7,6 +7,6 @@ testRecursiveWritesInsideSameProcess
 			lock criticalWrite: [executed := true]
 		].
 	].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	executed should be: true
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testTerminatingReadWhichWaitingWriteAndAnotherRead.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testTerminatingReadWhichWaitingWriteAndAnotherRead.st
@@ -1,20 +1,25 @@
 tests
 testTerminatingReadWhichWaitingWriteAndAnotherRead
 
-	| lastReadExecutedAfterWrite lastReaderExecuted secondReaderExecuted secondReader |
+	| lastReadExecutedAfterWrite lastReaderExecuted secondReaderExecuted secondReader syncSemaphore writeSemaphore |
 	lastReadExecutedAfterWrite := false.
 	secondReaderExecuted := false.
 	lastReaderExecuted := false.
-
+	syncSemaphore := Semaphore new.
+	writeSemaphore := Semaphore new.
 	self fork: [
-		lock criticalWrite: [ 10 milliSeconds wait. 
+		lock criticalWrite: [ syncSemaphore signal. writeSemaphore wait. 
 			lastReadExecutedAfterWrite := lastReaderExecuted not ]
 	].	
+	syncSemaphore wait.
 	secondReader := self fork: [lock criticalRead: [ secondReaderExecuted := true ]].	
 	self fork: [lock criticalRead: [ lastReaderExecuted := true ]].
-	10 milliSeconds wait.
+	
+	self passForkedProcesses.
+	lastReaderExecuted should be: false.
 	secondReader terminate.
-	15 milliSeconds wait.	
+	writeSemaphore signal.
+	self waitForkedProcesses.
 	lastReaderExecuted should be: true.
 	secondReaderExecuted should be: false.
 	lastReadExecutedAfterWrite should be: true
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testTerminatingWriteWhichWaitingAnotherTwoWrites.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testTerminatingWriteWhichWaitingAnotherTwoWrites.st
@@ -1,20 +1,25 @@
 tests
 testTerminatingWriteWhichWaitingAnotherTwoWrites
 
-	| lastWriteExecutedAfterFirst lastWriteExecuted secondWriteExecuted secondWriter |
+	| lastWriteExecutedAfterFirst lastWriteExecuted secondWriteExecuted secondWriter syncSemaphore writeSemaphore |
 	lastWriteExecutedAfterFirst := false.
 	secondWriteExecuted := false.
 	lastWriteExecuted := false.
-
+	syncSemaphore := Semaphore new.
+	writeSemaphore := Semaphore new.
 	self fork: [
-		lock criticalWrite: [ 10 milliSeconds wait. 
+		lock criticalWrite: [ syncSemaphore signal. writeSemaphore wait.
 			lastWriteExecutedAfterFirst := lastWriteExecuted not ]
 	].	
+	syncSemaphore wait.
 	secondWriter := self fork: [lock criticalWrite: [ secondWriteExecuted := true ]].	
 	self fork: [lock criticalWrite: [ lastWriteExecuted := true ]].
-	5 milliSeconds wait.
+	
+	self passForkedProcesses.
+	lastWriteExecuted should be: false.
 	secondWriter terminate.
-	15 milliSeconds wait.	
+	writeSemaphore signal.	
+	self waitForkedProcesses.
 	lastWriteExecuted should be: true.
 	secondWriteExecuted should be: false.
 	lastWriteExecutedAfterFirst should be: true
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testWriteShouldWaitRead.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testWriteShouldWaitRead.st
@@ -10,7 +10,7 @@ testWriteShouldWaitRead
 			writeExecutedAfterRead := writeExecuted not ]
 	].	
 	self fork: [lock criticalWrite: [ writeExecuted := true ]].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	writeExecuted should be: true.
 	writeExecutedAfterRead should be: true.
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testWriteShouldWaitThreeRecursiveReadReadWriteInSameProcess.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testWriteShouldWaitThreeRecursiveReadReadWriteInSameProcess.st
@@ -11,7 +11,7 @@ testWriteShouldWaitThreeRecursiveReadReadWriteInSameProcess
 		].
 	].
 	self fork: [ lock criticalWrite: [ lastWriteExecuted := true ] ].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	lastWriteExecuted should be: true.
 	lastWriteExecutedAfterRecursiveWriteRead should be: true
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testWriteShouldWaitThreeRecursiveReadWriteWriteInSameProcess.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testWriteShouldWaitThreeRecursiveReadWriteWriteInSameProcess.st
@@ -11,7 +11,7 @@ testWriteShouldWaitThreeRecursiveReadWriteWriteInSameProcess
 		].
 	].
 	self fork: [ lock criticalWrite: [ lastWriteExecuted := true ] ].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	lastWriteExecuted should be: true.
 	lastWriteExecutedAfterRecursiveWriteRead should be: true
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testWriteShouldWaitTwoRead.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testWriteShouldWaitTwoRead.st
@@ -11,7 +11,7 @@ testWriteShouldWaitTwoRead
 			writeExecutedAfterRead := writeExecuted not ].		
 	].	
 	self fork: [lock criticalWrite: [ writeExecuted := true ]].
-	35 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	writeExecuted should be: true.
 	writeExecutedAfterRead should be: true.
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testWriteShouldWaitTwoRecursiveReadWriteInSameProcess.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testWriteShouldWaitTwoRecursiveReadWriteInSameProcess.st
@@ -12,7 +12,7 @@ testWriteShouldWaitTwoRecursiveReadWriteInSameProcess
 		].
 	].
 	self fork: [ lock criticalWrite: [ lastWriteExecuted := true ] ].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	lastWriteExecuted should be: true.
 	lastWriteExecutedAfterRecursiveWriteRead should be: true
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testWriteShouldWaitTwoRecursiveWriteReadInSameProcess.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testWriteShouldWaitTwoRecursiveWriteReadInSameProcess.st
@@ -12,7 +12,7 @@ testWriteShouldWaitTwoRecursiveWriteReadInSameProcess
 		].
 	].
 	self fork: [ lock criticalWrite: [ lastWriteExecuted := true ] ].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	lastWriteExecuted should be: true.
 	lastWriteExecutedAfterRecursiveWriteRead should be: true

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +helpers
 +waitUntil: conditionBlock
++
 +	conditionBlock whileFalse: [Processor yield]