Skip to content

Commit 17a4458

Browse files
bitwisemanbitwiseman
committed
Fixes for unbridged scenario
1 parent f02d446 commit 17a4458

File tree

2 files changed

+43
-33
lines changed

2 files changed

+43
-33
lines changed

‎pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@
681681
<goal>test</goal>
682682
</goals>
683683
<configuration>
684-
<classesDirectory>${project.basedir}/target/github-api-${project.version}.jar</classesDirectory>
684+
<classesDirectory>${project.basedir}/target/${project.artifactId}-${project.version}.jar</classesDirectory>
685685
<excludesFile>src/test/resources/slow-or-flaky-tests.txt</excludesFile>
686686
<argLine>@{jacoco.surefire.argLine} ${surefire.argLine} -Dtest.github.connector=okhttp</argLine>
687687
</configuration>
@@ -693,7 +693,7 @@
693693
<goal>test</goal>
694694
</goals>
695695
<configuration>
696-
<classesDirectory>${project.basedir}/target/github-api-${project.version}.jar</classesDirectory>
696+
<classesDirectory>${project.basedir}/target/${project.artifactId}-${project.version}.jar</classesDirectory>
697697
<useSystemClassLoader>false</useSystemClassLoader>
698698
<excludesFile>src/test/resources/slow-or-flaky-tests.txt</excludesFile>
699699
<argLine>@{jacoco.surefire.argLine} ${surefire.argLine} -Dtest.github.connector=httpclient</argLine>
@@ -710,7 +710,7 @@
710710
<goal>test</goal>
711711
</goals>
712712
<configuration>
713-
<classesDirectory>${project.basedir}/target/github-api-${project.version}.jar</classesDirectory>
713+
<classesDirectory>${project.basedir}/target/${project.artifactId}-${project.version}.jar</classesDirectory>
714714
<useSystemClassLoader>false</useSystemClassLoader>
715715
<excludesFile>src/test/resources/slow-or-flaky-tests.txt</excludesFile>
716716
<argLine>@{jacoco.surefire.argLine} ${surefire.argLine} -Dtest.github.connector=urlconnection</argLine>
@@ -727,7 +727,7 @@
727727
<goal>test</goal>
728728
</goals>
729729
<configuration>
730-
<classesDirectory>${project.basedir}/target/github-api-${project.version}.jar</classesDirectory>
730+
<classesDirectory>${project.basedir}/target/${project.artifactId}-${project.version}.jar</classesDirectory>
731731
<rerunFailingTestsCount>2</rerunFailingTestsCount>
732732
<includesFile>src/test/resources/slow-or-flaky-tests.txt</includesFile>
733733
</configuration>
@@ -739,7 +739,7 @@
739739
<goal>test</goal>
740740
</goals>
741741
<configuration>
742-
<classesDirectory>${project.basedir}/target/github-api-${project.version}.jar</classesDirectory>
742+
<classesDirectory>${project.basedir}/target/${project.artifactId}-${project.version}.jar</classesDirectory>
743743
<rerunFailingTestsCount>2</rerunFailingTestsCount>
744744
<includesFile>src/test/resources/slow-or-flaky-tests.txt</includesFile>
745745
<!-- Run some test passes with trace logging turned on -->
@@ -756,7 +756,7 @@
756756
<goal>test</goal>
757757
</goals>
758758
<configuration>
759-
<classesDirectory>${project.basedir}/target/github-api-${project.version}.jar</classesDirectory>
759+
<classesDirectory>${project.basedir}/target/${project.artifactId}-${project.version}.jar</classesDirectory>
760760
<useSystemClassLoader>false</useSystemClassLoader>
761761
<excludesFile>src/test/resources/slow-or-flaky-tests.txt</excludesFile>
762762
<argLine>@{jacoco.surefire.argLine} ${surefire.argLine} -Dtest.github.connector=okhttp</argLine>

‎src/test/java/org/kohsuke/github/GHContentIntegrationTest.java‎

Lines changed: 37 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import org.apache.commons.io.IOUtils;
44
import org.junit.After;
5-
import org.junit.Assert;
65
import org.junit.Before;
76
import org.junit.Test;
87

