Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-12992 - Fix tests to run on various db platforms without naming conflicts.

This commit is contained in:
Chris Cranford 2018-10-31 15:52:14 -04:00
parent 3218f6cc7d
commit 1e2eea95cb
3 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByOneAuditEntityTest.java
View File

@ -54,8 +54,8 @@ public class OrderByOneAuditEntityTest extends BaseEnversJPAFunctionalTestCase {
private Integer id;
@OneToMany(mappedBy = "parent", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
@OrderBy("index, index2 desc")
@AuditMappedBy(mappedBy = "parent", positionMappedBy = "index")
@OrderBy("index1, index2 desc")
@AuditMappedBy(mappedBy = "parent", positionMappedBy = "index1")
@Fetch(FetchMode.SELECT)
@BatchSize(size = 100)
private List<Child> children = new ArrayList<>();
@ -83,7 +83,7 @@ public class OrderByOneAuditEntityTest extends BaseEnversJPAFunctionalTestCase {
@Id
private Integer id;
private Integer index;
private Integer index1;
private Integer index2;
@ManyToOne
@ -93,9 +93,9 @@ public class OrderByOneAuditEntityTest extends BaseEnversJPAFunctionalTestCase {
}
public Child(Integer id, Integer index) {
public Child(Integer id, Integer index1) {
this.id = id;
this.index = index;
this.index1 = index1;
}
public Integer getId() {
@ -106,12 +106,12 @@ public class OrderByOneAuditEntityTest extends BaseEnversJPAFunctionalTestCase {
this.id = id;
}
public Integer getIndex() {
return index;
public Integer getIndex1() {
return index1;
}
public void setIndex(Integer index) {
this.index = index;
public void setIndex1(Integer index1) {
this.index1 = index1;
}
public Integer getIndex2() {
@ -140,19 +140,19 @@ public class OrderByOneAuditEntityTest extends BaseEnversJPAFunctionalTestCase {
}
Child child = (Child) o;
return Objects.equals( id, child.id ) &&
Objects.equals( index, child.index );
Objects.equals( index1, child.index1 );
}
@Override
public int hashCode() {
return Objects.hash( id, index );
return Objects.hash( id, index1 );
}
@Override
public String toString() {
return "Child{" +
"id=" + id +
", index=" + index +
", index1=" + index1 +
'}';
}
}
@ -172,14 +172,14 @@ public class OrderByOneAuditEntityTest extends BaseEnversJPAFunctionalTestCase {
final Child child1 = new Child();
child1.setId( 1 );
child1.setIndex( 1 );
child1.setIndex1( 1 );
child1.setIndex2( 1 );
child1.setParent( parent );
parent.getChildren().add( child1 );
final Child child2 = new Child();
child2.setId( 2 );
child2.setIndex( 2 );
child2.setIndex1( 2 );
child2.setIndex2( 2 );
child2.setParent( parent );
parent.getChildren().add( child2 );
@ -195,7 +195,7 @@ public class OrderByOneAuditEntityTest extends BaseEnversJPAFunctionalTestCase {
final Child child = new Child();
child.setId( 3 );
child.setIndex( 3 );
child.setIndex1( 3 );
child.setIndex2( 3 );
child.setParent( parent );
parent.getChildren().add( child );
@ -206,7 +206,7 @@ public class OrderByOneAuditEntityTest extends BaseEnversJPAFunctionalTestCase {
// Rev 3
doInJPA( this::entityManagerFactory, entityManager -> {
final Parent parent = entityManager.find( Parent.class, parentId );
parent.getChildren().removeIf( c -> c.getIndex() == 2 );
parent.getChildren().removeIf( c -> c.getIndex1() == 2 );
entityManager.merge( parent );
} );

30
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityOneAuditedTest.java
View File

@ -55,7 +55,7 @@ public class OrderByTwoEntityOneAuditedTest extends BaseEnversJPAFunctionalTestC
@Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED)
@ManyToMany(mappedBy = "parents", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
@OrderBy("index, index2 desc")
@OrderBy("index1, index2 desc")
@Fetch(FetchMode.SELECT)
@BatchSize(size = 100)
private List<Child> children = new ArrayList<>();
@ -83,7 +83,7 @@ public class OrderByTwoEntityOneAuditedTest extends BaseEnversJPAFunctionalTestC
@Id
private Integer id;
private Integer index;
private Integer index1;
private Integer index2;
@ManyToMany
@ -93,9 +93,9 @@ public class OrderByTwoEntityOneAuditedTest extends BaseEnversJPAFunctionalTestC
}
public Child(Integer id, Integer index) {
public Child(Integer id, Integer index1) {
this.id = id;
this.index = index;
this.index1 = index1;
}
public Integer getId() {
@ -106,12 +106,12 @@ public class OrderByTwoEntityOneAuditedTest extends BaseEnversJPAFunctionalTestC
this.id = id;
}
public Integer getIndex() {
return index;
public Integer getIndex1() {
return index1;
}
public void setIndex(Integer index) {
this.index = index;
public void setIndex1(Integer index1) {
this.index1 = index1;
}
public Integer getIndex2() {
@ -140,19 +140,19 @@ public class OrderByTwoEntityOneAuditedTest extends BaseEnversJPAFunctionalTestC
}
Child child = (Child) o;
return Objects.equals( id, child.id ) &&
Objects.equals( index, child.index );
Objects.equals( index1, child.index1 );
}
@Override
public int hashCode() {
return Objects.hash( id, index );
return Objects.hash( id, index1 );
}
@Override
public String toString() {
return "Child{" +
"id=" + id +
", index=" + index +
", index1=" + index1 +
'}';
}
}
@ -172,14 +172,14 @@ public class OrderByTwoEntityOneAuditedTest extends BaseEnversJPAFunctionalTestC
final Child child1 = new Child();
child1.setId( 1 );
child1.setIndex( 1 );
child1.setIndex1( 1 );
child1.setIndex2( 1 );
child1.getParents().add( parent );
parent.getChildren().add( child1 );
final Child child2 = new Child();
child2.setId( 2 );
child2.setIndex( 2 );
child2.setIndex1( 2 );
child2.setIndex2( 2 );
child2.getParents().add( parent );
parent.getChildren().add( child2 );
@ -195,7 +195,7 @@ public class OrderByTwoEntityOneAuditedTest extends BaseEnversJPAFunctionalTestC
final Child child = new Child();
child.setId( 3 );
child.setIndex( 3 );
child.setIndex1( 3 );
child.setIndex2( 3 );
child.getParents().add( parent );
parent.getChildren().add( child );
@ -207,7 +207,7 @@ public class OrderByTwoEntityOneAuditedTest extends BaseEnversJPAFunctionalTestC
doInJPA( this::entityManagerFactory, entityManager -> {
final Parent parent = entityManager.find( Parent.class, parentId );
parent.getChildren().removeIf( c -> {
if ( c.getIndex() == 2 ) {
if ( c.getIndex1() == 2 ) {
c.getParents().remove( parent );
return true;
}

32
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityTest.java
View File

@ -54,8 +54,8 @@ public class OrderByTwoEntityTest extends BaseEnversJPAFunctionalTestCase {
private Integer id;
@ManyToMany(mappedBy = "parents", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
@OrderBy("index, index2 desc")
@AuditMappedBy(mappedBy = "parents", positionMappedBy = "index")
@OrderBy("index1, index2 desc")
@AuditMappedBy(mappedBy = "parents", positionMappedBy = "index1")
@Fetch(FetchMode.SELECT)
@BatchSize(size = 100)
private List<Child> children = new ArrayList<>();
@ -83,7 +83,7 @@ public class OrderByTwoEntityTest extends BaseEnversJPAFunctionalTestCase {
@Id
private Integer id;
private Integer index;
private Integer index1;
private Integer index2;
@ManyToMany
@ -93,9 +93,9 @@ public class OrderByTwoEntityTest extends BaseEnversJPAFunctionalTestCase {
}
public Child(Integer id, Integer index) {
public Child(Integer id, Integer index1) {
this.id = id;
this.index = index;
this.index1 = index1;
}
public Integer getId() {
@ -106,12 +106,12 @@ public class OrderByTwoEntityTest extends BaseEnversJPAFunctionalTestCase {
this.id = id;
}
public Integer getIndex() {
return index;
public Integer getIndex1() {
return index1;
}
public void setIndex(Integer index) {
this.index = index;
public void setIndex1(Integer index1) {
this.index1 = index1;
}
public Integer getIndex2() {
@ -140,19 +140,19 @@ public class OrderByTwoEntityTest extends BaseEnversJPAFunctionalTestCase {
}
Child child = (Child) o;
return Objects.equals( id, child.id ) &&
Objects.equals( index, child.index );
Objects.equals( index1, child.index1 );
}
@Override
public int hashCode() {
return Objects.hash( id, index );
return Objects.hash( id, index1 );
}
@Override
public String toString() {
return "Child{" +
"id=" + id +
", index=" + index +
", index1=" + index1 +
'}';
}
}
@ -172,14 +172,14 @@ public class OrderByTwoEntityTest extends BaseEnversJPAFunctionalTestCase {
final Child child1 = new Child();
child1.setId( 1 );
child1.setIndex( 1 );
child1.setIndex1( 1 );
child1.setIndex2( 1 );
child1.getParents().add( parent );
parent.getChildren().add( child1 );
final Child child2 = new Child();
child2.setId( 2 );
child2.setIndex( 2 );
child2.setIndex1( 2 );
child2.setIndex2( 2 );
child2.getParents().add( parent );
parent.getChildren().add( child2 );
@ -195,7 +195,7 @@ public class OrderByTwoEntityTest extends BaseEnversJPAFunctionalTestCase {
final Child child = new Child();
child.setId( 3 );
child.setIndex( 3 );
child.setIndex1( 3 );
child.setIndex2( 3 );
child.getParents().add( parent );
parent.getChildren().add( child );
@ -207,7 +207,7 @@ public class OrderByTwoEntityTest extends BaseEnversJPAFunctionalTestCase {
doInJPA( this::entityManagerFactory, entityManager -> {
final Parent parent = entityManager.find( Parent.class, parentId );
parent.getChildren().removeIf( c -> {
if ( c.getIndex() == 2 ) {
if ( c.getIndex1() == 2 ) {
c.getParents().remove( parent );
return true;
}