Fix tests broken do to NeoJSON updates

ba-st · Nov 21, 2023 · 767df30 · 767df30
1 parent 946a43e
commit 767df30
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 44 deletions.
diff --git a/...e/Stargate-Application-Configuration-Tests/ApplicationConfigurationPluginAPITest.class.st b/...e/Stargate-Application-Configuration-Tests/ApplicationConfigurationPluginAPITest.class.st
@@ -2,18 +2,19 @@
 I'm the test case for the Application Configuration API
 "
 Class {
-	#name : #ApplicationConfigurationPluginAPITest,
-	#superclass : #OperationalPluginAPITest,
-	#category : #'Stargate-Application-Configuration-Tests'
+	#name : 'ApplicationConfigurationPluginAPITest',
+	#superclass : 'OperationalPluginAPITest',
+	#category : 'Stargate-Application-Configuration-Tests',
+	#package : 'Stargate-Application-Configuration-Tests'
 }
 
-{ #category : #private }
+{ #category : 'private' }
 ApplicationConfigurationPluginAPITest >> configurationParameters [
 
 	^ Array with: ( MandatoryConfigurationParameter named: 'Public URL' describedBy: 'Public URL' )
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 ApplicationConfigurationPluginAPITest >> configurationProvider [
 
 	^ [ 
@@ -23,7 +24,7 @@ ApplicationConfigurationPluginAPITest >> configurationProvider [
 	  ]
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 ApplicationConfigurationPluginAPITest >> operationsConfiguration [
 
 	^ super operationsConfiguration
@@ -36,13 +37,13 @@ ApplicationConfigurationPluginAPITest >> operationsConfiguration [
 		yourself
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 ApplicationConfigurationPluginAPITest >> requiredPermissions [
 
 	^ #('read:application-configuration')
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 ApplicationConfigurationPluginAPITest >> testDisablePlugin [
 
 	self assertIsEnabled: ApplicationConfigurationPlugin.
@@ -62,7 +63,7 @@ ApplicationConfigurationPluginAPITest >> testDisablePlugin [
 		withExceptionDo: [ :error | self assert: error response isNotFound ]
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 ApplicationConfigurationPluginAPITest >> testEnablePreviouslyDisabledPlugin [
 
 	self assertIsEnabled: ApplicationConfigurationPlugin.
@@ -76,7 +77,7 @@ ApplicationConfigurationPluginAPITest >> testEnablePreviouslyDisabledPlugin [
 	self testGetConfigurationWithPermissions
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 ApplicationConfigurationPluginAPITest >> testGetConfigurationWithPermissions [
 
 	| response |

diff --git a/...plication-Configuration-Tests/ApplicationConfigurationPluginConfigurationAPITest.class.st b/...plication-Configuration-Tests/ApplicationConfigurationPluginConfigurationAPITest.class.st
@@ -2,26 +2,27 @@
 I'm a test for API configuration options
 "
 Class {
-	#name : #ApplicationConfigurationPluginConfigurationAPITest,
-	#superclass : #OperationalPluginAPITest,
-	#category : #'Stargate-Application-Configuration-Tests'
+	#name : 'ApplicationConfigurationPluginConfigurationAPITest',
+	#superclass : 'OperationalPluginAPITest',
+	#category : 'Stargate-Application-Configuration-Tests',
+	#package : 'Stargate-Application-Configuration-Tests'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 ApplicationConfigurationPluginConfigurationAPITest >> operationsConfiguration [
 
 	^ super operationsConfiguration
 		at: ApplicationConfigurationPlugin endpoint put: { #enabled -> false } asDictionary;
 		yourself
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 ApplicationConfigurationPluginConfigurationAPITest >> requiredPermissions [
 
 	^ #('read:application-configuration')
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 ApplicationConfigurationPluginConfigurationAPITest >> testPluginIsDisabled [
 
 	self

diff --git a/source/Stargate-Application-Configuration-Tests/ApplicationConfigurationPluginTest.class.st b/source/Stargate-Application-Configuration-Tests/ApplicationConfigurationPluginTest.class.st
@@ -2,12 +2,13 @@
 An ApplicationConfigurationPluginTest is a test class for testing the behavior of ApplicationConfigurationPlugin
 "
 Class {
-	#name : #ApplicationConfigurationPluginTest,
-	#superclass : #TestCase,
-	#category : #'Stargate-Application-Configuration-Tests'
+	#name : 'ApplicationConfigurationPluginTest',
+	#superclass : 'TestCase',
+	#category : 'Stargate-Application-Configuration-Tests',
+	#package : 'Stargate-Application-Configuration-Tests'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 ApplicationConfigurationPluginTest >> configuration [
 
 	^ Dictionary new
@@ -20,7 +21,7 @@ ApplicationConfigurationPluginTest >> configuration [
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 ApplicationConfigurationPluginTest >> configurationParameters [
 
 	^ Array
@@ -35,7 +36,7 @@ ApplicationConfigurationPluginTest >> configurationParameters [
 				    convertingWith: [ :value | value = 'true' ] )
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 ApplicationConfigurationPluginTest >> configurationProvider [
 
 	^ [ 
@@ -46,7 +47,7 @@ ApplicationConfigurationPluginTest >> configurationProvider [
 	  ]
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 ApplicationConfigurationPluginTest >> testConfigurationAccessing [
 
 	| plugin parameter |
@@ -74,19 +75,19 @@ ApplicationConfigurationPluginTest >> testConfigurationAccessing [
 		assert: ( plugin currentValueFor: parameter )
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 ApplicationConfigurationPluginTest >> testEnabledByDefault [
 
 	self deny: ApplicationConfigurationPlugin enabledByDefault
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 ApplicationConfigurationPluginTest >> testEndpoint [
 
 	self assert: ApplicationConfigurationPlugin endpoint equals: 'application-configuration'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 ApplicationConfigurationPluginTest >> testPluginName [
 
 	self assert: ApplicationConfigurationPlugin pluginName equals: 'Application Configuration'

diff --git a/...te-Application-Configuration-Tests/ApplicationConfigurationRESTfulControllerTest.class.st b/...te-Application-Configuration-Tests/ApplicationConfigurationRESTfulControllerTest.class.st
@@ -2,12 +2,13 @@
 An ApplicationConfigurationRESTfulControllerTest is a test class for testing the behavior of ApplicationConfigurationRESTfulController
 "
 Class {
-	#name : #ApplicationConfigurationRESTfulControllerTest,
-	#superclass : #OperationalPluginRESTfulControllerTest,
-	#category : #'Stargate-Application-Configuration-Tests'
+	#name : 'ApplicationConfigurationRESTfulControllerTest',
+	#superclass : 'OperationalPluginRESTfulControllerTest',
+	#category : 'Stargate-Application-Configuration-Tests',
+	#package : 'Stargate-Application-Configuration-Tests'
 }
 
-{ #category : #'private - support' }
+{ #category : 'private - support' }
 ApplicationConfigurationRESTfulControllerTest >> configurationParameters [
 
 	^ Array
@@ -25,7 +26,7 @@ ApplicationConfigurationRESTfulControllerTest >> configurationParameters [
 				  asSensitive
 ]
 
-{ #category : #'private - support' }
+{ #category : 'private - support' }
 ApplicationConfigurationRESTfulControllerTest >> configurationProvider [
 
 	^ [ 
@@ -36,7 +37,7 @@ ApplicationConfigurationRESTfulControllerTest >> configurationProvider [
 	  ]
 ]
 
-{ #category : #'private - support' }
+{ #category : 'private - support' }
 ApplicationConfigurationRESTfulControllerTest >> operationsConfiguration [
 
 	^ super operationsConfiguration
@@ -49,15 +50,15 @@ ApplicationConfigurationRESTfulControllerTest >> operationsConfiguration [
 		yourself
 ]
 
-{ #category : #'private - support' }
+{ #category : 'private - support' }
 ApplicationConfigurationRESTfulControllerTest >> setUpResourceController [
 
 	resourceController := ApplicationConfigurationRESTfulController
 		over: ( ApplicationConfigurationPlugin configuredBy: self operationsConfiguration )
 		configuredBy: self operationsConfiguration
 ]
 
-{ #category : #'private - support' }
+{ #category : 'private - support' }
 ApplicationConfigurationRESTfulControllerTest >> testGetConfigurationInJson [
 
 	| response |
@@ -112,13 +113,13 @@ ApplicationConfigurationRESTfulControllerTest >> testGetConfigurationInJson [
 					assert: config attributeName equals: 'secret';
 					assert: config commandLineArgumentName equals: 'vault.secret';
 					assert: config environmentVariableName equals: 'VAULT__SECRET';
-					assert: config sections equals: #( 'Vault' );
+					assert: config sections hasTheSameElementsInTheSameOrderThat: #( 'Vault' );
 					assert: ( config at: #'current-value' ) equals: '**********'
 				]
 			]
 ]
 
-{ #category : #'private - support' }
+{ #category : 'private - support' }
 ApplicationConfigurationRESTfulControllerTest >> testGetConfigurationInPlainText [
 
 	| response |
@@ -137,7 +138,7 @@ ApplicationConfigurationRESTfulControllerTest >> testGetConfigurationInPlainText
 				with: String lf )
 ]
 
-{ #category : #'private - support' }
+{ #category : 'private - support' }
 ApplicationConfigurationRESTfulControllerTest >> withConfigurationNamed: aName in: configurations do: aBlock [
 
 	configurations detect: [ :config | config name = aName ] ifFound: aBlock ifNone: [ self fail ]

diff --git a/source/Stargate-Application-Configuration-Tests/package.st b/source/Stargate-Application-Configuration-Tests/package.st
@@ -1 +1 @@
-Package { #name : #'Stargate-Application-Configuration-Tests' }
+Package { #name : 'Stargate-Application-Configuration-Tests' }
diff --git a/source/Stargate-Examples-Tests/PetOrdersRESTfulControllerTest.class.st b/source/Stargate-Examples-Tests/PetOrdersRESTfulControllerTest.class.st
@@ -593,5 +593,5 @@ PetOrdersRESTfulControllerTest >> testUpdateCommentAcceptingADifferentMediaType
 			assert: response isSuccess;
 			assert: response contentType equals: ZnMimeType applicationJson;
 			withJsonFromContentsIn: response
-			do: [ :json | self assert: json equals: #( 'Hola!' 'Mr. DJ' ) ] ]
+			do: [ :json | self assert: json hasTheSameElementsInTheSameOrderThat: #( 'Hola!' 'Mr. DJ' ) ] ]
 ]
diff --git a/source/Stargate-Examples-Tests/SouthAmericanCurrenciesRESTfulControllerTest.class.st b/source/Stargate-Examples-Tests/SouthAmericanCurrenciesRESTfulControllerTest.class.st
@@ -401,11 +401,12 @@ SouthAmericanCurrenciesRESTfulControllerTest >> testGetCurrencies [
 		assert: response varyHeaderNames includes: 'Accept'.
 	self assertCachingDirectivesFor: response with: #( 'immutable' 'Max-Age=86400' ).
 
-	self withJsonFromContentsIn: response do: [ :currencies | 
+	self withJsonFromContentsIn: response do: [ :currencies |
 		self
 			assert: currencies size equals: 11;
 			assert: ( currencies collect: #isoCode )
-			equals: #( 'ARS' 'BOB' 'BRL' 'CLP' 'COP' 'GYD' 'PYG' 'PEN' 'SRD' 'UYU' 'VES' )
+			hasTheSameElementsInTheSameOrderThat:
+				#( 'ARS' 'BOB' 'BRL' 'CLP' 'COP' 'GYD' 'PYG' 'PEN' 'SRD' 'UYU' 'VES' )
 		]
 ]
 
@@ -414,7 +415,7 @@ SouthAmericanCurrenciesRESTfulControllerTest >> testGetCurrenciesInSpanish [
 
 	| response request |
 
-	request := self requestToGET: self resourceUrl applying: [ :requestConfig | 
+	request := self requestToGET: self resourceUrl applying: [ :requestConfig |
 		           requestConfig
 			           setAccept: resourceController currencyVersion1dot0dot0MediaType;
 			           setAcceptLanguage: self spanish
@@ -433,11 +434,12 @@ SouthAmericanCurrenciesRESTfulControllerTest >> testGetCurrenciesInSpanish [
 		assert: response varyHeaderNames includes: 'Accept'.
 	self assertCachingDirectivesFor: response with: #( 'immutable' 'Max-Age=86400' ).
 
-	self withJsonFromContentsIn: response do: [ :currencies | 
+	self withJsonFromContentsIn: response do: [ :currencies |
 		self
 			assert: currencies size equals: 11;
 			assert: ( currencies collect: #isoCode )
-			equals: #( 'ARS' 'BOB' 'BRL' 'CLP' 'COP' 'GYD' 'PYG' 'PEN' 'SRD' 'UYU' 'VES' );
+			hasTheSameElementsInTheSameOrderThat:
+				#( 'ARS' 'BOB' 'BRL' 'CLP' 'COP' 'GYD' 'PYG' 'PEN' 'SRD' 'UYU' 'VES' );
 			assert: ( currencies anySatisfy: [ :currency | currency name = 'Real brasileño' ] )
 		]
 ]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Package { #name : #'Stargate-Application-Configuration-Tests' }
		Package { #name : 'Stargate-Application-Configuration-Tests' }