Skip to content

[OSJC-255] correct DefaultClientTest & TokenAuthorizationStrategyTest #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 24, 2016
Merged

[OSJC-255] correct DefaultClientTest & TokenAuthorizationStrategyTest #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 30 additions & 16 deletions src/test/java/com/openshift/internal/restclient/DefaultClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,33 +177,47 @@ public void clientShouldNotEqualClientWithDifferentStrategy() throws Exception {
}

@Test
public void clientShouldEqualClientWithSameStrategyAndDifferentToken() throws Exception {
public void client_should_equal_client_with_same_TokenAuthStrategy_with_different_token() throws Exception {
DefaultClient tokenClientOne = new DefaultClient(baseUrl, null);
IAuthorizationStrategy tokenStrategyOne = mock(TokenAuthorizationStrategy.class);
when(tokenStrategyOne.getToken()).thenReturn("tokenOne");
tokenClientOne.setAuthorizationStrategy(tokenStrategyOne);
tokenClientOne.setAuthorizationStrategy(new TokenAuthorizationStrategy("tokenOne", "aUser"));

DefaultClient tokenClientTwo = new DefaultClient(baseUrl, null);
IAuthorizationStrategy tokenStrategyTwo = mock(TokenAuthorizationStrategy.class);
when(tokenStrategyTwo.getToken()).thenReturn("tokenTwo");
tokenClientTwo.setAuthorizationStrategy(tokenStrategyTwo);
tokenClientTwo.setAuthorizationStrategy(new TokenAuthorizationStrategy("tokenTwo", "aUser"));

assertThat(tokenClientTwo).isEqualTo(tokenClientTwo);
assertThat(tokenClientOne).isEqualTo(tokenClientTwo);
}

@Test
public void clientShouldEqualClientWithSameStrategyAndDifferentUsername() throws Exception {
public void client_should_not_equal_client_with_same_TokenAuthStrategy_with_different_username() throws Exception {
DefaultClient tokenClientOne = new DefaultClient(baseUrl, null);
IAuthorizationStrategy tokenStrategyOne = mock(TokenAuthorizationStrategy.class);
when(tokenStrategyOne.getUsername()).thenReturn("aUser");
tokenClientOne.setAuthorizationStrategy(tokenStrategyOne);
tokenClientOne.setAuthorizationStrategy(new TokenAuthorizationStrategy("aToken", "aUser"));

DefaultClient tokenClientTwo = new DefaultClient(baseUrl, null);
IAuthorizationStrategy tokenStrategyTwo = mock(TokenAuthorizationStrategy.class);
when(tokenStrategyOne.getUsername()).thenReturn("differentuser");
tokenClientTwo.setAuthorizationStrategy(tokenStrategyTwo);
tokenClientTwo.setAuthorizationStrategy(new TokenAuthorizationStrategy("differentToken", "aUser"));

assertThat(tokenClientTwo).isEqualTo(tokenClientTwo);
assertThat(tokenClientOne).isEqualTo(tokenClientTwo);
}

@Test
public void client_should_not_equal_client_with_same_BasicAuthStrategy_with_different_username() throws Exception {
DefaultClient tokenClientOne = new DefaultClient(baseUrl, null);
tokenClientOne.setAuthorizationStrategy(new BasicAuthorizationStrategy("aUser", "aPassword", "aToken"));

DefaultClient tokenClientTwo = new DefaultClient(baseUrl, null);
tokenClientTwo.setAuthorizationStrategy(new BasicAuthorizationStrategy("differentUser", "aPassword", "aToken"));

assertThat(tokenClientOne).isNotEqualTo(tokenClientTwo);
}

@Test
public void client_should_equal_client_with_same_BasicAuthStrategy_with_different_password_and_different_token() throws Exception {
DefaultClient tokenClientOne = new DefaultClient(baseUrl, null);
tokenClientOne.setAuthorizationStrategy(new BasicAuthorizationStrategy("aUser", "aPassword", "aToken"));

DefaultClient tokenClientTwo = new DefaultClient(baseUrl, null);
tokenClientTwo.setAuthorizationStrategy(new BasicAuthorizationStrategy("aUser", "differentPassword", "differentToken"));

assertThat(tokenClientOne).isEqualTo(tokenClientTwo);
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/openshift/restclient/authorization/TokenAuthorizationStrategyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public void TokenStrategiesShoulNotEqualTokenStrategyWithDifferentUsername() {
}

@Test
public void TokenStrategiesShoulEqualTokenStrategyWithSameUsername() {
public void TokenStrategiesShoulEqualTokenStrategyWithSameUsernameAndSameToken() {
TokenAuthorizationStrategy tokenStrategy1 = new TokenAuthorizationStrategy("123", "aUser");
TokenAuthorizationStrategy tokenStrategy2 = new TokenAuthorizationStrategy("123", "aUser");
assertThat(tokenStrategy1).isEqualTo(tokenStrategy2);
Expand Down