Handle purging empty queue

src/BaselineOfTestWorkers/BaselineOfTestWorkers.class.st

@@ -44,7 +44,7 @@ BaselineOfTestWorkers >> baseline: spec [
 				package: 'TestWorkers-Worker' with: [ spec requires: #('TestWorkers-Connector') ];
 				package: 'TestWorkers-Client' with: [ spec requires: #('TestWorkers-Connector') ];
 				package: 'TestWorkers-UI' with: [ spec requires: #('TestWorkers-Client') ];
-				package: 'TestWorkers-Connector-Tests' with: [ spec requires: #('TestWorkers-Connector') ];
+
 				package: 'TestWorkers-Changes-Tests' with: [ spec requires: 'TestWorkers-Changes' ].
 
 			"Groups"

src/TestWorkers-Client/TWClient.class.st

@@ -89,8 +89,7 @@ TWClient >> processName [
 
 { #category : #operations }
 TWClient >> purgePendingMessages [
-
-	(self queueNamed: 'testRequest') purge
+	(self queueNamed: 'testRequest' ifNone: [^self]) purge
 ]
 
 { #category : #accessing }
@@ -122,6 +121,31 @@ TWClient >> resetResults [
 
 ]
 
+{ #category : #running }
+TWClient >> runMultipleTest: aMultipleTest [
+
+	| request |
+
+	request := TWMultipleTestRequest new
+		tests: aMultipleTest tests;
+		yourself.
+
+	self runRequest: request
+
+
+]
+
+{ #category : #running }
+TWClient >> runRequest: aTWTestRequest [
+
+	requests at: aTWTestRequest uuid asString put: aTWTestRequest.
+
+	"RabbitMQ likes to close the connection. This ensures we retry until we are able to connect again."
+	self ensureNetworkSuccess: [ aTWTestRequest sendOn: connection ]
+
+
+]
+
 { #category : #running }
 TWClient >> runSingleTest: aSingleTest [ 
 
@@ -132,27 +156,21 @@ TWClient >> runSingleTest: aSingleTest [
 		testSelector: aSingleTest testSelector;
 		yourself.
 
-	requests at: request uuid asString put: request.
-
-	"RabbitMQ likes to close the connection. This ensures we retry until we are able to connect again."
-	self ensureNetworkSuccess: [ request sendOn: connection ]
+	self runRequest: request
 
 
 ]
 
-{ #category : #operations }
+{ #category : #running }
 TWClient >> runTestClass: aTestCase [
 
 	| request |
 
-	request := TWTestRequest new
+	request := TWClassTestRequest new
 		testClassName: aTestCase name;
 		yourself.
 
-	requests at: request uuid asString put: request.
-
-	"RabbitMQ likes to close the connection. This ensures we retry until we are able to connect again."
-	self ensureNetworkSuccess: [ request sendOn: connection ]
+	self runRequest: request
 
 
 ]

src/TestWorkers-Connector/TWAbstractConnected.class.st

@@ -181,8 +181,7 @@ TWAbstractConnected >> processRequest [
 
 { #category : #configuration }
 TWAbstractConnected >> queueNamed: aName [
-
-	^ self rqServer queues detect: [ :e | e name = aName ].
+	^self queueNamed: aName ifNone: [self error: 'The queue doesn''t exixts!']
 ]
 
 { #category : #configuration }

src/TestWorkers-Connector/TWClassTestRequest.class.st

@@ -0,0 +1,18 @@
+Class {
+	#name : #TWClassTestRequest,
+	#superclass : #TWTestRequest,
+	#instVars : [
+		'testClassName'
+	],
+	#category : #'TestWorkers-Connector'
+}
+
+{ #category : #accessing }
+TWClassTestRequest >> testClassName [
+	^ testClassName
+]
+
+{ #category : #accessing }
+TWClassTestRequest >> testClassName: anObject [
+	testClassName := anObject
+]

src/TestWorkers-Connector/TWMultipleTestRequest.class.st

@@ -0,0 +1,20 @@
+Class {
+	#name : #TWMultipleTestRequest,
+	#superclass : #TWTestRequest,
+	#instVars : [
+		'tests'
+	],
+	#category : #'TestWorkers-Connector'
+}
+
+{ #category : #accessing }
+TWMultipleTestRequest >> tests [
+
+	^ tests
+]
+
+{ #category : #accessing }
+TWMultipleTestRequest >> tests: aCollection [
+
+	tests := aCollection
+]

src/TestWorkers-Connector/TWSingleTestRequest.class.st

@@ -1,23 +1,12 @@
 Class {
 	#name : #TWSingleTestRequest,
-	#superclass : #TWTestRequest,
+	#superclass : #TWClassTestRequest,
 	#instVars : [
 		'testSelector'
 	],
 	#category : #'TestWorkers-Connector'
 }
 
-{ #category : #testing }
-TWSingleTestRequest >> executionResponseFor: testResults [
-
-	^ TWSingleTestResponse new
-		  testResults: testResults;
-		  testClassName: self testClassName;
-		  testSelector: self testSelector;
-		  uuid: self uuid;
-		  yourself
-]
-
 { #category : #accessing }
 TWSingleTestRequest >> testSelector [
 

src/TestWorkers-Connector/TWTestExecutionError.class.st

@@ -2,9 +2,9 @@ Class {
 	#name : #TWTestExecutionError,
 	#superclass : #TWMessage,
 	#instVars : [
-		'testClassName',
 		'exceptionMessage',
-		'serializedException'
+		'serializedException',
+		'testRequest'
 	],
 	#category : #'TestWorkers-Connector'
 }
@@ -49,11 +49,11 @@ TWTestExecutionError >> serializedException: anObject [
 ]
 
 { #category : #accessing }
-TWTestExecutionError >> testClassName [
-	^ testClassName
+TWTestExecutionError >> testRequest [
+	^ testRequest
 ]
 
 { #category : #accessing }
-TWTestExecutionError >> testClassName: anObject [
-	testClassName := anObject
+TWTestExecutionError >> testRequest: anObject [
+	testRequest := anObject
 ]

src/TestWorkers-Connector/TWTestRequest.class.st

@@ -1,18 +1,9 @@
 Class {
 	#name : #TWTestRequest,
 	#superclass : #TWMessage,
-	#instVars : [
-		'testClassName'
-	],
 	#category : #'TestWorkers-Connector'
 }
 
-{ #category : #testing }
-TWTestRequest >> buildSuite [
-
-	^ (self class environment classNamed: testClassName) buildSuite 
-]
-
 { #category : #converting }
 TWTestRequest >> execute: client [
 
@@ -24,7 +15,7 @@ TWTestRequest >> executionResponseFor: testResults [
 
 	^ TWTestResponse new
 		  testResults: testResults;
-		  testClassName: self testClassName;
+		  testRequest: self;
 		  uuid: self uuid;
 		  yourself
 ]
@@ -41,13 +32,3 @@ TWTestRequest >> queueName [
 	^ 'testRequest'
 
 ]
-
-{ #category : #accessing }
-TWTestRequest >> testClassName [
-	^ testClassName
-]
-
-{ #category : #accessing }
-TWTestRequest >> testClassName: anObject [
-	testClassName := anObject
-]

src/TestWorkers-Connector/TWTestResponse.class.st

@@ -3,7 +3,7 @@ Class {
 	#superclass : #TWMessage,
 	#instVars : [
 		'testResults',
-		'testClassName'
+		'testRequest'
 	],
 	#category : #'TestWorkers-Connector'
 }
@@ -18,7 +18,7 @@ TWTestResponse >> execute: client [
 TWTestResponse >> handleSendError: anError on: connection [
 
 	TWTestExecutionError new
-		testClassName: testClassName;
+		testRequest: testRequest;
 		exceptionMessage: anError class name printString , anError messageText printString;
 		serializedException: (self tryToSerialize: anError);
 		uuid: self uuid;
@@ -34,13 +34,13 @@ TWTestResponse >> queueName [
 ]
 
 { #category : #accessing }
-TWTestResponse >> testClassName [
-	^ testClassName
+TWTestResponse >> testRequest [
+	^ testRequest
 ]
 
 { #category : #accessing }
-TWTestResponse >> testClassName: anObject [
-	testClassName := anObject
+TWTestResponse >> testRequest: anObject [
+	testRequest := anObject
 ]
 
 { #category : #accessing }

src/TestWorkers-UI/TWClassTestRequest.extension.st

@@ -0,0 +1,18 @@
+Extension { #name : #TWClassTestRequest }
+
+{ #category : #'*TestWorkers-UI' }
+TWClassTestRequest >> buildSuite [
+
+	^ (self class environment classNamed: testClassName) buildSuite 
+]
+
+{ #category : #'*TestWorkers-UI' }
+TWClassTestRequest >> drTestsBrowse [
+	(self class environment at: testClassName) browse
+]
+
+{ #category : #'*TestWorkers-UI' }
+TWClassTestRequest >> drTestsName [
+
+	^ testClassName asString
+]

src/TestWorkers-UI/TWMultipleTestItem.class.st

@@ -0,0 +1,44 @@
+Class {
+	#name : #TWMultipleTestItem,
+	#superclass : #Object,
+	#instVars : [
+		'testClass',
+		'testSelector',
+		'tests'
+	],
+	#category : #'TestWorkers-UI'
+}
+
+{ #category : #actions }
+TWMultipleTestItem >> drTestsBrowse [
+]
+
+{ #category : #actions }
+TWMultipleTestItem >> isAbstract [
+
+	^ false
+]
+
+{ #category : #actions }
+TWMultipleTestItem >> name [
+
+	^ ', ' join: (tests collect: [ :test | test key , ' >> ' , test value ])
+]
+
+{ #category : #actions }
+TWMultipleTestItem >> runTestInClient: client [ 
+
+	^ client runMultipleTest: self
+]
+
+{ #category : #actions }
+TWMultipleTestItem >> tests [
+
+	^ tests
+]
+
+{ #category : #actions }
+TWMultipleTestItem >> tests: aCollection [
+
+	tests := aCollection
+]

src/TestWorkers-UI/TWMultipleTestRequest.extension.st

@@ -0,0 +1,24 @@
+Extension { #name : #TWMultipleTestRequest }
+
+{ #category : #'*TestWorkers-UI' }
+TWMultipleTestRequest >> buildSuite [
+
+	| suite |
+
+	suite := TestSuite new.
+	tests do: [ :test |
+		suite addTest: ((self class environment classNamed: test key) selector: test value).
+	].
+
+	^ suite.
+]
+
+{ #category : #'*TestWorkers-UI' }
+TWMultipleTestRequest >> drTestsBrowse [
+]
+
+{ #category : #'*TestWorkers-UI' }
+TWMultipleTestRequest >> drTestsName [
+
+	^ ', ' join: (tests collect: [ :test | test key asString , ' >> ' , test value asString ])
+]

src/TestWorkers-UI/TWTestExecutionError.extension.st

@@ -3,11 +3,11 @@ Extension { #name : #TWTestExecutionError }
 { #category : #'*TestWorkers-UI' }
 TWTestExecutionError >> drTestsBrowse [
 
-	(self class environment at: testClassName) browse
+	testRequest drTestsBrowse
 ]
 
 { #category : #'*TestWorkers-UI' }
 TWTestExecutionError >> drTestsName [
 
-	^ testClassName , ' - ' , exceptionMessage
+	^ testRequest drTestsName , ' - ' , exceptionMessage
 ]