Repository: deltaspike Updated Branches: refs/heads/master 93fff0fca -> cfd2c6f58
Fix DELTASPIKE-370, DELTASPIKE-371 and DELTASPIKE-372 Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/cfd2c6f5 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/cfd2c6f5 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/cfd2c6f5 Branch: refs/heads/master Commit: cfd2c6f584bee84fedf941fcb7d84858635137d0 Parents: 93fff0f Author: Rafael Benevides <[email protected]> Authored: Fri Apr 25 13:02:57 2014 -0300 Committer: Rafael Benevides <[email protected]> Committed: Tue May 27 12:14:55 2014 -0300 ---------------------------------------------------------------------- .../cdise/tck/ContainerCtrlTckTest.java | 18 ++++++++++++++++-- deltaspike/parent/pom.xml | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cfd2c6f5/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java index db5d6d4..fc1e101 100644 --- a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java +++ b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java @@ -166,7 +166,7 @@ public class ContainerCtrlTckTest cdiContainer.boot(); cdiContainer.getContextControl().startContexts(); - // now do some randmo stuff + // now do some random stuff BeanManager beanManager = cdiContainer.getBeanManager(); Assert.assertNotNull(beanManager); @@ -179,9 +179,23 @@ public class ContainerCtrlTckTest Assert.assertNotNull(carRepair); Car car = carRepair.getCar(); + Assert.assertNotNull(car); + Assert.assertNotNull(car.getUser()); - cdiContainer.getContextControl().startContexts(); + + carRepair.getCar().getUser().setName("tester"); + Assert.assertEquals("tester", car.getUser().getName()); + + Assert.assertFalse(CarRepair.isPreDestroyCalled()); + Assert.assertFalse(Car.isPreDestroyCalled()); + Assert.assertFalse(TestUser.isPreDestroyCalled()); + + cdiContainer.getContextControl().stopContexts(); + + Assert.assertTrue(CarRepair.isPreDestroyCalled()); + Assert.assertTrue(Car.isPreDestroyCalled()); + Assert.assertTrue(TestUser.isPreDestroyCalled()); cdiContainer.shutdown(); } http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cfd2c6f5/deltaspike/parent/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml index 1982c70..bbca526 100644 --- a/deltaspike/parent/pom.xml +++ b/deltaspike/parent/pom.xml @@ -49,7 +49,7 @@ <properties> <java.version>1.6</java.version> <owb.version>1.1.8</owb.version> - <weld.version>1.1.10.Final</weld.version> + <weld.version>1.1.19.Final</weld.version> <!-- testing stuff --> <junit.version>4.10</junit.version>
