Merge pull request #36 from ba-st/use_launchpad_testing

Use Launchpad testing affordances
ba-st · Apr 22, 2024 · 7c640a6 · 7c640a6
2 parents e46aa57 + 874f5b3
commit 7c640a6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 46 deletions.
diff --git a/source/BaselineOfStargateConsul/BaselineOfStargateConsul.class.st b/source/BaselineOfStargateConsul/BaselineOfStargateConsul.class.st
@@ -1,10 +1,11 @@
 Class {
-	#name : #BaselineOfStargateConsul,
-	#superclass : #BaselineOf,
-	#category : #BaselineOfStargateConsul
+	#name : 'BaselineOfStargateConsul',
+	#superclass : 'BaselineOf',
+	#category : 'BaselineOfStargateConsul',
+	#package : 'BaselineOfStargateConsul'
 }
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfStargateConsul >> baseline: spec [
 
 	<baseline>
@@ -20,13 +21,13 @@ BaselineOfStargateConsul >> baseline: spec [
 			]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 BaselineOfStargateConsul >> projectClass [
 
 	^ MetacelloCypressBaselineProject
 ]
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfStargateConsul >> setUpDependencies: spec [
 
 	spec
@@ -37,14 +38,15 @@ BaselineOfStargateConsul >> setUpDependencies: spec [
 
 	spec
 		baseline: 'Launchpad' with: [ spec repository: 'github://ba-st/Launchpad:v5' ];
-		project: 'Launchpad-Deployment' copyFrom: 'Launchpad' with: [ spec loads: 'Deployment' ].
+		project: 'Launchpad-Deployment' copyFrom: 'Launchpad' with: [ spec loads: 'Deployment' ];
+		project: 'Launchpad-SUnit' copyFrom: 'Launchpad' with: [ spec loads: 'Dependent-SUnit-Extensions' ].
 
 	spec
 		baseline: 'Superluminal' with: [ spec repository: 'github://ba-st/Superluminal:v5' ];
 		project: 'Superluminal-API-Client' copyFrom: 'Superluminal' with: [ spec loads: 'API Client' ]
 ]
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfStargateConsul >> setUpPackages: spec [
 
 	spec
@@ -63,6 +65,6 @@ BaselineOfStargateConsul >> setUpPackages: spec [
 
 	spec
 		package: 'Stargate-Consul-Examples-Tests'
-		with: [ spec requires: #( 'Stargate-Consul-Examples' 'Stargate-SUnit' ) ];
+		with: [ spec requires: #( 'Stargate-Consul-Examples' 'Stargate-SUnit' 'Launchpad-SUnit' ) ];
 		group: 'Tests' with: 'Stargate-Consul-Examples-Tests'
 ]
diff --git a/source/BaselineOfStargateConsul/package.st b/source/BaselineOfStargateConsul/package.st
@@ -1 +1 @@
-Package { #name : #BaselineOfStargateConsul }
+Package { #name : 'BaselineOfStargateConsul' }
diff --git a/source/Stargate-Consul-Examples-Tests/StargateConsulExampleTest.class.st b/source/Stargate-Consul-Examples-Tests/StargateConsulExampleTest.class.st
@@ -3,21 +3,14 @@ A StargateConsulExampleTest is a test class for testing the behavior of Stargate
 "
 Class {
 	#name : 'StargateConsulExampleTest',
-	#superclass : 'TestCase',
+	#superclass : 'LaunchpadTest',
 	#instVars : [
-		'application',
 		'port'
 	],
 	#category : 'Stargate-Consul-Examples-Tests',
 	#package : 'Stargate-Consul-Examples-Tests'
 }
 
-{ #category : 'running' }
-StargateConsulExampleTest >> runCase [
-
-	self shouldnt: [ super runCase ] raise: Exit
-]
-
 { #category : 'running' }
 StargateConsulExampleTest >> setUp [
 
@@ -26,32 +19,6 @@ StargateConsulExampleTest >> setUp [
 	StargateConsulExample logsDirectory ensureCreateDirectory
 ]
 
-{ #category : 'running' }
-StargateConsulExampleTest >> start: aLaunchpadApplication withAll: arguments [
-
-	String streamContents: [ :stream | 
-		| context rootCommand |
-
-		rootCommand := LaunchpadRootCommand new.
-		context := LaunchpadCommandLineProcessingContext
-			           handling: ( CommandLineArguments withArguments: { 
-						             'launchpad'.
-						             'start'.
-						             aLaunchpadApplication commandName } , arguments )
-			           writingTo: stream.
-		self assert: ( rootCommand canHandle: ( context nextCommandLineArgumentIfNone: [ self fail ] ) ).
-		rootCommand evaluateWithin: context.
-		application := LaunchpadApplication currentlyRunning
-		]
-]
-
-{ #category : 'running' }
-StargateConsulExampleTest >> tearDown [
-
-	application ifNotNil: [ application stop ].
-	super tearDown
-]
-
 { #category : 'tests' }
 StargateConsulExampleTest >> testDefaultServiceDiscoveryTimeSlotBetweenRetries [
 
@@ -61,7 +28,7 @@ StargateConsulExampleTest >> testDefaultServiceDiscoveryTimeSlotBetweenRetries [
 			'--stargate.operations-secret=secret'.
 			'--stargate.consul-agent-location=' }.
 
-	self assert: application serviceDiscoveryTimeSlotBetweenRetries equals: 100 milliSeconds 
+	self assert: runningApplication serviceDiscoveryTimeSlotBetweenRetries equals: 100 milliSeconds 
 ]
 
 { #category : 'tests' }
@@ -96,7 +63,7 @@ StargateConsulExampleTest >> testStart [
 	response := ZnClient new
 		            beOneShot;
 		            enforceHttpSuccess: true;
-		            get: application configuration stargate publicURL / 'echo' / 'hello'.
+		            get: runningApplication configuration stargate publicURL / 'echo' / 'hello'.
 
 	self assert: response equals: 'HELLO'
 ]