Skip to content

Commit

Permalink
HSEARCH-4708 Simplify some testing code for association automatic ind…
Browse files Browse the repository at this point in the history 
…exing
  • Loading branch information
@yrodiere
yrodiere committed Oct 19, 2022
1 parent 9591a7f commit eb9018f
Showing 1 changed file with 32 additions and 23 deletions.
55 changes: 32 additions & 23 deletions .../orm/automaticindexing/association/bytype/AbstractAutomaticIndexingAssociationBaseIT.java
View file
Expand Up @@ -276,7 +276,8 @@ public void directAssociationUpdate_indexedEmbedded() {
TContained containedEntity = primitives.newContained( 3 );
primitives.indexedField().set( containedEntity, "updatedValue" );

primitives.containingAsIndexedEmbedded().clear( primitives.containedIndexedEmbedded().get( entity1 ) );
TContained oldContained = primitives.containedIndexedEmbedded().get( entity1 );
primitives.containingAsIndexedEmbedded().clear( oldContained );
primitives.containedIndexedEmbedded().set( entity1, containedEntity );
primitives.containingAsIndexedEmbedded().set( containedEntity, entity1 );

Expand All @@ -295,7 +296,8 @@ public void directAssociationUpdate_indexedEmbedded() {
setupHolder.runInTransaction( session -> {
TIndexed entity1 = session.get( primitives.getIndexedClass(), 1 );

primitives.containingAsIndexedEmbedded().clear( primitives.containedIndexedEmbedded().get( entity1 ) );
TContained oldContained = primitives.containedIndexedEmbedded().get( entity1 );
primitives.containingAsIndexedEmbedded().clear( oldContained );
primitives.containedIndexedEmbedded().clear( entity1 );

backendMock.expectWorks( primitives.getIndexName() )
Expand Down Expand Up @@ -345,7 +347,8 @@ public final void directAssociationUpdate_nonIndexedEmbedded() {
TContained containedEntity = primitives.newContained( 3 );
primitives.nonIndexedField().set( containedEntity, "updatedValue" );

primitives.containingAsNonIndexedEmbedded().clear( primitives.containedNonIndexedEmbedded().get( entity1 ) );
TContained oldContained = primitives.containedNonIndexedEmbedded().get( entity1 );
primitives.containingAsNonIndexedEmbedded().clear( oldContained );
primitives.containedNonIndexedEmbedded().set( entity1, containedEntity );
primitives.containingAsNonIndexedEmbedded().set( containedEntity, entity1 );

Expand All @@ -359,7 +362,8 @@ public final void directAssociationUpdate_nonIndexedEmbedded() {
setupHolder.runInTransaction( session -> {
TIndexed entity1 = session.get( primitives.getIndexedClass(), 1 );

primitives.containingAsNonIndexedEmbedded().clear( primitives.containedNonIndexedEmbedded().get( entity1 ) );
TContained oldContained = primitives.containedNonIndexedEmbedded().get( entity1 );
primitives.containingAsNonIndexedEmbedded().clear( oldContained );
primitives.containedNonIndexedEmbedded().clear( entity1 );

// Do not expect any work
Expand Down Expand Up @@ -413,8 +417,8 @@ public void directAssociationUpdate_indexedEmbeddedShallowReindexOnUpdate() {
TContained containedEntity = primitives.newContained( 3 );
primitives.indexedField().set( containedEntity, "updatedValue" );

primitives.containingAsIndexedEmbeddedShallowReindexOnUpdate()
.clear( primitives.containedIndexedEmbeddedShallowReindexOnUpdate().get( entity1 ) );
TContained oldContained = primitives.containedIndexedEmbeddedShallowReindexOnUpdate().get( entity1 );
primitives.containingAsIndexedEmbeddedShallowReindexOnUpdate().clear( oldContained );
primitives.containedIndexedEmbeddedShallowReindexOnUpdate().set( entity1, containedEntity );
primitives.containingAsIndexedEmbeddedShallowReindexOnUpdate().set( containedEntity, entity1 );

Expand All @@ -432,10 +436,10 @@ public void directAssociationUpdate_indexedEmbeddedShallowReindexOnUpdate() {
// Test removing a value
setupHolder.runInTransaction( session -> {
TIndexed entity1 = session.get( primitives.getIndexedClass(), 1 );
TContained containedEntity = session.get( primitives.getContainedClass(), 3 );

TContained oldContained = primitives.containedIndexedEmbeddedShallowReindexOnUpdate().get( entity1 );
primitives.containingAsIndexedEmbeddedShallowReindexOnUpdate().clear( oldContained );
primitives.containedIndexedEmbeddedShallowReindexOnUpdate().clear( entity1 );
primitives.containingAsIndexedEmbeddedShallowReindexOnUpdate().clear( containedEntity );

backendMock.expectWorks( primitives.getIndexName() )
.addOrUpdate( "1", b -> { } );
Expand Down Expand Up @@ -484,8 +488,8 @@ public final void directAssociationUpdate_indexedEmbeddedNoReindexOnUpdate() {
TContained containedEntity = primitives.newContained( 3 );
primitives.indexedField().set( containedEntity, "updatedValue" );

primitives.containingAsIndexedEmbeddedNoReindexOnUpdate()
.clear( primitives.containedIndexedEmbeddedNoReindexOnUpdate().get( entity1 ) );
TContained oldContained = primitives.containedIndexedEmbeddedNoReindexOnUpdate().get( entity1 );
primitives.containingAsIndexedEmbeddedNoReindexOnUpdate().clear( oldContained );
primitives.containedIndexedEmbeddedNoReindexOnUpdate().set( entity1, containedEntity );
primitives.containingAsIndexedEmbeddedNoReindexOnUpdate().set( containedEntity, entity1 );

Expand All @@ -498,10 +502,10 @@ public final void directAssociationUpdate_indexedEmbeddedNoReindexOnUpdate() {
// Test removing a value
setupHolder.runInTransaction( session -> {
TIndexed entity1 = session.get( primitives.getIndexedClass(), 1 );
TContained containedEntity = session.get( primitives.getContainedClass(), 3 );

TContained oldContained = primitives.containedIndexedEmbeddedNoReindexOnUpdate().get( entity1 );
primitives.containingAsIndexedEmbeddedNoReindexOnUpdate().clear( oldContained );
primitives.containedIndexedEmbeddedNoReindexOnUpdate().clear( entity1 );
primitives.containingAsIndexedEmbeddedNoReindexOnUpdate().clear( containedEntity );

// Do not expect any work
} );
Expand Down Expand Up @@ -732,7 +736,8 @@ public void indirectAssociationUpdate_indexedEmbedded() {
TContained containedEntity = primitives.newContained( 5 );
primitives.indexedField().set( containedEntity, "updatedValue" );

primitives.containingAsIndexedEmbedded().clear( primitives.containedIndexedEmbedded().get( containingEntity1 ) );
TContained oldContained = primitives.containedIndexedEmbedded().get( containingEntity1 );
primitives.containingAsIndexedEmbedded().clear( oldContained );
primitives.containedIndexedEmbedded().set( containingEntity1, containedEntity );
primitives.containingAsIndexedEmbedded().set( containedEntity, containingEntity1 );

Expand Down Expand Up @@ -769,7 +774,8 @@ public void indirectAssociationUpdate_indexedEmbedded() {
setupHolder.runInTransaction( session -> {
TContaining containingEntity1 = session.get( primitives.getContainingClass(), 2 );

primitives.containingAsIndexedEmbedded().clear( primitives.containedIndexedEmbedded().get( containingEntity1 ) );
TContained oldContained = primitives.containedIndexedEmbedded().get( containingEntity1 );
primitives.containingAsIndexedEmbedded().clear( oldContained );
primitives.containedIndexedEmbedded().clear( containingEntity1 );

backendMock.expectWorks( primitives.getIndexName() )
Expand Down Expand Up @@ -828,7 +834,8 @@ public final void indirectAssociationUpdate_nonIndexedEmbedded() {
TContained containedEntity = primitives.newContained( 5 );
primitives.indexedField().set( containedEntity, "updatedValue" );

primitives.containingAsNonIndexedEmbedded().clear( primitives.containedNonIndexedEmbedded().get( containingEntity1 ) );
TContained oldContained = primitives.containedNonIndexedEmbedded().get( containingEntity1 );
primitives.containingAsNonIndexedEmbedded().clear( oldContained );
primitives.containedNonIndexedEmbedded().set( containingEntity1, containedEntity );
primitives.containingAsNonIndexedEmbedded().set( containedEntity, containingEntity1 );

Expand All @@ -842,7 +849,8 @@ public final void indirectAssociationUpdate_nonIndexedEmbedded() {
setupHolder.runInTransaction( session -> {
TContaining containingEntity1 = session.get( primitives.getContainingClass(), 2 );

primitives.containingAsNonIndexedEmbedded().clear( primitives.containedNonIndexedEmbedded().get( containingEntity1 ) );
TContained oldContained = primitives.containedNonIndexedEmbedded().get( containingEntity1 );
primitives.containingAsNonIndexedEmbedded().clear( oldContained );
primitives.containedNonIndexedEmbedded().clear( containingEntity1 );

// Do not expect any work
Expand Down Expand Up @@ -906,8 +914,8 @@ public void indirectAssociationUpdate_indexedEmbeddedShallowReindexOnUpdate() {
TContained containedEntity = primitives.newContained( 5 );
primitives.indexedField().set( containedEntity, "updatedValue" );

primitives.containingAsIndexedEmbeddedShallowReindexOnUpdate()
.clear( primitives.containedIndexedEmbeddedShallowReindexOnUpdate().get( containingEntity1 ) );
TContained oldContained = primitives.containedIndexedEmbeddedShallowReindexOnUpdate().get( containingEntity1 );
primitives.containingAsIndexedEmbeddedShallowReindexOnUpdate().clear( oldContained );
primitives.containedIndexedEmbeddedShallowReindexOnUpdate().set( containingEntity1, containedEntity );
primitives.containingAsIndexedEmbeddedShallowReindexOnUpdate().set( containedEntity, containingEntity1 );

Expand Down Expand Up @@ -989,8 +997,8 @@ public final void indirectAssociationUpdate_indexedEmbeddedNoReindexOnUpdate() {
TContained containedEntity = primitives.newContained( 5 );
primitives.indexedField().set( containedEntity, "updatedValue" );

primitives.containingAsIndexedEmbeddedNoReindexOnUpdate()
.clear( primitives.containedIndexedEmbeddedNoReindexOnUpdate().get( containingEntity1 ) );
TContained oldContained = primitives.containedIndexedEmbeddedNoReindexOnUpdate().get( containingEntity1 );
primitives.containingAsIndexedEmbeddedNoReindexOnUpdate().clear( oldContained );
primitives.containedIndexedEmbeddedNoReindexOnUpdate().set( containingEntity1, containedEntity );
primitives.containingAsIndexedEmbeddedNoReindexOnUpdate().set( containedEntity, containingEntity1 );

Expand Down Expand Up @@ -1076,7 +1084,8 @@ public void indirectAssociationUpdate_usedInCrossEntityDerivedProperty() {
primitives.fieldUsedInCrossEntityDerivedField1().set( containedEntity, "field1_updatedValue" );
primitives.fieldUsedInCrossEntityDerivedField2().set( containedEntity, "field2_updatedValue" );

primitives.containingAsUsedInCrossEntityDerivedProperty().clear( primitives.containedUsedInCrossEntityDerivedProperty().get( containingEntity1 ) );
TContained oldContained = primitives.containedUsedInCrossEntityDerivedProperty().get( containingEntity1 );
primitives.containingAsUsedInCrossEntityDerivedProperty().clear( oldContained );
primitives.containedUsedInCrossEntityDerivedProperty().set( containingEntity1, containedEntity );
primitives.containingAsUsedInCrossEntityDerivedProperty().set( containedEntity, containingEntity1 );

Expand Down Expand Up @@ -1115,8 +1124,8 @@ public void indirectAssociationUpdate_usedInCrossEntityDerivedProperty() {
setupHolder.runInTransaction( session -> {
TContaining containingEntity1 = session.get( primitives.getContainingClass(), 2 );

primitives.containingAsUsedInCrossEntityDerivedProperty()
.clear( primitives.containedUsedInCrossEntityDerivedProperty().get( containingEntity1 ) );
TContained oldContained = primitives.containedUsedInCrossEntityDerivedProperty().get( containingEntity1 );
primitives.containingAsUsedInCrossEntityDerivedProperty().clear( oldContained );
primitives.containedUsedInCrossEntityDerivedProperty().clear( containingEntity1 );

backendMock.expectWorks( primitives.getIndexName() )
Expand Down

0 comments on commit eb9018f

Please sign in to comment.