loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

fix java okhttp oauth test

Browse Source
This commit is contained in:
WILLIAM CHENG 2021-11-21 11:29:00 +08:00
parent 06f97b465d
commit c619f7fd63
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/RetryingOAuthTest.java
View File

@ -32,18 +32,13 @@ public class RetryingOAuthTest {
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
<<<<<<< HEAD
oauth = new RetryingOAuth("_clientId", "_clientSecret", OAuthFlow.ACCESS_CODE,
"https://token.example.com", Collections.<String, String>emptyMap());
=======
oauth = oauth =
new RetryingOAuth( new RetryingOAuth(
"_clientId", "_clientId",
"_clientSecret", "_clientSecret",
OAuthFlow.accessCode, OAuthFlow.ACCESS_CODE,
"https://token.example.com", "https://token.example.com",
Collections.<String, String>emptyMap()); Collections.<String, String>emptyMap());
>>>>>>> 5.4.x
oauth.setAccessToken("expired-access-token"); oauth.setAccessToken("expired-access-token");
FieldUtils.writeField(oauth, "oAuthClient", mockOAuthClient(), true); FieldUtils.writeField(oauth, "oAuthClient", mockOAuthClient(), true);
} }