Skip to content

Commit

Permalink
HHH-16049 Restructure lazy-basic tests for easier re-execution and be…
Browse files Browse the repository at this point in the history 
…tter test reports
  • Loading branch information
@yrodiere @dreab8
yrodiere authored and dreab8 committed Jan 24, 2023
1 parent 49fbe84 commit 84662bf
Show file tree
Hide file tree
Showing 4 changed files with 182 additions and 321 deletions.
148 changes: 112 additions & 36 deletions .../lazy/basic/MultiLazyBasicUpdateTest.java → ...zy/basic/EagerAndLazyBasicUpdateTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;

import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner;
import org.hibernate.testing.bytecode.enhancement.CustomEnhancementContext;
import org.hibernate.testing.bytecode.enhancement.EnhancerTestContext;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;

Expand All @@ -29,7 +29,8 @@

@RunWith(BytecodeEnhancerRunner.class)
@CustomEnhancementContext( {EnhancerTestContext.class, NoDirtyCheckingContext.class} )
public class MultiLazyBasicUpdateTest extends BaseCoreFunctionalTestCase {
@TestForIssue(jiraKey = "HHH-15634")
public class EagerAndLazyBasicUpdateTest extends BaseCoreFunctionalTestCase {

private Long entityId;

Expand All @@ -38,100 +39,175 @@ public Class<?>[] getAnnotatedClasses() {
return new Class<?>[] { LazyEntity.class };
}

@Before
public void prepare() {
private void initNull() {
doInHibernate( this::sessionFactory, s -> {
LazyEntity entity = new LazyEntity();
s.persist( entity );
entityId = entity.getId();
} );
}

private void initNonNull() {
doInHibernate( this::sessionFactory, s -> {
LazyEntity entity = new LazyEntity();
entity.setEagerProperty( "eager_initial" );
entity.setLazyProperty1( "lazy1_initial" );
entity.setLazyProperty2( "lazy2_initial" );
s.persist( entity );
entityId = entity.getId();
} );
}

@Test
public void updateOneLazyProperty() {
// null -> non-null
public void updateOneLazyProperty_nullToNonNull() {
initNull();
doInHibernate( this::sessionFactory, s -> {
LazyEntity entity = s.get( LazyEntity.class, entityId );
entity.setLazyProperty1( "update1" );
entity.setLazyProperty1( "lazy1_update" );
} );
doInHibernate( this::sessionFactory, s -> {
LazyEntity entity = s.get( LazyEntity.class, entityId );
assertEquals( "update1", entity.getLazyProperty1() );
assertEquals( "lazy1_update", entity.getLazyProperty1() );

assertNull( entity.getEagerProperty() );
assertNull( entity.getLazyProperty2() );
} );
}

// non-null -> non-null
@Test
public void updateOneLazyProperty_nonNullToNonNull() {
initNonNull();
doInHibernate( this::sessionFactory, s -> {
LazyEntity entity = s.get( LazyEntity.class, entityId );
entity.setLazyProperty1( "update2" );
entity.setLazyProperty1( "lazy1_update" );
} );
doInHibernate( this::sessionFactory, s -> {
LazyEntity entity = s.get( LazyEntity.class, entityId );
assertEquals( "update2", entity.getLazyProperty1() );
assertNull( entity.getLazyProperty2() );
assertNull( entity.getEagerProperty() );
assertEquals( "lazy1_update", entity.getLazyProperty1() );

assertEquals( "eager_initial", entity.getEagerProperty() );
assertEquals( "lazy2_initial", entity.getLazyProperty2() );
} );
}

@Test
public void updateOneEagerPropertyAndOneLazyProperty() {
// null -> non-null
public void updateOneLazyProperty_nonNullToNull() {
initNonNull();
doInHibernate( this::sessionFactory, s -> {
LazyEntity entity = s.get( LazyEntity.class, entityId );
entity.setEagerProperty( "eager_update1" );
entity.setLazyProperty1( "update1" );
entity.setLazyProperty1( null );
} );
doInHibernate( this::sessionFactory, s -> {
LazyEntity entity = s.get( LazyEntity.class, entityId );
assertEquals( "eager_update1", entity.getEagerProperty() );
assertEquals( "update1", entity.getLazyProperty1() );
assertNull( entity.getLazyProperty2() );
assertNull( entity.getLazyProperty1() );

assertEquals( "eager_initial", entity.getEagerProperty() );
assertEquals( "lazy2_initial", entity.getLazyProperty2() );
} );
}

// non-null -> non-null
@Test
public void updateOneEagerPropertyAndOneLazyProperty_nullToNonNull() {
initNull();
doInHibernate( this::sessionFactory, s -> {
LazyEntity entity = s.get( LazyEntity.class, entityId );
entity.setEagerProperty( "eager_update2" );
entity.setLazyProperty1( "update2" );
entity.setEagerProperty( "eager_update" );
entity.setLazyProperty1( "lazy1_update" );
} );
doInHibernate( this::sessionFactory, s -> {
LazyEntity entity = s.get( LazyEntity.class, entityId );
assertEquals( "eager_update2", entity.getEagerProperty() );
assertEquals( "update2", entity.getLazyProperty1() );
assertEquals( "eager_update", entity.getEagerProperty() );
assertEquals( "lazy1_update", entity.getLazyProperty1() );

assertNull( entity.getLazyProperty2() );
} );
}

@Test
public void updateAllLazyProperties() {
// null -> non-null
public void updateOneEagerPropertyAndOneLazyProperty_nonNullToNonNull() {
initNonNull();
doInHibernate( this::sessionFactory, s -> {
LazyEntity entity = s.get( LazyEntity.class, entityId );
entity.setLazyProperty1( "update1" );
entity.setLazyProperty2( "update2_1" );
entity.setEagerProperty( "eager_update" );
entity.setLazyProperty1( "lazy1_update" );
} );
doInHibernate( this::sessionFactory, s -> {
LazyEntity entity = s.get( LazyEntity.class, entityId );
assertEquals( "eager_update", entity.getEagerProperty() );
assertEquals( "lazy1_update", entity.getLazyProperty1() );

assertEquals( "lazy2_initial", entity.getLazyProperty2() );
} );
}

@Test
public void updateOneEagerPropertyAndOneLazyProperty_nonNullToNull() {
initNonNull();
doInHibernate( this::sessionFactory, s -> {
LazyEntity entity = s.get( LazyEntity.class, entityId );
entity.setEagerProperty( null );
entity.setLazyProperty1( null );
} );
doInHibernate( this::sessionFactory, s -> {
LazyEntity entity = s.get( LazyEntity.class, entityId );
assertEquals( "update1", entity.getLazyProperty1() );
assertEquals( "update2_1", entity.getLazyProperty2() );
assertNull( entity.getEagerProperty() );
assertNull( entity.getLazyProperty1() );

assertEquals( "lazy2_initial", entity.getLazyProperty2() );
} );
}

// non-null -> non-null
@Test
public void updateAllLazyProperties_nullToNonNull() {
initNull();
doInHibernate( this::sessionFactory, s -> {
LazyEntity entity = s.get( LazyEntity.class, entityId );
entity.setLazyProperty1( "update2" );
entity.setLazyProperty2( "update2_2" );
entity.setLazyProperty1( "lazy1_update" );
entity.setLazyProperty2( "lazy2_update" );
} );
doInHibernate( this::sessionFactory, s -> {
LazyEntity entity = s.get( LazyEntity.class, entityId );
assertEquals( "update2", entity.getLazyProperty1() );
assertEquals( "update2_2", entity.getLazyProperty2() );
assertEquals( "lazy1_update", entity.getLazyProperty1() );
assertEquals( "lazy2_update", entity.getLazyProperty2() );

assertNull( entity.getEagerProperty() );
} );
}

@Test
public void updateAllLazyProperties_nonNullToNonNull() {
initNonNull();
doInHibernate( this::sessionFactory, s -> {
LazyEntity entity = s.get( LazyEntity.class, entityId );
entity.setLazyProperty1( "lazy1_update" );
entity.setLazyProperty2( "lazy2_update" );
} );
doInHibernate( this::sessionFactory, s -> {
LazyEntity entity = s.get( LazyEntity.class, entityId );
assertEquals( "lazy1_update", entity.getLazyProperty1() );
assertEquals( "lazy2_update", entity.getLazyProperty2() );

assertEquals( "eager_initial", entity.getEagerProperty() );
} );
}

@Test
public void updateAllLazyProperties_nonNullToNull() {
initNonNull();
doInHibernate( this::sessionFactory, s -> {
LazyEntity entity = s.get( LazyEntity.class, entityId );
entity.setLazyProperty1( null );
entity.setLazyProperty2( null );
} );
doInHibernate( this::sessionFactory, s -> {
LazyEntity entity = s.get( LazyEntity.class, entityId );
assertNull( entity.getLazyProperty1() );
assertNull( entity.getLazyProperty2() );

assertEquals( "eager_initial", entity.getEagerProperty() );
} );
}

@Entity
@Table(name = "LAZY_ENTITY")
private static class LazyEntity {
Expand Down
146 changes: 0 additions & 146 deletions ...va/org/hibernate/test/bytecode/enhancement/lazy/basic/MultiLazyBasicUpdateToNullTest.java
View file

This file was deleted.

0 comments on commit 84662bf

Please sign in to comment.