Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed PersistenceInjectionTests

Browse Source
This commit is contained in:
Juergen Hoeller
2009-10-20 18:30:55 +00:00
parent 94533976d0
commit 54221500c1
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
org.springframework.orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2008 the original author or authors.
* Copyright 2002-2009 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@ import java.lang.reflect.Proxy;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceContext;
@@ -506,8 +505,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
public void testFieldOfWrongTypeAnnotatedWithPersistenceUnit() {
PersistenceAnnotationBeanPostProcessor babpp = new PersistenceAnnotationBeanPostProcessor();
try {
babpp.postProcessAfterInstantiation(new FieldOfWrongTypeAnnotatedWithPersistenceUnit(),
"bean name does not matter");
babpp.postProcessPropertyValues(null, null, new FieldOfWrongTypeAnnotatedWithPersistenceUnit(), null);
fail("Can't inject this field");
}
catch (IllegalStateException ex) {
@@ -518,8 +516,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
public void testSetterOfWrongTypeAnnotatedWithPersistenceUnit() {
PersistenceAnnotationBeanPostProcessor babpp = new PersistenceAnnotationBeanPostProcessor();
try {
babpp.postProcessAfterInstantiation(new SetterOfWrongTypeAnnotatedWithPersistenceUnit(),
"bean name does not matter");
babpp.postProcessPropertyValues(null, null, new SetterOfWrongTypeAnnotatedWithPersistenceUnit(), null);
fail("Can't inject this setter");
}
catch (IllegalStateException ex) {
@@ -530,7 +527,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
public void testSetterWithNoArgs() {
PersistenceAnnotationBeanPostProcessor babpp = new PersistenceAnnotationBeanPostProcessor();
try {
babpp.postProcessAfterInstantiation(new SetterWithNoArgs(), "bean name does not matter");
babpp.postProcessPropertyValues(null, null, new SetterWithNoArgs(), null);
fail("Can't inject this setter");
}
catch (IllegalStateException ex) {
@@ -582,7 +579,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
PersistenceAnnotationBeanPostProcessor babpp = new MockPersistenceAnnotationBeanPostProcessor();
DefaultPrivatePersistenceContextFieldWithProperties transactionalField =
new DefaultPrivatePersistenceContextFieldWithProperties();
babpp.postProcessAfterInstantiation(transactionalField, "bean name does not matter");
babpp.postProcessPropertyValues(null, null, transactionalField, null);
assertNotNull(transactionalField.em);
assertNotNull(transactionalField.em.getDelegate());
@@ -613,8 +610,8 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
new DefaultPrivatePersistenceContextFieldWithProperties();
DefaultPrivatePersistenceContextField transactionalField = new DefaultPrivatePersistenceContextField();
babpp.postProcessAfterInstantiation(transactionalFieldWithProperties, "bean name does not matter");
babpp.postProcessAfterInstantiation(transactionalField, "bean name does not matter");
babpp.postProcessPropertyValues(null, null, transactionalFieldWithProperties, null);
babpp.postProcessPropertyValues(null, null, transactionalField, null);
assertNotNull(transactionalFieldWithProperties.em);
assertNotNull(transactionalField.em);
@@ -650,8 +647,8 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
new DefaultPrivatePersistenceContextFieldWithProperties();
DefaultPrivatePersistenceContextField transactionalField = new DefaultPrivatePersistenceContextField();
babpp.postProcessAfterInstantiation(transactionalFieldWithProperties, "bean name does not matter");
babpp.postProcessAfterInstantiation(transactionalField, "bean name does not matter");
babpp.postProcessPropertyValues(null, null, transactionalFieldWithProperties, null);
babpp.postProcessPropertyValues(null, null, transactionalField, null);
assertNotNull(transactionalFieldWithProperties.em);
assertNotNull(transactionalField.em);