From eae8bbac824da36143d9971a771f0fc9b5c9c5a4 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Mon, 6 Sep 2021 18:05:11 +1200 Subject: [PATCH] Junit5 bump - ebean-querybean --- ebean-querybean/pom.xml | 4 +-- .../java/io/ebean/typequery/PBooleanTest.java | 2 +- .../org/querytest/FindNative_withSchema.java | 2 +- .../test/java/org/querytest/QContactTest.java | 2 +- .../org/querytest/QCustomerAndOrTest.java | 2 +- .../org/querytest/QCustomerByteArrayTest.java | 4 +-- .../QCustomerSimpleLikeQueryTest.java | 2 +- .../java/org/querytest/QCustomerTest.java | 30 ++++++++----------- .../test/java/org/querytest/QOrderTest.java | 10 +++---- .../test/java/org/querytest/TargetTest.java | 4 +-- 10 files changed, 28 insertions(+), 34 deletions(-) diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 32ab014a6..6c51f665b 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -76,9 +76,9 @@ - org.avaje.composite + io.avaje junit - 1.1 + 1.0 test diff --git a/ebean-querybean/src/test/java/io/ebean/typequery/PBooleanTest.java b/ebean-querybean/src/test/java/io/ebean/typequery/PBooleanTest.java index 283603c5f..365e5dc86 100644 --- a/ebean-querybean/src/test/java/io/ebean/typequery/PBooleanTest.java +++ b/ebean-querybean/src/test/java/io/ebean/typequery/PBooleanTest.java @@ -4,7 +4,7 @@ import io.ebeaninternal.server.expression.DefaultExpressionList; import io.ebeaninternal.server.expression.SimpleExpression; import org.example.domain.Customer; import org.example.domain.query.QCustomer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-querybean/src/test/java/org/querytest/FindNative_withSchema.java b/ebean-querybean/src/test/java/org/querytest/FindNative_withSchema.java index 59146648d..db75b7541 100644 --- a/ebean-querybean/src/test/java/org/querytest/FindNative_withSchema.java +++ b/ebean-querybean/src/test/java/org/querytest/FindNative_withSchema.java @@ -5,7 +5,7 @@ import org.example.domain.Customer; import org.example.domain.Order; import org.example.domain.OrderDetail; import org.example.domain.Product; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-querybean/src/test/java/org/querytest/QContactTest.java b/ebean-querybean/src/test/java/org/querytest/QContactTest.java index ef0d5a01b..296aa5be6 100644 --- a/ebean-querybean/src/test/java/org/querytest/QContactTest.java +++ b/ebean-querybean/src/test/java/org/querytest/QContactTest.java @@ -1,7 +1,7 @@ package org.querytest; import org.example.domain.query.QContact; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.time.ZonedDateTime; diff --git a/ebean-querybean/src/test/java/org/querytest/QCustomerAndOrTest.java b/ebean-querybean/src/test/java/org/querytest/QCustomerAndOrTest.java index 231f4ae8d..b930c1509 100644 --- a/ebean-querybean/src/test/java/org/querytest/QCustomerAndOrTest.java +++ b/ebean-querybean/src/test/java/org/querytest/QCustomerAndOrTest.java @@ -1,7 +1,7 @@ package org.querytest; import org.example.domain.Customer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/ebean-querybean/src/test/java/org/querytest/QCustomerByteArrayTest.java b/ebean-querybean/src/test/java/org/querytest/QCustomerByteArrayTest.java index c252530e6..2e796b606 100644 --- a/ebean-querybean/src/test/java/org/querytest/QCustomerByteArrayTest.java +++ b/ebean-querybean/src/test/java/org/querytest/QCustomerByteArrayTest.java @@ -4,10 +4,10 @@ import io.ebean.DB; import io.ebean.Database; import org.example.domain.Customer; import org.example.domain.query.QCustomer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class QCustomerByteArrayTest { @Test diff --git a/ebean-querybean/src/test/java/org/querytest/QCustomerSimpleLikeQueryTest.java b/ebean-querybean/src/test/java/org/querytest/QCustomerSimpleLikeQueryTest.java index 182e2b737..6641e138b 100644 --- a/ebean-querybean/src/test/java/org/querytest/QCustomerSimpleLikeQueryTest.java +++ b/ebean-querybean/src/test/java/org/querytest/QCustomerSimpleLikeQueryTest.java @@ -2,7 +2,7 @@ package org.querytest; import org.example.domain.Customer; import org.example.domain.query.QCustomer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Date; import java.util.List; diff --git a/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java b/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java index 223f62b0a..09e768966 100644 --- a/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java +++ b/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java @@ -19,11 +19,8 @@ import org.example.domain.otherpackage.ValidEmail; import org.example.domain.query.QAnimal; import org.example.domain.query.QContact; import org.example.domain.query.QCustomer; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestName; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import javax.sql.DataSource; import java.sql.Connection; @@ -46,12 +43,10 @@ import static org.example.domain.query.QAddress.Alias.country; import static org.example.domain.query.QAddress.Alias.line1; import static org.example.domain.query.QContact.Alias.lastName; import static org.example.domain.query.QCustomer.Alias.billingAddress; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class QCustomerTest { - @Rule - public final TestName testName = new TestName(); - @Test public void findWithTransaction() { @@ -213,8 +208,7 @@ public class QCustomerTest { .findOne(); } - - @Ignore + @Disabled @Test public void arrayContains() { @@ -775,7 +769,7 @@ public class QCustomerTest { public void testFindSet() { Set customerSet = new QCustomer().findSet(); - Assert.assertNotNull(customerSet); + assertNotNull(customerSet); } @Test @@ -831,11 +825,11 @@ public class QCustomerTest { @Test public void testFetchByScalarValue() { Customer cust = new Customer(); - cust.setName(testName.getMethodName()); + cust.setName("testFetchByScalarValue"); cust.setPhoneNumber(new PhoneNumber("+18005555555")); cust.save(); assertThat(new QCustomer() - .name.eq(testName.getMethodName()) + .name.eq("testFetchByScalarValue") .phoneNumber.eq(new PhoneNumber("+18005555555")) .findOne()).isNotNull(); } @@ -844,23 +838,23 @@ public class QCustomerTest { @Test public void testFetchByComparableScalarValue() { Customer cust = new Customer(); - cust.setName(testName.getMethodName()); + cust.setName("testFetchByComparableScalarValue"); cust.setEmail(new ValidEmail("foo2@example.org")); cust.save(); assertThat(new QCustomer() - .name.eq(testName.getMethodName()) + .name.eq("testFetchByComparableScalarValue") .email.eq(new ValidEmail("foo2@example.org")) .findOne()).isNotNull(); assertThat(new QCustomer() - .name.eq(testName.getMethodName()) + .name.eq("testFetchByComparableScalarValue") .email.gt(new ValidEmail("foo2@example.org")) .findOne()).isNull(); assertThat(new QCustomer() - .name.eq(testName.getMethodName()) + .name.eq("testFetchByComparableScalarValue") .email.gt(new ValidEmail("foo1@example.org")) .findOne()).isNotNull(); assertThat(new QCustomer() - .name.eq(testName.getMethodName()) + .name.eq("testFetchByComparableScalarValue") .email.greaterOrEqualTo(new ValidEmail("foo2@example.org")) .findOne()).isNotNull(); } diff --git a/ebean-querybean/src/test/java/org/querytest/QOrderTest.java b/ebean-querybean/src/test/java/org/querytest/QOrderTest.java index db899549c..09ef00aa2 100644 --- a/ebean-querybean/src/test/java/org/querytest/QOrderTest.java +++ b/ebean-querybean/src/test/java/org/querytest/QOrderTest.java @@ -8,9 +8,9 @@ import org.example.domain.Order; import org.example.domain.otherpackage.PhoneNumber; import org.example.domain.query.QCustomer; import org.example.domain.query.QOrder; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.List; @@ -55,12 +55,12 @@ public class QOrderTest { private static Order order; private static Customer customer; - @BeforeClass + @BeforeAll public static void before() { setupData(); } - @AfterClass + @AfterAll public static void after() { DB.delete(order); DB.delete(customer); diff --git a/ebean-querybean/src/test/java/org/querytest/TargetTest.java b/ebean-querybean/src/test/java/org/querytest/TargetTest.java index 8e83e5c05..9e3335b85 100644 --- a/ebean-querybean/src/test/java/org/querytest/TargetTest.java +++ b/ebean-querybean/src/test/java/org/querytest/TargetTest.java @@ -2,13 +2,13 @@ package org.querytest; import org.example.domain.query.QAreaImpl; import org.example.domain.query.QCityImpl; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TargetTest { @Test public void test_oneToMany() { - + new QAreaImpl() .cities.fetch() .findList();