From 5058b36c851da53699c82566ca4ee00e3e8c91fb Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 8 Feb 2018 03:10:35 +0100 Subject: [PATCH] Reenable JUnit tests by global dependencies --- build.gradle | 11 +++++++++++ org.jabref.gui/build.gradle | 9 +-------- org.jabref.logic/build.gradle | 10 ---------- org.jabref.model/build.gradle | 7 ------- 4 files changed, 12 insertions(+), 25 deletions(-) diff --git a/build.gradle b/build.gradle index a1b6e821f77..421df790395 100644 --- a/build.gradle +++ b/build.gradle @@ -58,6 +58,17 @@ allprojects { dependencies { checkstyle 'com.puppycrawl.tools:checkstyle:8.8' + + testCompile 'junit:junit:4.12' + testCompile 'org.junit.platform:junit-platform-commons:1.1.0-M2' + testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0-M2' + testCompile 'org.junit.jupiter:junit-jupiter-params:5.1.0-M2' + testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.1.0-M2' + testRuntime 'org.junit.vintage:junit-vintage-engine:5.1.0-M2' + testRuntime 'org.apache.logging.log4j:log4j-core:2.10.0' + testRuntime 'org.apache.logging.log4j:log4j-jul:2.10.0' + testCompile 'org.mockito:mockito-core:2.13.0' + testCompile 'org.hamcrest:hamcrest-core:1.3' } // Code quality tasks diff --git a/org.jabref.gui/build.gradle b/org.jabref.gui/build.gradle index f4fb7d2637f..e22dd7129d8 100644 --- a/org.jabref.gui/build.gradle +++ b/org.jabref.gui/build.gradle @@ -146,17 +146,10 @@ dependencies { compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '1.0.9' testCompile 'com.tngtech.archunit:archunit-junit:0.5.0' - testCompile 'junit:junit:4.12' - testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0-M2' - testCompile 'org.junit.jupiter:junit-jupiter-params:5.1.0-M2' - testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.1.0-M2' - testRuntime 'org.junit.vintage:junit-vintage-engine:5.1.0-M2' - testRuntime 'org.apache.logging.log4j:log4j-core:2.10.0' - testRuntime 'org.apache.logging.log4j:log4j-jul:2.10.0' + testCompile 'org.assertj:assertj-core:3.8.0' testCompile 'org.assertj:assertj-swing:3.8.0' testCompile 'org.assertj:assertj-swing-junit:3.8.0' - testCompile 'org.mockito:mockito-core:2.13.0' testCompile "org.testfx:testfx-core:4.0.+" testCompile "org.testfx:testfx-junit:4.0.+" testCompile 'com.tngtech.archunit:archunit:0.5.0' diff --git a/org.jabref.logic/build.gradle b/org.jabref.logic/build.gradle index 923b9373c4f..a278d5b7780 100644 --- a/org.jabref.logic/build.gradle +++ b/org.jabref.logic/build.gradle @@ -59,16 +59,6 @@ dependencies { testCompile 'org.antlr:antlr-runtime:3.5.2' testCompile 'com.github.tomakehurst:wiremock:2.14.0' - testCompile 'junit:junit:4.12' - testCompile 'org.junit.platform:junit-platform-commons:1.1.0-M2' - testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0-M2' - testCompile 'org.junit.jupiter:junit-jupiter-params:5.1.0-M2' - testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.1.0-M2' - testRuntime 'org.junit.vintage:junit-vintage-engine:5.1.0-M2' - testRuntime 'org.apache.logging.log4j:log4j-core:2.10.0' - testRuntime 'org.apache.logging.log4j:log4j-jul:2.10.0' - testCompile 'org.hamcrest:hamcrest-core:1.3' - testCompile 'org.mockito:mockito-core:2.13.0' testCompile 'org.reflections:reflections:0.9.11' testCompile 'org.xmlunit:xmlunit-core:2.5.1' testCompile 'org.xmlunit:xmlunit-matchers:2.5.1' diff --git a/org.jabref.model/build.gradle b/org.jabref.model/build.gradle index d7549fdceac..97195bcb78f 100644 --- a/org.jabref.model/build.gradle +++ b/org.jabref.model/build.gradle @@ -46,13 +46,6 @@ dependencies { runtime 'org.citationstyles:locales:1.0.1-SNAPSHOT' compile 'com.github.tomtung:latex2unicode_2.12:0.2.2' - - testCompile 'junit:junit:4.12' - testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.1.0-M2' - testRuntime 'org.junit.vintage:junit-vintage-engine:5.1.0-M2' - testRuntime 'org.apache.logging.log4j:log4j-core:2.10.0' - testRuntime 'org.apache.logging.log4j:log4j-jul:2.10.0' - testCompile 'org.mockito:mockito-core:2.13.0' } clean {