From cd46819caf90f9b81509fd30202bcaa0471da090 Mon Sep 17 00:00:00 2001 From: VladimirVVV Date: Thu, 9 Jan 2020 15:17:48 +0200 Subject: [PATCH] Changes for jUnit5 --- lecture02/build.gradle | 4 ++-- lecture02/src/test/java/ru/atom/enums/GenderTest.java | 6 +++--- .../java/ru/atom/geometry/BarBarCollisionTest.java | 9 ++++----- .../java/ru/atom/geometry/BarPointCollisionTest.java | 10 +++++----- .../java/ru/atom/geometry/PointPointCollisionTest.java | 10 +++++----- .../java/ru/atom/instantiation/InstantiationTest.java | 2 +- .../ru/atom/message/example1/TitledMessageTest.java | 4 ++-- .../java/ru/atom/message/example2/MessageTest.java | 4 ++-- 8 files changed, 24 insertions(+), 25 deletions(-) diff --git a/lecture02/build.gradle b/lecture02/build.gradle index 537881d593..dfe37f62cc 100644 --- a/lecture02/build.gradle +++ b/lecture02/build.gradle @@ -6,8 +6,8 @@ apply plugin: 'java' apply plugin: 'checkstyle' dependencies { - // https://mvnrepository.com/artifact/junit/junit - testCompile group: 'junit', name: 'junit', version: '4.4' + // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api + testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.2' } checkstyle { diff --git a/lecture02/src/test/java/ru/atom/enums/GenderTest.java b/lecture02/src/test/java/ru/atom/enums/GenderTest.java index 4b428fae14..a501968f0c 100644 --- a/lecture02/src/test/java/ru/atom/enums/GenderTest.java +++ b/lecture02/src/test/java/ru/atom/enums/GenderTest.java @@ -1,9 +1,9 @@ package ru.atom.enums; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static junit.framework.TestCase.assertTrue; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static ru.atom.enums.Country.Russia; import static ru.atom.enums.Country.USA; import static ru.atom.enums.Gender.Female; diff --git a/lecture02/src/test/java/ru/atom/geometry/BarBarCollisionTest.java b/lecture02/src/test/java/ru/atom/geometry/BarBarCollisionTest.java index 127a6df537..da8d5b9ab3 100644 --- a/lecture02/src/test/java/ru/atom/geometry/BarBarCollisionTest.java +++ b/lecture02/src/test/java/ru/atom/geometry/BarBarCollisionTest.java @@ -1,12 +1,11 @@ package ru.atom.geometry; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static junit.framework.TestCase.assertTrue; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -@Ignore +//@Disabled public class BarBarCollisionTest { @Test public void barSelfCollide() { diff --git a/lecture02/src/test/java/ru/atom/geometry/BarPointCollisionTest.java b/lecture02/src/test/java/ru/atom/geometry/BarPointCollisionTest.java index dc3b6c2b54..dfaf21499e 100644 --- a/lecture02/src/test/java/ru/atom/geometry/BarPointCollisionTest.java +++ b/lecture02/src/test/java/ru/atom/geometry/BarPointCollisionTest.java @@ -1,12 +1,12 @@ package ru.atom.geometry; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -import static junit.framework.TestCase.assertTrue; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -@Ignore +@Disabled public class BarPointCollisionTest { @Test public void pointInsideBar() { diff --git a/lecture02/src/test/java/ru/atom/geometry/PointPointCollisionTest.java b/lecture02/src/test/java/ru/atom/geometry/PointPointCollisionTest.java index bee377589a..6788cc9da9 100644 --- a/lecture02/src/test/java/ru/atom/geometry/PointPointCollisionTest.java +++ b/lecture02/src/test/java/ru/atom/geometry/PointPointCollisionTest.java @@ -1,12 +1,12 @@ package ru.atom.geometry; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -import static junit.framework.TestCase.assertTrue; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -@Ignore +@Disabled public class PointPointCollisionTest { @Test public void pointSelfCollide() { diff --git a/lecture02/src/test/java/ru/atom/instantiation/InstantiationTest.java b/lecture02/src/test/java/ru/atom/instantiation/InstantiationTest.java index 8b3d53d329..cdb1d145ab 100644 --- a/lecture02/src/test/java/ru/atom/instantiation/InstantiationTest.java +++ b/lecture02/src/test/java/ru/atom/instantiation/InstantiationTest.java @@ -1,6 +1,6 @@ package ru.atom.instantiation; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class InstantiationTest { diff --git a/lecture02/src/test/java/ru/atom/message/example1/TitledMessageTest.java b/lecture02/src/test/java/ru/atom/message/example1/TitledMessageTest.java index b342809781..eeaede1ec1 100644 --- a/lecture02/src/test/java/ru/atom/message/example1/TitledMessageTest.java +++ b/lecture02/src/test/java/ru/atom/message/example1/TitledMessageTest.java @@ -1,8 +1,8 @@ package ru.atom.message.example1; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TitledMessageTest { diff --git a/lecture02/src/test/java/ru/atom/message/example2/MessageTest.java b/lecture02/src/test/java/ru/atom/message/example2/MessageTest.java index 292824b4b4..7e8ea262dd 100644 --- a/lecture02/src/test/java/ru/atom/message/example2/MessageTest.java +++ b/lecture02/src/test/java/ru/atom/message/example2/MessageTest.java @@ -1,10 +1,10 @@ package ru.atom.message.example2; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; -import static junit.framework.TestCase.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class MessageTest {