Skip to content

Commit e2a214d

Browse files
Avery-DunnAvery-Dunn
committed
Consistently use correct order for assertEquals calls
1 parent 91cc4a2 commit e2a214d

11 files changed

Lines changed: 114 additions & 114 deletions

File tree

‎msal4j-sdk/src/integrationtest/java/com/microsoft/aad/msal4j/TokenCacheIT.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ void singleAccountInCache_RemoveAccountTest() throws Exception {
2929
build();
3030

3131
// Check that cache is empty
32-
assertEquals(pca.getAccounts().join().size(), 0);
32+
assertEquals(0, pca.getAccounts().join().size());
3333

3434
Map<String, String> extraQueryParameters = new HashMap<>();
3535
extraQueryParameters.put("test", "test");
@@ -43,12 +43,12 @@ void singleAccountInCache_RemoveAccountTest() throws Exception {
4343
.get();
4444

4545
// Check that cache contains one account
46-
assertEquals(pca.getAccounts().join().size(), 1);
46+
assertEquals(1, pca.getAccounts().join().size());
4747

4848
pca.removeAccount(pca.getAccounts().join().iterator().next()).join();
4949

5050
// Check that account has been removed
51-
assertEquals(pca.getAccounts().join().size(), 0);
51+
assertEquals(0, pca.getAccounts().join().size());
5252
}
5353

5454
@Test

‎msal4j-sdk/src/test/java/com/microsoft/aad/msal4j/AadInstanceDiscoveryTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,9 @@ void aadInstanceDiscoveryTest_AutoDetectRegion_NoRegionDetected() throws Excepti
138138
}
139139

140140
void assertValidResponse(InstanceDiscoveryMetadataEntry entry) {
141-
assertEquals(entry.preferredNetwork(), "login.microsoftonline.com");
142-
assertEquals(entry.preferredCache(), "login.windows.net");
143-
assertEquals(entry.aliases().size(), 4);
141+
assertEquals("login.microsoftonline.com", entry.preferredNetwork());
142+
assertEquals("login.windows.net", entry.preferredCache());
143+
assertEquals(4, entry.aliases().size());
144144
assertTrue(entry.aliases().contains("login.microsoftonline.com"));
145145
assertTrue(entry.aliases().contains("login.windows.net"));
146146
assertTrue(entry.aliases().contains("login.microsoft.com"));

‎msal4j-sdk/src/test/java/com/microsoft/aad/msal4j/AccountTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,22 +91,22 @@ ITokenCacheAccessAspect init(String data) {
9191

9292
Set<IAccount> accounts = pca.getAccounts().join();
9393

94-
assertEquals(accounts.size(), 1);
94+
assertEquals(1, accounts.size());
9595
IAccount account = accounts.iterator().next();
9696

9797
Map<String, ITenantProfile> tenantProfiles = account.getTenantProfiles();
98-
assertEquals(tenantProfiles.size(), 2);
98+
assertEquals(2, tenantProfiles.size());
9999

100100
assertTrue(tenantProfiles.containsKey(BLACK_FORESRT_TENANT));
101101
assertTrue(tenantProfiles.containsKey(WW_TENTANT));
102102

103103
pca.removeAccount(account).join();
104104
accounts = pca.getAccounts().join();
105-
assertEquals(accounts.size(), 0);
105+
assertEquals(0, accounts.size());
106106

107-
assertEquals(pca.tokenCache.accounts.size(), 0);
108-
assertEquals(pca.tokenCache.idTokens.size(), 0);
109-
assertEquals(pca.tokenCache.refreshTokens.size(), 0);
110-
assertEquals(pca.tokenCache.accessTokens.size(), 0);
107+
assertEquals(0, pca.tokenCache.accounts.size());
108+
assertEquals(0, pca.tokenCache.idTokens.size());
109+
assertEquals(0, pca.tokenCache.refreshTokens.size());
110+
assertEquals(0, pca.tokenCache.accessTokens.size());
111111
}
112112
}

