Context Navigation

Changeset 999

Timestamp:

10/01/06 15:13:40 (2 years ago)

Author:

jmoore

Message:

#238 Updates to tests getting ready for Spring 2.0 final (Currently 2.0M4 despite name)

Location:

trunk

Files:

r695	r999
74	74	protected void tearDown()
75	75	{
76		((LocalUpdate) updater).rollback();
	76	//((LocalUpdate) updater).rollback();
77	77	}
78	78	}

r992	r999
51	51	}
52	52
53		~~protected ConfigurableApplicationContext getContext(Object key)~~
54		{
	53	@Override
	54	protected ConfigurableApplicationContext loadContextLocations(String[] locations) {
55	55	return OmeroContext.getManagedServerContext();
56	56	}

r960	r999
124	124
125	125	protected String[] getConfigLocations() { return new String[]{}; }
126		protected ConfigurableApplicationContext getContext(Object key)
	126	@Override
	127	protected ConfigurableApplicationContext loadContextLocations(String[] locations)
127	128	{
128	129	return OmeroContext.getManagedServerContext();

r766	r999
75	75	private static Log log = LogFactory.getLog(PojosDaoTest.class);
76	76
77		/**
78		* @see org.springframework.test.AbstractDependencyInjectionSpringContextTests#getConfigLocations()
79		*/
80		protected String[] getConfigLocations() {
81
82		return ConfigHelper.getDaoConfigLocations();
83		}
84
85		@Override
86		protected ConfigurableApplicationContext getContext(Object key)
87		{
	77
	78	@Override protected String[] getConfigLocations() { return new String[]{}; }
	79	@Override protected ConfigurableApplicationContext loadContextLocations(String[] locations) {
88	80	return OmeroContext.getManagedServerContext();
89	81	}

r727	r999
10	10
11	11	import ome.conditions.ApiUsageException;
12		~~import ome.model.containers.Category;~~
13		~~import ome.model.containers.CategoryGroup;~~
14		~~import ome.model.containers.Dataset;~~
15	12	import ome.model.containers.Project;
16	13	import ome.parameters.Parameters;
17		import ome.server.itests.Abstract~~Internal~~ContextTest;
	14	import ome.server.itests.AbstractManagedContextTest;
18	15	import ome.services.query.CollectionCountQueryDefinition;
19		~~import ome.services.query.PojosLoadHierarchyQueryDefinition;~~
20		~~import ome.util.IdBlock;~~
21		~~import ome.util.builders.PojoOptions;~~
22	16
23		public class CollectionCountTest extends Abstract~~Internal~~ContextTest
	17	public class CollectionCountTest extends AbstractManagedContextTest
24	18	{
25	19

r770	r999
10	10	import ome.conditions.ApiUsageException;
11	11	import ome.parameters.Parameters;
12		import ome.server.itests.Abstract~~Internal~~ContextTest;
	12	import ome.server.itests.AbstractManagedContextTest;
13	13	import ome.services.query.PojosCGCPathsQueryDefinition;
14	14	import ome.util.builders.PojoOptions;
…	…
18	18	*/
19	19
20		public class CGCPathQueryTest extends Abstract~~Internal~~ContextTest
	20	public class CGCPathQueryTest extends AbstractManagedContextTest
21	21	{
22	22	PojosCGCPathsQueryDefinition q;

r770	r999
39	39
40	40	//Application-internal dependencies
41		~~import ome.conditions.InternalException;~~
42	41	import ome.model.containers.Dataset;
43	42	import ome.model.containers.Project;
44	43	import ome.model.meta.Experimenter;
45	44	import ome.parameters.Parameters;
46		~~import ome.server.itests.AbstractInternalContextTest;~~
47	45	import ome.server.itests.AbstractManagedContextTest;
48	46	import ome.services.query.PojosFindHierarchiesQueryDefinition;
…	…
67	65	public class QueryTest
68	66	extends
69		Abstract~~Internal~~ContextTest {
	67	AbstractManagedContextTest {
70	68
71	69	private static Log log = LogFactory.getLog(QueryTest.class);

r741	r999
36	36	import org.hibernate.Criteria;
37	37	import org.hibernate.Session;
	38	import org.hibernate.SessionFactory;
38	39	import org.jmock.Mock;
39	40	import org.jmock.MockObjectTestCase;
…	…
63	64	protected IQuery iQuery;
64	65	protected QueryImpl impl;
65		protected Mock mockSession;
	66	protected Mock mockSession, mockFactory;
66	67
67	68	@Configuration(beforeTestMethod = true)
…	…
73	74	pf.addAdvice( new ServiceHandler() );
74	75	iQuery = (IQuery) pf.getProxy();
75		~~mockSession = newMock~~();
	76	createMocks();
76	77	}
77	78
…	…
83	84	}
84	85
85		protected Mock newMock(){
86		final Mock mock = mock(Session.class);
	86	protected void createMocks(){
	87	mockSession = mock(Session.class);
	88	mockFactory = mock(SessionFactory.class);
87	89	impl.setHibernateTemplate(new HibernateTemplate(){
88	90	@Override
89	91	protected Session getSession()
90	92	{
91		mock.setDefaultStub( new DefaultResultStub() );
	93	mockSession.setDefaultStub( new DefaultResultStub() );
92	94	// mock.expects( once() ).method( "close" ).after( "test" );
93		return (Session) mock.proxy();
	95	return (Session) mockSession.proxy();
	96	}
	97
	98	@Override
	99	public SessionFactory getSessionFactory() {
	100	mockFactory.setDefaultStub( new DefaultResultStub() );
	101	return (SessionFactory) mockFactory.proxy();
94	102	}
95	103
96	104	});
97		~~return mock;~~
98	105	}
99	106