Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes for jUnit5 #1023

Open
wants to merge 1 commit into
base: lecture02
Choose a base branch
from
Open

Changes for jUnit5 #1023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lecture02/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions lecture02/src/test/java/ru/atom/enums/GenderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
9 changes: 4 additions & 5 deletions lecture02/src/test/java/ru/atom/geometry/BarBarCollisionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
10 changes: 5 additions & 5 deletions lecture02/src/test/java/ru/atom/geometry/BarPointCollisionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
10 changes: 5 additions & 5 deletions lecture02/src/test/java/ru/atom/geometry/PointPointCollisionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion lecture02/src/test/java/ru/atom/instantiation/InstantiationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ru.atom.instantiation;

import org.junit.Test;
import org.junit.jupiter.api.Test;

public class InstantiationTest {

Expand Down
4 changes: 2 additions & 2 deletions lecture02/src/test/java/ru/atom/message/example1/TitledMessageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions lecture02/src/test/java/ru/atom/message/example2/MessageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down