Skip to content

Dev #338

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
gcheng merged 4 commits into from
May 10, 2013
Merged

Dev #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e62d01a
fix a unit test failure on ci server.
May 10, 2013
40d1b00
fix for issue 314, remove codehaus exception
May 10, 2013
112fde7
Merge pull request #38 from gcheng/codehausbugfix
May 10, 2013
2a3347e
Merge pull request #37 from gcheng/serviceruntimebug
May 10, 2013
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
2 changes: 1 addition & 1 deletion .../java/com/microsoft/windowsazure/serviceruntime/Protocol1RuntimeGoalStateClientTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public RoleEnvironmentData deserialize(InputStream stream) {
}

try {
Thread.sleep(1000);
Thread.sleep(2000);
}
catch (InterruptedException e) {
e.printStackTrace();
Expand Down
12 changes: 4 additions & 8 deletions .../java/com/microsoft/windowsazure/services/media/implementation/OAuthTokenManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
import java.util.Date;
import java.util.TimeZone;

import org.codehaus.jackson.JsonParseException;
import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Before;
import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
Expand Down Expand Up @@ -64,8 +62,7 @@ public Date answer(InvocationOnMock invocation) throws Throwable {
});
}

private void doIncrementingTokens() throws ServiceException, URISyntaxException, JsonParseException,
JsonMappingException, IOException {
private void doIncrementingTokens() throws ServiceException, URISyntaxException, IOException {
doAnswer(new Answer<OAuthTokenResponse>() {
int count = 0;

Expand All @@ -82,8 +79,7 @@ public OAuthTokenResponse answer(InvocationOnMock invocation) throws Throwable {
}

@Test
public void clientUsesContractToGetToken() throws ServiceException, URISyntaxException, JsonParseException,
JsonMappingException, IOException {
public void clientUsesContractToGetToken() throws ServiceException, URISyntaxException, IOException {
// Arrange
doIncrementingTokens();

Expand All @@ -97,7 +93,7 @@ public void clientUsesContractToGetToken() throws ServiceException, URISyntaxExc

@Test
public void clientWillNotCallMultipleTimesWhileAccessTokenIsValid() throws ServiceException, URISyntaxException,
JsonParseException, JsonMappingException, IOException {
IOException {
// Arrange
doIncrementingTokens();

Expand All @@ -117,7 +113,7 @@ public void clientWillNotCallMultipleTimesWhileAccessTokenIsValid() throws Servi

@Test
public void clientWillBeCalledWhenTokenIsHalfwayToExpiring() throws ServiceException, URISyntaxException,
JsonParseException, JsonMappingException, IOException {
IOException {
// Arrange
doIncrementingTokens();

Expand Down