[refactor] Standardize tests (darrachequesne#66)

Author: darrachequesne

pom.xml

@@ -158,6 +158,13 @@
 <scope>test</scope>
 </dependency>
 
+<dependency>
+<groupId>org.assertj</groupId>
+<artifactId>assertj-core</artifactId>
+<version>2.8.0</version>
+<scope>test</scope>
+</dependency>
+
 <dependency>
 <groupId>org.springframework</groupId>
 <artifactId>spring-test</artifactId>

src/main/java/org/springframework/data/jpa/datatables/ColumnFilter.java

@@ -81,7 +81,7 @@ public javax.persistence.criteria.Predicate createPredicate(From<?, ?> from, Cri
 
  javax.persistence.criteria.Predicate predicate;
  if (isBooleanComparison) {
- predicate = expression.as(Boolean.class).in(booleanValues);
+ predicate = expression.in(booleanValues);
  } else {
  predicate = expression.as(String.class).in(values);
  }

src/test/java/org/springframework/data/jpa/datatables/Config.java

@@ -76,13 +76,6 @@ public AbstractEntityManagerFactoryBean entityManagerFactory(DataSource dataSour
  bean.setPackagesToScan(Config.class.getPackage().getName());
  bean.setDataSource(dataSource);
 
- Properties jpaProperties = new Properties();
- jpaProperties.setProperty(Environment.HBM2DDL_AUTO, "create-drop");
- jpaProperties.setProperty(Environment.HBM2DDL_IMPORT_FILES, "init.sql");
- jpaProperties.setProperty(Environment.HBM2DDL_IMPORT_FILES_SQL_EXTRACTOR,
- MultipleLinesSqlCommandExtractor.class.getName());
- bean.setJpaProperties(jpaProperties);
-
  return bean;
  }
 

src/test/java/org/springframework/data/jpa/datatables/model/Bill.java

@@ -7,6 +7,9 @@
 import lombok.experimental.Tolerate;
 
 import javax.persistence.*;
+import java.util.List;
+
+import static java.util.Arrays.asList;
 
 @Data
 @Setter(AccessLevel.NONE)
@@ -19,6 +22,8 @@ public class Employee {
  private String lastName;
  private String position;
  private int age;
+ private boolean isWorkingRemotely;
+ private String comment;
 
  @ManyToOne(cascade = CascadeType.ALL)
  @JoinColumn(name = "id_office")
@@ -34,6 +39,7 @@ private Employee() {}
  .position("Accountant")
  .age(33)
  .office(Office.TOKYO)
+ .comment(null)
  .build();
 
  public static Employee ANGELICA_RAMOS = Employee.builder()
@@ -43,6 +49,7 @@ private Employee() {}
  .position("Chief Executive Officer (CEO)")
  .age(47)
  .office(Office.LONDON)
+ .comment("\\NULL")
  .build();
 
  public static Employee ASHTON_COX = Employee.builder()
@@ -52,6 +59,8 @@ private Employee() {}
  .position("Junior Technical Author")
  .age(66)
  .office(Office.SAN_FRANCISCO)
+ .isWorkingRemotely(true)
+ .comment("~foo~~")
  .build();
 
  public static Employee BRADLEY_GREER = Employee.builder()
@@ -61,6 +70,7 @@ private Employee() {}
  .position("Software Engineer")
  .age(41)
  .office(Office.LONDON)
+ .comment("%foo%%")
  .build();
 
  public static Employee BRENDEN_WAGNER = Employee.builder()
@@ -70,6 +80,7 @@ private Employee() {}
  .position("Software Engineer")
  .age(28)
  .office(Office.SAN_FRANCISCO)
+ .comment("_foo__")
  .build();
 
  public static Employee BRIELLE_WILLIAMSON = Employee.builder()
@@ -79,6 +90,25 @@ private Employee() {}
  .position("Integration Specialist")
  .age(61)
  .office(Office.NEW_YORK)
+ .comment("@foo@@")
  .build();
 
+ public static List<Employee> ALL = asList(
+ AIRI_SATOU,
+ ANGELICA_RAMOS,
+ ASHTON_COX,
+ BRADLEY_GREER,
+ BRENDEN_WAGNER,
+ BRIELLE_WILLIAMSON
+ );
+
+ public static List<Employee> ALL_SORTED_BY_AGE = asList(
+ BRENDEN_WAGNER,
+ AIRI_SATOU,
+ BRADLEY_GREER,
+ ANGELICA_RAMOS,
+ BRIELLE_WILLIAMSON,
+ ASHTON_COX
+ );
+
 }

src/test/java/org/springframework/data/jpa/datatables/model/BillRepository.java

@@ -0,0 +1,13 @@
+package org.springframework.data.jpa.datatables.model;
+
+import lombok.Value;
+
+@Value
+public class EmployeeDto {
+ private int id;
+ private String firstName;
+ private String lastName;
+
+ public static EmployeeDto AIRI_SATOU = new EmployeeDto(5407, "Airi", "Satou");
+
+}