Skip to content
This repository was archived by the owner on Feb 1, 2023. It is now read-only.

Commit bbc77bf

Browse files
committed
test: pass client apiUrl as envvar via secrets
1 parent 7af9a46 commit bbc77bf

File tree

3 files changed

+20
-3
lines changed

3 files changed

+20
-3
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,7 @@ jobs:
3636
restore-keys: ${{ runner.os }}-gradle
3737

3838
- name: Run tests
39+
env:
40+
DEEPROXY_API_URL: ${{secrets.DEEPROXY_API_URL}}
41+
SNYK_TOKEN: ${{secrets.SNYK_TOKEN}}
3942
run: ./gradlew clean test integTest

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ task integTest(type: Test) {
6161
shouldRunAfter test
6262

6363
testLogging {
64+
exceptionFormat "full"
6465
showStandardStreams = true
6566
}
6667
outputs.upToDateWhen { false }

src/integTest/java/ai/deepcode/javaclient/DeepCodeRestApiTest.java

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import java.util.Collections;
2121
import java.util.List;
2222

23+
import static org.hamcrest.core.IsEqual.equalTo;
24+
import static org.hamcrest.core.IsNull.notNullValue;
2325
import static org.junit.Assert.*;
2426

2527
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -38,6 +40,7 @@ public class DeepCodeRestApiTest {
3840

3941
// !!! Will works only with already logged sessionToken
4042
private static final String loggedToken = System.getenv("SNYK_TOKEN");
43+
private static final String baseUrl = System.getenv("DEEPROXY_API_URL");
4144

4245
private static String bundleId = null;
4346

@@ -76,7 +79,7 @@ public void _020_checkSession() {
7679
token, status);
7780

7881
token = loggedToken;
79-
DeepCodeRestApi.setBaseUrl("https://deeproxy.snyk.io/");
82+
DeepCodeRestApi.setBaseUrl(baseUrl);
8083
status = DeepCodeRestApi.checkSession(token).getStatusCode();
8184
System.out.printf(
8285
"Check Session call with logged user's token [%1$s] return [%2$d] code.\n", token, status);
@@ -129,7 +132,7 @@ public void _025_getFilters() {
129132
@Test
130133
public void _030_createBundle_from_source() {
131134
System.out.println("\n--------------Create Bundle from Source----------------\n");
132-
DeepCodeRestApi.setBaseUrl("https://deeproxy.snyk.io/");
135+
DeepCodeRestApi.setBaseUrl(baseUrl);
133136
int status = DeepCodeRestApi.checkSession(loggedToken).getStatusCode();
134137
assertEquals(200, status);
135138
FileContent fileContent = new FileContent("/AnnotatorTest.java", testFileContent);
@@ -266,7 +269,7 @@ public void _036_Check_Bundle() {
266269
}
267270

268271
private FileHashRequest createFileHashRequest(String fakeFileName) {
269-
DeepCodeRestApi.setBaseUrl("https://deeproxy.snyk.io/");
272+
DeepCodeRestApi.setBaseUrl(baseUrl);
270273
int status = DeepCodeRestApi.checkSession(loggedToken).getStatusCode();
271274
assertEquals(200, status);
272275
final File testFile =
@@ -426,4 +429,14 @@ private void assertAndPrintGetAnalysisResponse(GetAnalysisResponse response) {
426429
// assertEquals("DONE", response.getStatus());
427430
assertEquals("Get Analysis request not succeed", 200, response.getStatusCode());
428431
}
432+
433+
@Test
434+
public void setBaseUrl_shouldUseEmptyTrustManager_whenDisableSslVerificationIsTrue() {
435+
DeepCodeRestApi.setBaseUrl(baseUrl, true);
436+
437+
EmptyResponse emptyResponse = DeepCodeRestApi.checkSession(loggedToken);
438+
439+
assertThat(emptyResponse, notNullValue());
440+
assertThat(emptyResponse.getStatusCode(), equalTo(200));
441+
}
429442
}

0 commit comments

Comments
 (0)