@@ -231,15 +230,17 @@ int checkCreatedCommits(GitCommit gitCommit, GHCommit ghCommit, int expectedRequ
231230
assertThat(gitCommit.getAuthoredDate(), equalTo(GitHubClient.parseDate("2021-06-28T20:37:49Z")));
232231
assertThat(gitCommit.getCommitDate(), equalTo(GitHubClient.parseDate("2021-06-28T20:37:49Z")));
233232

234-
assertThat(ghCommit.getCommitShortInfo().getMessage(), equalTo("Creating a file for integration tests."));
235-
assertThat("Message already resolved", mockGitHub.getRequestCount(), equalTo(expectedRequestCount));
236-
Assert.assertThrows(GHException.class, () -> ghCommit.getCommitShortInfo().getCommentCount());
233+
// Changed this to assert null since bridge methods are missing.
234+
assertThat(ghCommit, nullValue());
235+
// assertThat(ghCommit.getCommitShortInfo().getMessage(), equalTo("Creating a file for integration tests."));
236+
// assertThat("Message already resolved", mockGitHub.getRequestCount(), equalTo(expectedRequestCount));
237+
// Assert.assertThrows(GHException.class, () -> ghCommit.getCommitShortInfo().getCommentCount());
237238

238-
ghCommit.populate();
239-
assertThat("Populate GHCommit", mockGitHub.getRequestCount(), equalTo(expectedRequestCount += 1));
239+
// ghCommit.populate();
240+
// assertThat("Populate GHCommit", mockGitHub.getRequestCount(), equalTo(expectedRequestCount += 1));
240241

241-
expectedRequestCount = checkCommitUserInfo(gitCommit, ghCommit, expectedRequestCount);
242-
assertThat("Resolved GHUser for GHCommit", mockGitHub.getRequestCount(), equalTo(expectedRequestCount += 1));
242+
// expectedRequestCount = checkCommitUserInfo(gitCommit, ghCommit, expectedRequestCount);
243+
// assertThat("Resolved GHUser for GHCommit", mockGitHub.getRequestCount(), equalTo(expectedRequestCount += 1));
243244

244245
expectedRequestCount = checkCommitTree(gitCommit, ghCommit, expectedRequestCount);
245246

@@ -290,14 +291,16 @@ int checkUpdatedContentResponseCommits(GitCommit gitCommit, GHCommit ghCommit, i
290291
assertThat(gitCommit.getAuthoredDate(), equalTo(GitHubClient.parseDate("2021-06-28T20:37:51Z")));
291292
assertThat(gitCommit.getCommitDate(), equalTo(GitHubClient.parseDate("2021-06-28T20:37:51Z")));
292293

293-
assertThat(ghCommit.getCommitShortInfo().getMessage(), equalTo("Updated file for integration tests."));
294-
assertThat("Message already resolved", mockGitHub.getRequestCount(), equalTo(expectedRequestCount));
294+
// Changed this to assert null since bridge methods are missing.
295+
assertThat(ghCommit, nullValue());
296+
// assertThat(ghCommit.getCommitShortInfo().getMessage(), equalTo("Updated file for integration tests."));
297+
// assertThat("Message already resolved", mockGitHub.getRequestCount(), equalTo(expectedRequestCount));
295298

296-
ghCommit.populate();
297-
assertThat("Populate GHCommit", mockGitHub.getRequestCount(), equalTo(expectedRequestCount += 1));
299+
// ghCommit.populate();
300+
// assertThat("Populate GHCommit", mockGitHub.getRequestCount(), equalTo(expectedRequestCount += 1));
298301

299-
expectedRequestCount = checkCommitUserInfo(gitCommit, ghCommit, expectedRequestCount);
300-
assertThat("GHUser already resolved", mockGitHub.getRequestCount(), equalTo(expectedRequestCount));
302+
// expectedRequestCount = checkCommitUserInfo(gitCommit, ghCommit, expectedRequestCount);
303+
// assertThat("GHUser already resolved", mockGitHub.getRequestCount(), equalTo(expectedRequestCount));
301304

302305
expectedRequestCount = checkCommitTree(gitCommit, ghCommit, expectedRequestCount);
303306

@@ -327,10 +330,11 @@ int checkBasicCommitInfo(GitCommit gitCommit, GHCommit ghCommit, int expectedReq
327330
equalTo("https://github.com/hub4j-test-org/GHContentIntegrationTest/commit/" + gitCommit.getSHA1()));
328331
assertThat(gitCommit.getVerification(), notNullValue());
329332

330-
assertThat(ghCommit, notNullValue());
331-
assertThat(ghCommit.getSHA1(), notNullValue());
332-
assertThat(ghCommit.getUrl().toString(),
333-
endsWith("/repos/hub4j-test-org/GHContentIntegrationTest/git/commits/" + ghCommit.getSHA1()));
333+
// Changed this to assert null since bridge methods are missing.
334+
assertThat(ghCommit, nullValue());
335+
// assertThat(ghCommit.getSHA1(), notNullValue());
336+
// assertThat(ghCommit.getUrl().toString(),
337+
// endsWith("/repos/hub4j-test-org/GHContentIntegrationTest/git/commits/" + ghCommit.getSHA1()));
334338

335339
return expectedRequestCount;
336340
}
@@ -446,13 +450,16 @@ int checkCommitTree(GitCommit gitCommit, GHCommit ghCommit, int expectedRequestC
446450
endsWith("/repos/hub4j-test-org/GHContentIntegrationTest/git/trees/" + gitCommit.getTree().getSha()));
447451
assertThat("GHTree already resolved", mockGitHub.getRequestCount(), equalTo(expectedRequestCount));
448452

449-
assertThat(ghCommit.getTree().getSha(), notNullValue());
450-
assertThat("GHCommit has to resolve GHTree", mockGitHub.getRequestCount(), equalTo(expectedRequestCount += 1));
451-
assertThat(ghCommit.getTree().getUrl().toString(),
452-
endsWith("/repos/hub4j-test-org/GHContentIntegrationTest/git/trees/" + ghCommit.getTree().getSha()));
453-
assertThat("GHCommit resolving GHTree is not cached",
454-
mockGitHub.getRequestCount(),
455-
equalTo(expectedRequestCount += 2));
453+
// Changed this to assert null since bridge methods are missing.
454+
assertThat(ghCommit, nullValue());
455+
// assertThat(ghCommit.getTree().getSha(), notNullValue());
456+
// assertThat("GHCommit has to resolve GHTree", mockGitHub.getRequestCount(), equalTo(expectedRequestCount +=
457+
// 1));
458+
// assertThat(ghCommit.getTree().getUrl().toString(),
459+
// endsWith("/repos/hub4j-test-org/GHContentIntegrationTest/git/trees/" + ghCommit.getTree().getSha()));
460+
// assertThat("GHCommit resolving GHTree is not cached",
461+
// mockGitHub.getRequestCount(),
462+
// equalTo(expectedRequestCount += 2));
456463

457464
return expectedRequestCount;
458465
}
@@ -472,9 +479,12 @@ int checkCommitTree(GitCommit gitCommit, GHCommit ghCommit, int expectedRequestC
472479
*/
473480
int checkCommitParents(GitCommit gitCommit, GHCommit ghCommit, int expectedRequestCount) throws IOException {
474481
assertThat(gitCommit.getParentSHA1s().size(), is(greaterThan(0)));
475-
assertThat(ghCommit.getParentSHA1s().size(), is(greaterThan(0)));
476482
assertThat(gitCommit.getParentSHA1s().get(0), notNullValue());
477-
assertThat(ghCommit.getParentSHA1s().get(0), notNullValue());
483+
// Changed this to assert null since bridge methods are missing.
484+
assertThat(ghCommit, nullValue());
485+
// assertThat(ghCommit.getParentSHA1s().size(), is(greaterThan(0)));
486+
// assertThat(ghCommit.getParentSHA1s().get(0), notNullValue());
487+
478488
return expectedRequestCount;
479489
}
480490

0 commit comments

Comments
 (0)