Fix tests in GS64

ba-st · Feb 27, 2024 · 710dfe2 · 710dfe2
1 parent 48bc9d1
commit 710dfe2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/source/Superluminal-RESTfulAPI-Tests/CacheRepositoryTest.class.st b/source/Superluminal-RESTfulAPI-Tests/CacheRepositoryTest.class.st
@@ -36,7 +36,7 @@ CacheRepositoryTest >> resourceFor: answer expiringIn: aDuration [
 CacheRepositoryTest >> setUp [
 
 	super setUp.
-	currentDateTime := DateAndTime now truncated.
+	currentDateTime := DateAndTime now rounded.
 	currentTimeProvider := [ currentDateTime ].
 	self setUpRepository
 ]

diff --git a/source/Superluminal-RESTfulAPI-Tests/DistributedMemoryBasedExpiringCacheTest.class.st b/source/Superluminal-RESTfulAPI-Tests/DistributedMemoryBasedExpiringCacheTest.class.st
@@ -18,5 +18,5 @@ DistributedMemoryBasedExpiringCacheTest >> setUpExpiringCache [
 DistributedMemoryBasedExpiringCacheTest >> waitFor: aDuration [
 
 	currentDateTime := currentDateTime + aDuration.
-	aDuration asDelay wait.
+	aDuration wait.
 ]
diff --git a/source/Superluminal-RESTfulAPI-Tests/DistributedMemoryCacheRepositoryTest.class.st b/source/Superluminal-RESTfulAPI-Tests/DistributedMemoryCacheRepositoryTest.class.st
@@ -17,9 +17,9 @@ DistributedMemoryCacheRepositoryTest >> setUpRepository [
 		persistingTo: ( MDCacheClient onServers: {'127.0.0.1:11211'} )
 ]
 
-{ #category : 'private' }
+{ #category : 'running' }
 DistributedMemoryCacheRepositoryTest >> waitFor: aDuration [
 
 	currentDateTime := currentDateTime + aDuration.
-	aDuration asDelay wait.
+	aDuration wait.
 ]
diff --git a/source/Superluminal-RESTfulAPI/ExpiringResource.class.st b/source/Superluminal-RESTfulAPI/ExpiringResource.class.st
@@ -49,7 +49,7 @@ ExpiringResource >> expirationDateApplyingCacheControlDirectivesIfNone: noneBloc
 		self if: lowercasedDirective isNoCacheDirectiveApplyTo: expirationDates
 		].
 
-	^ expirationDates ifEmpty: [ noneBlock value ] ifNotEmpty: [ :dates | dates min ]
+	^ expirationDates minUsing: [ :date | date ] ifEmpty: noneBlock
 ]
 
 { #category : 'private' }