‎msal4j-sdk/src/test/java/com/microsoft/aad/msal4j/AuthorityTest.java‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,31 @@ class AuthorityTest {
1919
@Test
2020
void testDetectAuthorityType_AAD() throws Exception {
2121
URL url = new URL(TestConfiguration.AAD_TENANT_ENDPOINT);
22-
assertEquals(Authority.detectAuthorityType(url), AuthorityType.AAD);
22+
assertEquals(AuthorityType.AAD, Authority.detectAuthorityType(url));
2323
}
2424

2525
@Test
2626
void testDetectAuthorityType_ADFS() throws Exception {
2727
URL url = new URL(TestConfiguration.ADFS_TENANT_ENDPOINT);
28-
assertEquals(Authority.detectAuthorityType(url), AuthorityType.ADFS);
28+
assertEquals(AuthorityType.ADFS, Authority.detectAuthorityType(url));
2929
}
3030

3131
@Test
3232
void testDetectAuthorityType_B2C() throws Exception {
3333
URL url = new URL(TestConfiguration.B2C_AUTHORITY);
34-
assertEquals(Authority.detectAuthorityType(url), AuthorityType.B2C);
34+
assertEquals(AuthorityType.B2C, Authority.detectAuthorityType(url));
3535
}
3636

3737
@ParameterizedTest
3838
@MethodSource("com.microsoft.aad.msal4j.AuthorityTest#ciamAuthorities")
3939
void testDetectAuthorityType_CIAM(URL authority) throws Exception {
40-
assertEquals(Authority.detectAuthorityType(authority), AuthorityType.CIAM);
40+
assertEquals(AuthorityType.CIAM, Authority.detectAuthorityType(authority));
4141
}
4242

4343
@ParameterizedTest
4444
@MethodSource("com.microsoft.aad.msal4j.AuthorityTest#validCiamAuthoritiesAndTransformedAuthority")
4545
void testCiamAuthorityTransformation(URL authority, URL transformedAuthority) throws Exception {
46-
assertEquals(CIAMAuthority.transformAuthority(authority), transformedAuthority);
46+
assertEquals(transformedAuthority, CIAMAuthority.transformAuthority(authority));
4747
}
4848

4949
@Test
@@ -100,51 +100,51 @@ void testValidateAuthorityEmptyPath() {
100100
void testConstructor_AADAuthority() throws MalformedURLException {
101101
final AADAuthority aa = new AADAuthority(new URL(TestConfiguration.AAD_TENANT_ENDPOINT));
102102
assertNotNull(aa);
103-
assertEquals(aa.authority(),
104-
TestConfiguration.AAD_TENANT_ENDPOINT);
105-
assertEquals(aa.host(), TestConfiguration.AAD_HOST_NAME);
106-
assertEquals(aa.tokenEndpoint(),
107-
TestConfiguration.AAD_TENANT_ENDPOINT + "oauth2/v2.0/token");
108-
assertEquals(aa.selfSignedJwtAudience(),
109-
TestConfiguration.AAD_TENANT_ENDPOINT + "oauth2/v2.0/token");
110-
assertEquals(aa.tokenEndpoint(),
111-
TestConfiguration.AAD_TENANT_ENDPOINT + "oauth2/v2.0/token");
112-
assertEquals(aa.authorityType(), AuthorityType.AAD);
103+
assertEquals(TestConfiguration.AAD_TENANT_ENDPOINT,
104+
aa.authority());
105+
assertEquals(TestConfiguration.AAD_HOST_NAME, aa.host());
106+
assertEquals(TestConfiguration.AAD_TENANT_ENDPOINT + "oauth2/v2.0/token",
107+
aa.tokenEndpoint());
108+
assertEquals(TestConfiguration.AAD_TENANT_ENDPOINT + "oauth2/v2.0/token",
109+
aa.selfSignedJwtAudience());
110+
assertEquals(TestConfiguration.AAD_TENANT_ENDPOINT + "oauth2/v2.0/token",
111+
aa.tokenEndpoint());
112+
assertEquals(AuthorityType.AAD, aa.authorityType());
113113
assertFalse(aa.isTenantless());
114-
assertEquals(aa.deviceCodeEndpoint(),
115-
TestConfiguration.AAD_TENANT_ENDPOINT + "oauth2/v2.0/devicecode");
114+
assertEquals(TestConfiguration.AAD_TENANT_ENDPOINT + "oauth2/v2.0/devicecode",
115+
aa.deviceCodeEndpoint());
116116
}
117117

118118
@Test
119119
void testConstructor_B2CAuthority() throws MalformedURLException {
120120
final B2CAuthority aa = new B2CAuthority(new URL(TestConfiguration.B2C_AUTHORITY));
121121
assertNotNull(aa);
122-
assertEquals(aa.authority(),
123-
TestConfiguration.B2C_AUTHORITY + "/");
124-
assertEquals(aa.host(), TestConfiguration.B2C_HOST_NAME);
125-
assertEquals(aa.selfSignedJwtAudience(),
126-
TestConfiguration.B2C_AUTHORITY_ENDPOINT + "/oauth2/v2.0/token?p=" + TestConfiguration.B2C_SIGN_IN_POLICY);
127-
assertEquals(aa.tokenEndpoint(),
128-
TestConfiguration.B2C_AUTHORITY_ENDPOINT + "/oauth2/v2.0/token?p=" + TestConfiguration.B2C_SIGN_IN_POLICY);
129-
assertEquals(aa.authorityType(), AuthorityType.B2C);
130-
assertEquals(aa.tokenEndpoint(),
131-
TestConfiguration.B2C_AUTHORITY_ENDPOINT + "/oauth2/v2.0/token?p=" + TestConfiguration.B2C_SIGN_IN_POLICY);
122+
assertEquals(TestConfiguration.B2C_AUTHORITY + "/",
123+
aa.authority());
124+
assertEquals(TestConfiguration.B2C_HOST_NAME, aa.host());
125+
assertEquals(TestConfiguration.B2C_AUTHORITY_ENDPOINT + "/oauth2/v2.0/token?p=" + TestConfiguration.B2C_SIGN_IN_POLICY,
126+
aa.selfSignedJwtAudience());
127+
assertEquals(TestConfiguration.B2C_AUTHORITY_ENDPOINT + "/oauth2/v2.0/token?p=" + TestConfiguration.B2C_SIGN_IN_POLICY,
128+
aa.tokenEndpoint());
129+
assertEquals(AuthorityType.B2C, aa.authorityType());
130+
assertEquals(TestConfiguration.B2C_AUTHORITY_ENDPOINT + "/oauth2/v2.0/token?p=" + TestConfiguration.B2C_SIGN_IN_POLICY,
131+
aa.tokenEndpoint());
132132
assertFalse(aa.isTenantless());
133133
}
134134

135135
@Test
136136
void testConstructor_ADFSAuthority() throws MalformedURLException {
137137
final ADFSAuthority a = new ADFSAuthority(new URL(TestConfiguration.ADFS_TENANT_ENDPOINT));
138138
assertNotNull(a);
139-
assertEquals(a.authority(), TestConfiguration.ADFS_TENANT_ENDPOINT);
140-
assertEquals(a.host(), TestConfiguration.ADFS_HOST_NAME);
141-
assertEquals(a.selfSignedJwtAudience(),
142-
TestConfiguration.ADFS_TENANT_ENDPOINT + ADFSAuthority.TOKEN_ENDPOINT);
139+
assertEquals(TestConfiguration.ADFS_TENANT_ENDPOINT, a.authority());
140+
assertEquals(TestConfiguration.ADFS_HOST_NAME, a.host());
141+
assertEquals(TestConfiguration.ADFS_TENANT_ENDPOINT + ADFSAuthority.TOKEN_ENDPOINT,
142+
a.selfSignedJwtAudience());
143143

144-
assertEquals(a.authorityType(), AuthorityType.ADFS);
144+
assertEquals(AuthorityType.ADFS, a.authorityType());
145145

146-
assertEquals(a.tokenEndpoint(),
147-
TestConfiguration.ADFS_TENANT_ENDPOINT + ADFSAuthority.TOKEN_ENDPOINT);
146+
assertEquals(TestConfiguration.ADFS_TENANT_ENDPOINT + ADFSAuthority.TOKEN_ENDPOINT,
147+
a.tokenEndpoint());
148148
assertFalse(a.isTenantless());
149149
}
150150

‎msal4j-sdk/src/test/java/com/microsoft/aad/msal4j/AuthorizationRequestUrlParametersTest.java‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ void testBuilder_onlyRequiredParameters() throws UnsupportedEncodingException {
3535
.extraQueryParameters(extraParameters)
3636
.build();
3737

38-
assertEquals(parameters.responseMode(), ResponseMode.FORM_POST);
39-
assertEquals(parameters.redirectUri(), redirectUri);
40-
assertEquals(parameters.scopes().size(), 4);
41-
assertEquals(parameters.extraQueryParameters.size(), 2);
38+
assertEquals(ResponseMode.FORM_POST, parameters.responseMode());
39+
assertEquals(redirectUri, parameters.redirectUri());
40+
assertEquals(4, parameters.scopes().size());
41+
assertEquals(2, parameters.extraQueryParameters.size());
4242

4343
assertNull(parameters.loginHint());
4444
assertNull(parameters.codeChallenge());
@@ -50,8 +50,8 @@ void testBuilder_onlyRequiredParameters() throws UnsupportedEncodingException {
5050

5151
URL authorizationUrl = app.getAuthorizationRequestUrl(parameters);
5252

53-
assertEquals(authorizationUrl.getHost(), "login.microsoftonline.com");
54-
assertEquals(authorizationUrl.getPath(), "/common/oauth2/v2.0/authorize");
53+
assertEquals("login.microsoftonline.com", authorizationUrl.getHost());
54+
assertEquals("/common/oauth2/v2.0/authorize", authorizationUrl.getPath());
5555

5656
Map<String, String> queryParameters = new HashMap<>();
5757
String query = authorizationUrl.getQuery();
@@ -64,12 +64,12 @@ void testBuilder_onlyRequiredParameters() throws UnsupportedEncodingException {
6464
URLDecoder.decode(pair.substring(idx + 1), "UTF-8"));
6565
}
6666

67-
assertEquals(queryParameters.get("scope"), "openid profile offline_access scope");
68-
assertEquals(queryParameters.get("response_type"), "code");
69-
assertEquals(queryParameters.get("redirect_uri"), "http://localhost:8080");
70-
assertEquals(queryParameters.get("client_id"), "client_id");
71-
assertEquals(queryParameters.get("response_mode"), "form_post");
72-
assertEquals(queryParameters.get("id_token_hint"),"test");
67+
assertEquals("openid profile offline_access scope", queryParameters.get("scope"));
68+
assertEquals("code", queryParameters.get("response_type"));
69+
assertEquals("http://localhost:8080", queryParameters.get("redirect_uri"));
70+
assertEquals("client_id", queryParameters.get("client_id"));
71+
assertEquals("form_post", queryParameters.get("response_mode"));
72+
assertEquals("test", queryParameters.get("id_token_hint"));
7373
}
7474

7575
@Test
@@ -110,9 +110,9 @@ void testBuilder_responseMode() throws UnsupportedEncodingException {
110110
.responseMode(ResponseMode.QUERY) // This should be overridden to FORM_POST
111111
.build();
112112

113-
assertEquals(parameters.responseMode(), ResponseMode.FORM_POST);
114-
assertEquals(parameters.redirectUri(), redirectUri);
115-
assertEquals(parameters.scopes().size(), 4);
113+
assertEquals(ResponseMode.FORM_POST, parameters.responseMode());
114+
assertEquals(redirectUri, parameters.redirectUri());
115+
assertEquals(4, parameters.scopes().size());
116116

117117
assertNull(parameters.loginHint());
118118
assertNull(parameters.codeChallenge());
@@ -124,8 +124,8 @@ void testBuilder_responseMode() throws UnsupportedEncodingException {
124124

125125
URL authorizationUrl = app.getAuthorizationRequestUrl(parameters);
126126

127-
assertEquals(authorizationUrl.getHost(), "login.microsoftonline.com");
128-
assertEquals(authorizationUrl.getPath(), "/common/oauth2/v2.0/authorize");
127+
assertEquals("login.microsoftonline.com", authorizationUrl.getHost());
128+
assertEquals("/common/oauth2/v2.0/authorize", authorizationUrl.getPath());
129129

130130
Map<String, String> queryParameters = new HashMap<>();
131131
String query = authorizationUrl.getQuery();
@@ -138,10 +138,10 @@ void testBuilder_responseMode() throws UnsupportedEncodingException {
138138
URLDecoder.decode(pair.substring(idx + 1), "UTF-8"));
139139
}
140140

141-
assertEquals(queryParameters.get("scope"), "openid profile offline_access scope");
142-
assertEquals(queryParameters.get("response_type"), "code");
143-
assertEquals(queryParameters.get("redirect_uri"), "http://localhost:8080");
144-
assertEquals(queryParameters.get("client_id"), "client_id");
145-
assertEquals(queryParameters.get("response_mode"), "form_post");
141+
assertEquals("openid profile offline_access scope", queryParameters.get("scope"));
142+
assertEquals("code", queryParameters.get("response_type"));
143+
assertEquals("http://localhost:8080", queryParameters.get("redirect_uri"));
144+
assertEquals("client_id", queryParameters.get("client_id"));
145+
assertEquals("form_post", queryParameters.get("response_mode"));
146146
}
147147
}

‎msal4j-sdk/src/test/java/com/microsoft/aad/msal4j/HelperAndUtilityTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void StringHelper_convertToMultiValueMap() {
7878
assertNotNull(convertedInternalMap, "Converted map should not be null");
7979
assertNotNull(methodReturnedMap, "Method returned map should not be null");
8080

81-
assertEquals(convertedInternalMap.size(), methodReturnedMap.size(), "Maps should have the same size");
81+
assertEquals(methodReturnedMap.size(), convertedInternalMap.size(), "Maps should have the same size");
8282

8383
for (String key : convertedInternalMap.keySet()) {
8484
assertTrue(methodReturnedMap.containsKey(key), "Method returned map should contain key: " + key);

‎msal4j-sdk/src/test/java/com/microsoft/aad/msal4j/HttpHeaderTest.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ void testHttpHeaderConstructor() {
4040

4141
Map<String, String> httpHeaderMap = httpHeaders.getReadonlyHeaderMap();
4242

43-
assertEquals(httpHeaderMap.get(HttpHeaders.PRODUCT_HEADER_NAME), HttpHeaders.PRODUCT_HEADER_VALUE);
44-
assertEquals(httpHeaderMap.get(HttpHeaders.PRODUCT_VERSION_HEADER_NAME), HttpHeaders.PRODUCT_VERSION_HEADER_VALUE);
45-
assertEquals(httpHeaderMap.get(HttpHeaders.OS_HEADER_NAME), HttpHeaders.OS_HEADER_VALUE);
46-
assertEquals(httpHeaderMap.get(HttpHeaders.APPLICATION_NAME_HEADER_NAME), "app-name");
47-
assertEquals(httpHeaderMap.get(HttpHeaders.APPLICATION_VERSION_HEADER_NAME), "app-version");
48-
assertEquals(httpHeaderMap.get(HttpHeaders.CORRELATION_ID_HEADER_NAME), "correlation-id");
43+
assertEquals(HttpHeaders.PRODUCT_HEADER_VALUE, httpHeaderMap.get(HttpHeaders.PRODUCT_HEADER_NAME));
44+
assertEquals(HttpHeaders.PRODUCT_VERSION_HEADER_VALUE, httpHeaderMap.get(HttpHeaders.PRODUCT_VERSION_HEADER_NAME));
45+
assertEquals(HttpHeaders.OS_HEADER_VALUE, httpHeaderMap.get(HttpHeaders.OS_HEADER_NAME));
46+
assertEquals("app-name", httpHeaderMap.get(HttpHeaders.APPLICATION_NAME_HEADER_NAME));
47+
assertEquals("app-version", httpHeaderMap.get(HttpHeaders.APPLICATION_VERSION_HEADER_NAME));
48+
assertEquals("correlation-id", httpHeaderMap.get(HttpHeaders.CORRELATION_ID_HEADER_NAME));
4949
}
5050

5151
@Test
@@ -66,9 +66,9 @@ void testHttpHeaderConstructor_valuesNotSet() {
6666

6767
Map<String, String> httpHeaderMap = httpHeaders.getReadonlyHeaderMap();
6868

69-
assertEquals(httpHeaderMap.get(HttpHeaders.PRODUCT_HEADER_NAME), HttpHeaders.PRODUCT_HEADER_VALUE);
70-
assertEquals(httpHeaderMap.get(HttpHeaders.PRODUCT_VERSION_HEADER_NAME), HttpHeaders.PRODUCT_VERSION_HEADER_VALUE);
71-
assertEquals(httpHeaderMap.get(HttpHeaders.OS_HEADER_NAME), HttpHeaders.OS_HEADER_VALUE);
69+
assertEquals(HttpHeaders.PRODUCT_HEADER_VALUE, httpHeaderMap.get(HttpHeaders.PRODUCT_HEADER_NAME));
70+
assertEquals(HttpHeaders.PRODUCT_VERSION_HEADER_VALUE, httpHeaderMap.get(HttpHeaders.PRODUCT_VERSION_HEADER_NAME));
71+
assertEquals(HttpHeaders.OS_HEADER_VALUE, httpHeaderMap.get(HttpHeaders.OS_HEADER_NAME));
7272
assertNull(httpHeaderMap.get(HttpHeaders.APPLICATION_NAME_HEADER_NAME));
7373
assertNull(httpHeaderMap.get(HttpHeaders.APPLICATION_VERSION_HEADER_NAME));
7474
assertNotNull(httpHeaderMap.get(HttpHeaders.CORRELATION_ID_HEADER_NAME));
@@ -97,7 +97,7 @@ void testHttpHeaderConstructor_userIdentifierUPN() {
9797
Map<String, String> httpHeaderMap = httpHeaders.getReadonlyHeaderMap();
9898

9999
String expectedValue = String.format(HttpHeaders.X_ANCHOR_MAILBOX_UPN_FORMAT, upn);
100-
assertEquals(httpHeaderMap.get(HttpHeaders.X_ANCHOR_MAILBOX), expectedValue);
100+
assertEquals(expectedValue, httpHeaderMap.get(HttpHeaders.X_ANCHOR_MAILBOX));
101101
}
102102

103103
@Test
@@ -122,7 +122,7 @@ void testHttpHeaderConstructor_userIdentifierHomeAccountId() {
122122

123123
Map<String, String> httpHeaderMap = httpHeaders.getReadonlyHeaderMap();
124124

125-
assertEquals(httpHeaderMap.get(HttpHeaders.X_ANCHOR_MAILBOX), "oid:userObjectId@userTenantId");
125+
assertEquals("oid:userObjectId@userTenantId", httpHeaderMap.get(HttpHeaders.X_ANCHOR_MAILBOX));
126126
}
127127

128128
@Test
@@ -158,16 +158,16 @@ void testHttpHeaderConstructor_extraHttpHeadersOverwriteLibraryHeaders() {
158158
Map<String, String> httpHeaderMap = httpHeaders.getReadonlyHeaderMap();
159159

160160
// Standard headers
161-
assertEquals(httpHeaderMap.get(HttpHeaders.PRODUCT_HEADER_NAME), HttpHeaders.PRODUCT_HEADER_VALUE);
162-
assertEquals(httpHeaderMap.get(HttpHeaders.PRODUCT_VERSION_HEADER_NAME), HttpHeaders.PRODUCT_VERSION_HEADER_VALUE);
163-
assertEquals(httpHeaderMap.get(HttpHeaders.OS_HEADER_NAME), HttpHeaders.OS_HEADER_VALUE);
164-
assertEquals(httpHeaderMap.get(HttpHeaders.APPLICATION_VERSION_HEADER_NAME), "app-version");
165-
assertEquals(httpHeaderMap.get(HttpHeaders.CORRELATION_ID_HEADER_NAME), "correlation-id");
161+
assertEquals(HttpHeaders.PRODUCT_HEADER_VALUE, httpHeaderMap.get(HttpHeaders.PRODUCT_HEADER_NAME));
162+
assertEquals(HttpHeaders.PRODUCT_VERSION_HEADER_VALUE, httpHeaderMap.get(HttpHeaders.PRODUCT_VERSION_HEADER_NAME));
163+
assertEquals(HttpHeaders.OS_HEADER_VALUE, httpHeaderMap.get(HttpHeaders.OS_HEADER_NAME));
164+
assertEquals("app-version", httpHeaderMap.get(HttpHeaders.APPLICATION_VERSION_HEADER_NAME));
165+
assertEquals("correlation-id", httpHeaderMap.get(HttpHeaders.CORRELATION_ID_HEADER_NAME));
166166

167167
// Overwritten standard header
168-
assertEquals(httpHeaderMap.get(HttpHeaders.APPLICATION_NAME_HEADER_NAME), uniqueAppName);
168+
assertEquals(uniqueAppName, httpHeaderMap.get(HttpHeaders.APPLICATION_NAME_HEADER_NAME));
169169

170170
// Extra header
171-
assertEquals(httpHeaderMap.get(uniqueHeaderKey), uniqueHeaderValue);
171+
assertEquals(uniqueHeaderValue, httpHeaderMap.get(uniqueHeaderKey));
172172
}
173173
}

0 commit comments

Comments
 (0)