diff options
4 files changed, 15 insertions, 38 deletions
diff --git a/org.eclipse.scout.rt.client.test/src/test/java/org/eclipse/scout/rt/client/ui/basic/table/organizer/OrganizeColumnsFormTest.java b/org.eclipse.scout.rt.client.test/src/test/java/org/eclipse/scout/rt/client/ui/basic/table/organizer/OrganizeColumnsFormTest.java index 85754dfcf5..dfbc2ef986 100644 --- a/org.eclipse.scout.rt.client.test/src/test/java/org/eclipse/scout/rt/client/ui/basic/table/organizer/OrganizeColumnsFormTest.java +++ b/org.eclipse.scout.rt.client.test/src/test/java/org/eclipse/scout/rt/client/ui/basic/table/organizer/OrganizeColumnsFormTest.java @@ -24,9 +24,12 @@ import org.eclipse.scout.rt.client.ui.desktop.outline.AbstractOutline; import org.eclipse.scout.rt.client.ui.desktop.outline.pages.AbstractPageWithNodes; import org.eclipse.scout.rt.client.ui.desktop.outline.pages.IPage; import org.eclipse.scout.rt.client.ui.dnd.JavaTransferObject; +import org.eclipse.scout.rt.platform.BEANS; +import org.eclipse.scout.rt.platform.BeanMetaData; import org.eclipse.scout.rt.platform.IBean; import org.eclipse.scout.rt.testing.client.runner.ClientTestRunner; import org.eclipse.scout.rt.testing.client.runner.RunWithClientSession; +import org.eclipse.scout.rt.testing.platform.BeanTestingHelper; import org.eclipse.scout.rt.testing.platform.runner.RunWithSubject; import org.eclipse.scout.rt.testing.shared.AllAccessControlService; import org.eclipse.scout.rt.testing.shared.TestingUtility; @@ -49,7 +52,8 @@ public class OrganizeColumnsFormTest { @Before public void before() { - m_reg = TestingUtility.registerWithTestingOrder(AllAccessControlService.class); + BeanMetaData newBean = new BeanMetaData(AllAccessControlService.class).withOrder(BeanTestingHelper.TESTING_BEAN_ORDER); + m_reg = BEANS.getBeanManager().registerBean(newBean); } @After diff --git a/org.eclipse.scout.rt.platform.test/src/main/java/org/eclipse/scout/rt/testing/platform/BeanTestingHelper.java b/org.eclipse.scout.rt.platform.test/src/main/java/org/eclipse/scout/rt/testing/platform/BeanTestingHelper.java index 76b2735b9f..c760b420e2 100644 --- a/org.eclipse.scout.rt.platform.test/src/main/java/org/eclipse/scout/rt/testing/platform/BeanTestingHelper.java +++ b/org.eclipse.scout.rt.platform.test/src/main/java/org/eclipse/scout/rt/testing/platform/BeanTestingHelper.java @@ -90,24 +90,6 @@ public class BeanTestingHelper { } /** - * Register a new bean to replace an existing bean. - */ - public <T> IBean<T> registerWithReplace(Class<T> beanClass) { - IBean<?> bean = BEANS.getBeanManager().getBean(beanClass); - BeanMetaData newBean = new BeanMetaData(bean).withReplace(true); - return BEANS.getBeanManager().registerBean(newBean); - } - - /** - * Register an existing bean with order {@link TESTING_BEAN_ORDER} - */ - public <T> IBean<T> registerWithTestingOrder(Class<T> beanClass) { - IBean<?> bean = BEANS.getBeanManager().getBean(beanClass); - BeanMetaData newBean = new BeanMetaData(bean).withOrder(TESTING_BEAN_ORDER); - return BEANS.getBeanManager().registerBean(newBean); - } - - /** * Unregister a bean */ public void unregisterBean(IBean<?> bean) { diff --git a/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/BeanTestingHelperTest.java b/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/BeanTestingHelperTest.java index 67265be610..6d090dec7d 100644 --- a/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/BeanTestingHelperTest.java +++ b/org.eclipse.scout.rt.platform.test/src/test/java/org/eclipse/scout/rt/platform/BeanTestingHelperTest.java @@ -86,18 +86,4 @@ public class BeanTestingHelperTest { BeanTestingHelper.get().unregisterBean(bean3); } } - - @Test - public void testRegisterWithTestingOrder() { - IBean<FixtureBean> bean1 = BeanTestingHelper.get().registerBean(new BeanMetaData(FixtureBean.class).withOrder(100)); - IBean<FixtureBean> bean2 = BeanTestingHelper.get().registerWithTestingOrder(FixtureBean.class); - try { - assertEquals(FixtureBean.class, BEANS.get(FixtureBean.class).getClass()); - assertEquals(BeanTestingHelper.TESTING_BEAN_ORDER, BEANS.getBeanManager().getBean(FixtureBean.class).getBeanAnnotation(Order.class).value(), 0); - } - finally { - BeanTestingHelper.get().unregisterBean(bean1); - BeanTestingHelper.get().unregisterBean(bean2); - } - } } diff --git a/org.eclipse.scout.rt.shared.test/src/main/java/org/eclipse/scout/rt/testing/shared/TestingUtility.java b/org.eclipse.scout.rt.shared.test/src/main/java/org/eclipse/scout/rt/testing/shared/TestingUtility.java index 64771a389f..e94ce8dc97 100644 --- a/org.eclipse.scout.rt.shared.test/src/main/java/org/eclipse/scout/rt/testing/shared/TestingUtility.java +++ b/org.eclipse.scout.rt.shared.test/src/main/java/org/eclipse/scout/rt/testing/shared/TestingUtility.java @@ -29,7 +29,8 @@ import org.junit.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -// TODO sme [9.0] mark as bean related methods as deprecated (use BeanTestingHelper instead) and remove in 10.0 (clearHttpAuthenticationCache will be removed completely) +// TODO sme [9.0] mark as bean related methods as deprecated (use BeanTestingHelper instead) and remove in 10.0. +// Methods clearHttpAuthenticationCache, registerWithReplace, registerWithTestingOrder will be removed completely. public final class TestingUtility { private static final Logger LOG = LoggerFactory.getLogger(TestingUtility.class); @@ -62,17 +63,21 @@ public final class TestingUtility { } /** - * @see BeanTestingHelper#registerWithReplace(Class) + * Register a new bean to replace an existing bean. */ public static IBean<?> registerWithReplace(Class<?> beanClass) { - return BeanTestingHelper.get().registerWithReplace(beanClass); + IBean<?> bean = BEANS.getBeanManager().getBean(beanClass); + BeanMetaData newBean = new BeanMetaData(bean).withReplace(true); + return BEANS.getBeanManager().registerBean(newBean); } /** - * @see BeanTestingHelper#registerWithTestingOrder(Class) + * Register an existing bean with order {@link TESTING_BEAN_ORDER} */ public static IBean<?> registerWithTestingOrder(Class<?> beanClass) { - return BeanTestingHelper.get().registerWithTestingOrder(beanClass); + IBean<?> bean = BEANS.getBeanManager().getBean(beanClass); + BeanMetaData newBean = new BeanMetaData(bean).withOrder(TESTING_BEAN_ORDER); + return BEANS.getBeanManager().registerBean(newBean); } /** |