From 0e75f9b0d26b78ab8259c66a72d2b324764a3704 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sun, 24 Aug 2014 19:29:43 +0200 Subject: [PATCH] [Minor] fixed broken tests due to wrong checking for observer updates --- .../postgresql/dao/test/ObserverUpdateTest.java | 11 ++++++----- .../cachedruntime/config/StrolchConfiguration.xml | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/test/java/li/strolch/persistence/postgresql/dao/test/ObserverUpdateTest.java b/src/test/java/li/strolch/persistence/postgresql/dao/test/ObserverUpdateTest.java index e999b280b..bb1279902 100644 --- a/src/test/java/li/strolch/persistence/postgresql/dao/test/ObserverUpdateTest.java +++ b/src/test/java/li/strolch/persistence/postgresql/dao/test/ObserverUpdateTest.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.Map; import li.strolch.agent.api.Observer; -import li.strolch.agent.api.ObserverHandler; +import li.strolch.agent.api.StrolchRealm; import li.strolch.model.Order; import li.strolch.model.Resource; import li.strolch.model.State; @@ -116,21 +116,22 @@ public class ObserverUpdateTest { // register an observer for orders and resources ElementAddedObserver observer = new ElementAddedObserver(); - runtimeMock.getContainer().getComponent(ObserverHandler.class).registerObserver(Tags.ORDER, observer); - runtimeMock.getContainer().getComponent(ObserverHandler.class).registerObserver(Tags.RESOURCE, observer); + StrolchRealm realm = runtimeMock.getRealm(StrolchConstants.DEFAULT_REALM); + realm.getObserverHandler().registerObserver(Tags.ORDER, observer); + realm.getObserverHandler().registerObserver(Tags.RESOURCE, observer); PrivilegeHandler privilegeHandler = runtimeMock.getAgent().getContainer().getPrivilegeHandler(); Certificate certificate = privilegeHandler.authenticate("test", "test".getBytes()); //$NON-NLS-1$ //$NON-NLS-2$ // create order Order newOrder = createOrder("MyTestOrder", "Test Name", "TestType", new Date(), State.CREATED); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ - try (StrolchTransaction tx = runtimeMock.getRealm(StrolchConstants.DEFAULT_REALM).openTx(certificate, "test")) { //$NON-NLS-1$ + try (StrolchTransaction tx = realm.openTx(certificate, "test")) { //$NON-NLS-1$ tx.getOrderMap().add(tx, newOrder); } // create resource Resource newResource = createResource("MyTestResource", "Test Name", "TestType"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ - try (StrolchTransaction tx = runtimeMock.getRealm(StrolchConstants.DEFAULT_REALM).openTx(certificate, "test");) { //$NON-NLS-1$ + try (StrolchTransaction tx = realm.openTx(certificate, "test");) { //$NON-NLS-1$ tx.getResourceMap().add(tx, newResource); } diff --git a/src/test/resources/cachedruntime/config/StrolchConfiguration.xml b/src/test/resources/cachedruntime/config/StrolchConfiguration.xml index 6f256379d..fe782ba2d 100644 --- a/src/test/resources/cachedruntime/config/StrolchConfiguration.xml +++ b/src/test/resources/cachedruntime/config/StrolchConfiguration.xml @@ -24,6 +24,7 @@ TRANSACTIONAL true + true