diff --git a/build.gradle b/build.gradle index d648b74..2ed9dcb 100644 --- a/build.gradle +++ b/build.gradle @@ -22,16 +22,16 @@ dependencies { implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation 'com.squareup.retrofit2:converter-gson:2.9.0' - implementation 'com.jayway.jsonpath:json-path:2.7.0' - implementation 'org.eclipse.jgit:org.eclipse.jgit:5.13.1.202206130422-r' + implementation 'com.jayway.jsonpath:json-path:2.9.0' + implementation 'org.eclipse.jgit:org.eclipse.jgit:6.8.0.202311291450-r' implementation 'org.gitlab:java-gitlab-api:4.1.1' implementation 'com.fasterxml.jackson.core:jackson-core:2.15.2' // Transitive from java-gitlab-api implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2' // Transitive from java-gitlab-api implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2' // Transitive from java-gitlab-api - testImplementation 'org.slf4j:slf4j-simple:1.8.0-beta2' // Same as JGit + testImplementation 'org.slf4j:slf4j-simple:1.8.0-beta2' // Same as java-gitlab-api testImplementation 'junit:junit:4.13.2' - testImplementation 'org.assertj:assertj-core:3.24.2' - testImplementation 'com.approvaltests:approvaltests:18.5.0' - testImplementation 'org.mockito:mockito-core:5.2.0' + testImplementation 'org.assertj:assertj-core:3.25.2' + testImplementation 'com.approvaltests:approvaltests:22.3.3' + testImplementation 'org.mockito:mockito-core:5.10.0' } diff --git a/src/test/java/se/bjurr/gitchangelog/test/ApprovalsWrapper.java b/src/test/java/se/bjurr/gitchangelog/test/ApprovalsWrapper.java index 5cde202..940d5e3 100644 --- a/src/test/java/se/bjurr/gitchangelog/test/ApprovalsWrapper.java +++ b/src/test/java/se/bjurr/gitchangelog/test/ApprovalsWrapper.java @@ -4,16 +4,17 @@ import com.google.gson.GsonBuilder; import org.approvaltests.Approvals; import org.approvaltests.core.Options; +import org.approvaltests.reporters.AutoApproveReporter; import se.bjurr.gitchangelog.api.GitChangelogApi; public class ApprovalsWrapper { private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); private static final String SEPARATOR = "\n\n---------------------------------------------\n\n"; - public static void verify(GitChangelogApi given) throws Exception { - String changelogContext = GSON.toJson(given.getChangelog()); - String changelog = given.render(); - Object actual = + public static void verify(final GitChangelogApi given) throws Exception { + final String changelogContext = GSON.toJson(given.getChangelog()); + final String changelog = given.render(); + final Object actual = new Object() { @Override public String toString() { diff --git a/src/test/java/se/bjurr/gitchangelog/test/AutoApproveReporter.java b/src/test/java/se/bjurr/gitchangelog/test/AutoApproveReporter.java deleted file mode 100644 index 0075bb1..0000000 --- a/src/test/java/se/bjurr/gitchangelog/test/AutoApproveReporter.java +++ /dev/null @@ -1,21 +0,0 @@ -package se.bjurr.gitchangelog.test; - -import com.spun.util.io.FileUtils; -import java.io.File; -import org.approvaltests.core.ApprovalFailureReporter; - -/** - * Will be available in next Approvals version: - * https://github.com/approvals/ApprovalTests.Java/commit/f2ba2b91a24854c9ef3d757bd20bf2d7e0409e13 - */ -public class AutoApproveReporter implements ApprovalFailureReporter { - @Override - public void report(final String received, final String approved) { - final File a = new File(approved); - if (a.exists()) { - a.delete(); - } - final File r = new File(received); - FileUtils.copyFile(r, a); - } -}