#2361 - Tidy tests only, organise imports

This commit is contained in:
Rob Bygrave
2021-09-09 11:29:05 +12:00
parent 1696caadd4
commit 7a327cb644
626 changed files with 854 additions and 2475 deletions
@@ -14,7 +14,8 @@ import org.tests.model.basic.TSMaster;
import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Used to run some tests manually on a specific Database type.
@@ -25,9 +25,7 @@ import java.util.Set;
import static io.ebean.annotation.Platform.H2;
import static io.ebean.annotation.Platform.POSTGRES;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.*;
public class TestAnnotationBase extends BaseTestCase {
@@ -3,11 +3,11 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.Query;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Address;
import org.tests.model.basic.Customer;
import org.tests.model.basic.Order;
import org.tests.model.basic.ResetBasicData;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -3,11 +3,11 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.Query;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer;
import org.tests.model.basic.Order;
import org.tests.model.basic.OrderDetail;
import org.tests.model.basic.ResetBasicData;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -2,9 +2,9 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Order;
import org.tests.model.basic.ResetBasicData;
import org.junit.jupiter.api.Test;
public class TestBatchLazyMany extends BaseTestCase {
@@ -3,11 +3,11 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.cache.ServerCache;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer;
import org.tests.model.basic.Order;
import org.tests.model.basic.Order.Status;
import org.tests.model.basic.ResetBasicData;
import org.junit.jupiter.api.Test;
import java.sql.Date;
@@ -2,7 +2,6 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.DB;
import io.ebean.annotation.IgnorePlatform;
import io.ebean.annotation.Platform;
import org.junit.jupiter.api.Test;
@@ -2,11 +2,10 @@ package org.tests.basic;
import io.ebean.DB;
import io.ebean.TransactionalTestCase;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer;
import org.tests.model.basic.Order;
import org.tests.model.basic.ResetBasicData;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.List;
@@ -2,9 +2,9 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.PFile;
import org.tests.model.basic.PFileContent;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -2,9 +2,9 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.PersistentFile;
import org.tests.model.basic.PersistentFileContent;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -2,9 +2,9 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.PFile;
import org.tests.model.basic.PFileContent;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -2,8 +2,8 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.tests.model.basic.TMapSuperEntity;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.TMapSuperEntity;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -4,8 +4,8 @@ import io.ebean.BaseTestCase;
import io.ebean.BeanState;
import io.ebean.DB;
import io.ebean.Database;
import org.tests.model.embedded.EMain;
import org.junit.jupiter.api.Test;
import org.tests.model.embedded.EMain;
import static org.junit.jupiter.api.Assertions.*;
@@ -3,9 +3,9 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.BeanState;
import io.ebean.DB;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer;
import org.tests.model.basic.Order;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -3,10 +3,10 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.Database;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer;
import org.tests.model.basic.EBasic;
import org.tests.model.basic.MyEBasicConfigStartup;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -2,15 +2,12 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.DB;
import io.ebean.FutureIds;
import io.ebean.Query;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Order;
import org.tests.model.basic.OrderDetail;
import org.tests.model.basic.ResetBasicData;
import org.junit.jupiter.api.Test;
import java.util.List;
import java.util.concurrent.ExecutionException;
@@ -3,12 +3,11 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.Query;
import org.tests.model.basic.Order;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Order;
import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class TestInEmpty extends BaseTestCase {
@@ -2,10 +2,10 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Car;
import org.tests.model.basic.Truck;
import org.tests.model.basic.Vehicle;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -6,9 +6,9 @@ import io.ebean.core.type.ScalarType;
import io.ebeaninternal.api.SpiEbeanServer;
import io.ebeaninternal.server.deploy.BeanDescriptor;
import io.ebeaninternal.server.deploy.BeanProperty;
import org.tests.model.basic.TJodaEntity;
import org.joda.time.LocalTime;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.TJodaEntity;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -2,12 +2,8 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.tests.model.basic.Address;
import org.tests.model.basic.Car;
import org.tests.model.basic.Trip;
import org.tests.model.basic.Vehicle;
import org.tests.model.basic.VehicleDriver;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.*;
import java.sql.Timestamp;
import java.util.Date;
@@ -2,9 +2,9 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Country;
import org.tests.model.basic.ResetBasicData;
import org.junit.jupiter.api.Test;
import java.util.Map;
@@ -3,9 +3,9 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.Query;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.MRole;
import org.tests.model.basic.MUser;
import org.junit.jupiter.api.Test;
public class TestM2MCascadeOne extends BaseTestCase {
@@ -2,10 +2,10 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Order;
import org.tests.model.basic.OrderDetail;
import org.tests.model.basic.ResetBasicData;
import org.junit.jupiter.api.Test;
import java.sql.Date;
import java.util.List;
@@ -2,12 +2,12 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.ResetBasicData;
import org.tests.model.interfaces.Address;
import org.tests.model.interfaces.IAddress;
import org.tests.model.interfaces.IPerson;
import org.tests.model.interfaces.Person;
import org.junit.jupiter.api.Test;
public class TestManyOneInterface extends BaseTestCase {
@@ -2,8 +2,8 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.tests.model.basic.TMapSuperEntity;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.TMapSuperEntity;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -2,11 +2,11 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.annotation.Platform;
import io.ebean.annotation.IgnorePlatform;
import io.ebean.annotation.Platform;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Address;
import org.tests.model.basic.metaannotation.SizeMedium;
import org.junit.jupiter.api.Test;
import javax.persistence.PersistenceException;
@@ -2,8 +2,8 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.tests.model.basic.MNonUpdPropEntity;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.MNonUpdPropEntity;
public class TestNonUpdateProperty extends BaseTestCase {
@@ -3,11 +3,10 @@ package org.tests.basic;
import io.ebean.DB;
import io.ebean.Query;
import io.ebean.TransactionalTestCase;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer;
import org.tests.model.basic.Order;
import org.tests.model.basic.ResetBasicData;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -2,10 +2,10 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer;
import org.tests.model.basic.Order;
import org.tests.model.basic.ResetBasicData;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -2,10 +2,10 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer;
import org.tests.model.basic.Order;
import org.tests.model.basic.ResetBasicData;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -1,11 +1,6 @@
package org.tests.basic;
import io.ebean.AcquireLockException;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.Database;
import io.ebean.Query;
import io.ebean.Transaction;
import io.ebean.*;
import io.ebean.annotation.ForPlatform;
import io.ebean.annotation.Platform;
import io.ebean.test.LoggedSql;
@@ -8,11 +8,10 @@ import io.ebean.cache.ServerCacheManager;
import io.ebeaninternal.api.SpiEbeanServer;
import io.ebeaninternal.server.core.CacheOptions;
import io.ebeaninternal.server.deploy.BeanDescriptor;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Country;
import org.tests.model.basic.ResetBasicData;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.*;
public class TestQueryWithCache extends BaseTestCase {
@@ -4,11 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.bean.BeanCollection;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Address;
import org.tests.model.basic.Customer;
import org.tests.model.basic.Order;
import org.tests.model.basic.OrderDetail;
import org.tests.model.basic.ResetBasicData;
import org.tests.model.basic.*;
import java.util.Iterator;
import java.util.List;
@@ -2,9 +2,9 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.PersistentFile;
import org.tests.model.basic.PersistentFileContent;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -2,9 +2,9 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.PFile;
import org.tests.model.basic.PFileContent;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -3,11 +3,11 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.bean.BeanCollection;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Order;
import org.tests.model.basic.OrderDetail;
import org.tests.model.basic.Product;
import org.tests.model.basic.ResetBasicData;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -10,10 +10,7 @@ import java.sql.Types;
import java.util.Optional;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.*;
public class TestTransient extends BaseTestCase {
@@ -2,10 +2,10 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer;
import org.tests.model.basic.Order;
import org.tests.model.basic.ResetBasicData;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -2,8 +2,8 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.tests.model.basic.TUuidEntity;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.TUuidEntity;
public class TestUuidInsert extends BaseTestCase {
@@ -2,9 +2,9 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.UUOne;
import org.tests.model.basic.UUTwo;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
@@ -3,11 +3,10 @@ package org.tests.basic;
import io.ebean.DB;
import io.ebean.Query;
import io.ebean.TransactionalTestCase;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer;
import org.tests.model.basic.Order;
import org.tests.model.basic.ResetBasicData;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -3,11 +3,11 @@ package org.tests.basic.delete;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebeaninternal.api.SpiEbeanServer;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer;
import org.tests.model.basic.Order;
import org.tests.model.basic.OrderDetail;
import org.tests.model.basic.ResetBasicData;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -3,11 +3,11 @@ package org.tests.basic.delete;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebeaninternal.api.SpiEbeanServer;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer;
import org.tests.model.basic.Order;
import org.tests.model.basic.OrderDetail;
import org.tests.model.basic.ResetBasicData;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -6,8 +6,8 @@ import io.ebean.SqlRow;
import io.ebean.annotation.ForPlatform;
import io.ebean.annotation.Platform;
import io.ebean.config.dbplatform.DbEncrypt;
import io.ebeaninternal.api.SpiEbeanServer;
import io.ebean.test.LoggedSql;
import io.ebeaninternal.api.SpiEbeanServer;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.EBasicEncrypt;
import org.tests.model.basic.EBasicEncryptRelate;
@@ -3,8 +3,8 @@ package org.tests.basic.event;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.tests.model.basic.TWithPreInsert;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.TWithPreInsert;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -2,11 +2,10 @@ package org.tests.basic.join;
import io.ebean.DB;
import io.ebean.TransactionalTestCase;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Order;
import org.tests.model.basic.Order.Status;
import org.tests.model.basic.ResetBasicData;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -4,9 +4,9 @@ import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.Database;
import io.ebean.Query;
import org.tests.model.basic.EBasicClobFetchEager;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.EBasicClobFetchEager;
import java.util.List;
@@ -3,9 +3,9 @@ package org.tests.basic.lob;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.Query;
import org.tests.model.basic.EBasicClobNoVer;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.EBasicClobNoVer;
import java.util.List;
@@ -2,8 +2,8 @@ package org.tests.basic.lob;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.tests.model.basic.TBytesOnly;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.TBytesOnly;
public class TestByteOnly extends BaseTestCase {
@@ -1,16 +1,6 @@
package org.tests.basic.one2one;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.Version;
import javax.persistence.*;
import java.util.List;
@Entity
@@ -1,14 +1,6 @@
package org.tests.basic.one2one;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.Version;
import javax.persistence.*;
@Entity
@Table(name = "drel_invoice")
@@ -4,9 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.*;
public class TestOne2OneBookingInvoice extends BaseTestCase {
@@ -1,14 +1,6 @@
package org.tests.basic.one2one;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.Version;
import javax.persistence.*;
@Entity
@Table(name = "tire")
@@ -1,13 +1,6 @@
package org.tests.basic.one2one;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.Version;
import javax.persistence.*;
@Entity
@Table(name = "wheel")
@@ -2,8 +2,8 @@ package org.tests.basic.type;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.tests.model.basic.ESomeType;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.ESomeType;
import java.util.Currency;
import java.util.List;
@@ -2,8 +2,8 @@ package org.tests.basic.type;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.tests.model.basic.TOne;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.TOne;
public class TestQueryBooleanProperty extends BaseTestCase {