lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Refactor some clean code staff

Browse Source 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
This commit is contained in:
SirWayne
2016-07-28 15:11:22 +02:00
parent c4b10982c5
commit 2c70e7db1f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListenerTest.java
View File

@@ -28,6 +28,12 @@ import ru.yandex.qatools.allure.annotations.Stories;
@Stories("Entity Listener Interceptor") @Stories("Entity Listener Interceptor")
public class EntityInterceptorListenerTest extends AbstractJpaIntegrationTest { public class EntityInterceptorListenerTest extends AbstractJpaIntegrationTest {
@Override
public void after() {
EntityInterceptorHolder.getInstance().getEntityInterceptors().clear();
super.after();
}
@Test @Test
@Description("Verfies that the pre persist is called after a entity creation.") @Description("Verfies that the pre persist is called after a entity creation.")
public void prePersistIsCalledWhenPersistingATarget() { public void prePersistIsCalledWhenPersistingATarget() {
@@ -51,7 +57,6 @@ public class EntityInterceptorListenerTest extends AbstractJpaIntegrationTest {
targetManagement.createTarget(targetToBeCreated); targetManagement.createTarget(targetToBeCreated);
final Target loadedTarget = targetManagement.findTargetByControllerID(targetToBeCreated.getControllerId()); final Target loadedTarget = targetManagement.findTargetByControllerID(targetToBeCreated.getControllerId());
EntityInterceptorHolder.getInstance().getEntityInterceptors().remove(postLoadEntityListener);
assertThat(postLoadEntityListener.getEntity()).isNotNull(); assertThat(postLoadEntityListener.getEntity()).isNotNull();
assertThat(postLoadEntityListener.getEntity()).isEqualTo(loadedTarget); assertThat(postLoadEntityListener.getEntity()).isEqualTo(loadedTarget);
} }
@@ -84,7 +89,6 @@ public class EntityInterceptorListenerTest extends AbstractJpaIntegrationTest {
final Target targetToBeCreated = entityFactory.generateTarget("targetToBeCreated"); final Target targetToBeCreated = entityFactory.generateTarget("targetToBeCreated");
addListenerAndCreateTarget(entityInterceptor, targetToBeCreated); addListenerAndCreateTarget(entityInterceptor, targetToBeCreated);
EntityInterceptorHolder.getInstance().getEntityInterceptors().remove(entityInterceptor);
assertThat(entityInterceptor.getEntity()).isNotNull(); assertThat(entityInterceptor.getEntity()).isNotNull();
assertThat(entityInterceptor.getEntity()).isEqualTo(targetToBeCreated); assertThat(entityInterceptor.getEntity()).isEqualTo(targetToBeCreated);
} }
@@ -96,7 +100,6 @@ public class EntityInterceptorListenerTest extends AbstractJpaIntegrationTest {
updateTarget = targetManagement.updateTarget(updateTarget); updateTarget = targetManagement.updateTarget(updateTarget);
EntityInterceptorHolder.getInstance().getEntityInterceptors().remove(entityInterceptor);
assertThat(entityInterceptor.getEntity()).isNotNull(); assertThat(entityInterceptor.getEntity()).isNotNull();
assertThat(entityInterceptor.getEntity()).isEqualTo(updateTarget); assertThat(entityInterceptor.getEntity()).isEqualTo(updateTarget);
} }