RefreshToken to AuthHolder linkage test now using AuthHolder ID to verify

Author: arielak

openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_0.java

@@ -929,9 +929,7 @@ public AuthenticationHolderEntity answer(InvocationOnMock invocation) throws Thr
 List<OAuth2RefreshTokenEntity> savedRefreshTokens = new ArrayList(fakeRefreshTokenTable.values()); //capturedRefreshTokens.getAllValues();
  Collections.sort(savedRefreshTokens, new refreshTokenIdComparator());
 
- assertThat(savedRefreshTokens.get(0).getAuthenticationHolder().getAuthentication().getOAuth2Request().getClientId(), 
- equalTo(token1.getAuthenticationHolder().getAuthentication().getOAuth2Request().getClientId()));
- assertThat(savedRefreshTokens.get(1).getAuthenticationHolder().getAuthentication().getOAuth2Request().getClientId(), 
- equalTo(token2.getAuthenticationHolder().getAuthentication().getOAuth2Request().getClientId()));
+ assertThat(savedRefreshTokens.get(0).getAuthenticationHolder().getId(), equalTo(356L));
+ assertThat(savedRefreshTokens.get(1).getAuthenticationHolder().getId(), equalTo(357L));
  }
 }

openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_1.java

@@ -1823,10 +1823,8 @@ public AuthenticationHolderEntity answer(InvocationOnMock invocation) throws Thr
 List<OAuth2RefreshTokenEntity> savedRefreshTokens = new ArrayList(fakeRefreshTokenTable.values()); //capturedRefreshTokens.getAllValues();
  Collections.sort(savedRefreshTokens, new refreshTokenIdComparator());
 
- assertThat(savedRefreshTokens.get(0).getAuthenticationHolder().getAuthentication().getOAuth2Request().getClientId(), 
- equalTo(token1.getAuthenticationHolder().getAuthentication().getOAuth2Request().getClientId()));
- assertThat(savedRefreshTokens.get(1).getAuthenticationHolder().getAuthentication().getOAuth2Request().getClientId(), 
- equalTo(token2.getAuthenticationHolder().getAuthentication().getOAuth2Request().getClientId()));
+ assertThat(savedRefreshTokens.get(0).getAuthenticationHolder().getId(), equalTo(356L));
+ assertThat(savedRefreshTokens.get(1).getAuthenticationHolder().getId(), equalTo(357L));
  }
 
 private Set<String> jsonArrayToStringSet(JsonArray a) {