#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
@@ -1,10 +1,6 @@
package org.tests.inheritance;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.persistence.OneToOne;
import javax.persistence.*;
/**
*/
@@ -1,16 +1,10 @@
package org.tests.inheritance;
import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.MappedSuperclass;
import javax.persistence.OneToOne;
import javax.validation.constraints.NotNull;
import io.ebean.annotation.Index;
import javax.persistence.*;
import javax.validation.constraints.NotNull;
/**
* Model class to reference an organization node.
*
@@ -1,11 +1,6 @@
package org.tests.inheritance;
import javax.persistence.DiscriminatorColumn;
import javax.persistence.DiscriminatorType;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.*;
@Entity
@@ -3,17 +3,11 @@ package org.tests.inheritance;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.Query;
import org.tests.model.basic.Car;
import org.tests.model.basic.CarAccessory;
import org.tests.model.basic.CarFuse;
import org.tests.model.basic.Truck;
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.util.List;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.*;
public class TestInheritInsert extends BaseTestCase {
@@ -1,10 +1,10 @@
package org.tests.inheritance;
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;
@@ -3,8 +3,6 @@ package org.tests.inheritance;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.Database;
import io.ebean.DB;
import io.ebean.Database;
import org.junit.jupiter.api.Test;
import org.tests.inheritance.model.CalculationResult;
import org.tests.inheritance.model.Configurations;
@@ -6,11 +6,7 @@ import io.ebean.bean.BeanCollection.ModifyListenMode;
import io.ebean.common.BeanList;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Animal;
import org.tests.model.basic.AnimalShelter;
import org.tests.model.basic.BigDog;
import org.tests.model.basic.Cat;
import org.tests.model.basic.Dog;
import org.tests.model.basic.*;
import java.util.List;
@@ -3,7 +3,6 @@ package org.tests.inheritance;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.test.LoggedSql;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import org.tests.inheritance.order.OrderMasterInheritance;
import org.tests.inheritance.order.OrderedA;
@@ -1,15 +1,14 @@
package org.tests.inheritance;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import io.ebean.BaseTestCase;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import org.tests.inherit.ChildA;
import org.tests.inherit.ChildB;
import org.tests.inherit.Parent;
import org.junit.jupiter.api.Test;
import io.ebean.BaseTestCase;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class TestInheritanceRefBean extends BaseTestCase {
@@ -3,9 +3,9 @@ package org.tests.inheritance;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.TIntChild;
import org.tests.model.basic.TIntRoot;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -2,12 +2,12 @@ package org.tests.inheritance;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.tests.model.basic.AttributeHolder;
import org.tests.model.basic.ListAttribute;
import org.tests.model.basic.ListAttributeValue;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.tests.model.basic.AttributeHolder;
import org.tests.model.basic.ListAttribute;
import org.tests.model.basic.ListAttributeValue;
import static org.junit.jupiter.api.Assertions.*;
@@ -2,11 +2,10 @@ package org.tests.inheritance;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.Test;
public class TestTreeOrganisations extends BaseTestCase {
@Test
@@ -1,12 +1,6 @@
package org.tests.inheritance.abstrakt;
import javax.persistence.DiscriminatorColumn;
import javax.persistence.DiscriminatorType;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.Table;
import javax.persistence.Version;
import javax.persistence.*;
@Entity
@Table(name = "block")
@@ -1,12 +1,6 @@
package org.tests.inheritance.cache;
import javax.persistence.DiscriminatorColumn;
import javax.persistence.DiscriminatorType;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.ManyToOne;
import javax.persistence.*;
@Entity
@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
@@ -1,11 +1,6 @@
package org.tests.inheritance.cache;
import javax.persistence.DiscriminatorColumn;
import javax.persistence.DiscriminatorType;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.*;
@Entity
@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
@@ -3,9 +3,9 @@ package org.tests.inheritance.cache;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.cache.CInhOne;
import org.tests.model.basic.cache.CInhRoot;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -1,10 +1,6 @@
package org.tests.inheritance.cascadedelete;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.PreRemove;
import javax.persistence.*;
import java.util.UUID;
@Entity
@@ -1,17 +1,6 @@
package org.tests.inheritance.company.domain;
import javax.persistence.DiscriminatorColumn;
import javax.persistence.DiscriminatorType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.Version;
import javax.persistence.*;
/**
* @author Per-Ingemar Andersson, It-huset i Norden AB
@@ -1,10 +1,6 @@
package org.tests.inheritance.company.domain;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Version;
import javax.persistence.*;
/**
* @author Per-Ingemar Andersson, It-huset i Norden AB
@@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test;
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.assertNotNull;
public class TestInheritAbstract {
@@ -1,10 +1,6 @@
package org.tests.inheritance.model;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.persistence.*;
@Entity
public class CalculationResult {
@@ -1,10 +1,6 @@
package org.tests.inheritance.order;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.OrderColumn;
import javax.persistence.*;
import java.util.ArrayList;
import java.util.List;