Context Navigation

Changeset 2602

Timestamp:

07/06/08 10:05:22 (3 months ago)

Author:

jmoore

Message:

ticket:1017 - Updating blitz integration tests

Location:

trunk/components/blitz/test/ome/icy

Files:

r2597	r2602
24	24	import omero.api.IAdminPrxHelper;
25	25	import omero.api._IAdminTie;
	26	import omero.constants.CLIENTUUID;
26	27
27	28	import org.aopalliance.intercept.MethodInvocation;
…	…
51	52	ServiceFactoryI sf;
52	53	Map<String, Ice.Object> map;
	54	Ice.Current current = new Ice.Current();
	55	{
	56	current.ctx = new HashMap<String, String>();
	57	current.ctx.put(CLIENTUUID.value, "clientuuid");
	58	}
53	59
54	60	// FIXME OmeroContext should be an interface!
…	…
103	109
104	110	Principal p = new Principal("session", "group", "type");
105		sf = new ServiceFactoryI(context, manager, executor, p, hwi);
	111	sf = new ServiceFactoryI(current, context, manager, executor, p, hwi);
106	112	};
107	113

r2383	r2602
8	8
9	9	import java.util.ArrayList;
	10	import java.util.HashMap;
10	11	import java.util.List;
11	12
…	…
20	21	import omero.api.IAdminPrx;
21	22	import omero.api.IAdminPrxHelper;
	23	import omero.constants.CLIENTUUID;
22	24
23	25	import org.jmock.Mock;
…	…
49	51	"classpath:omero/test.xml",
50	52	"classpath:ome/services/blitz-servantDefinitions.xml" });
	53	Ice.Current current = new Ice.Current();
	54	{
	55	current.ctx = new HashMap<String, String>();
	56	current.ctx.put(CLIENTUUID.value, "clientuuid");
	57	}
51	58
52	59	@Override
…	…
77	84	Principal p = new Principal("user1", "group", "event");
78	85
79		sf1 = new ServiceFactoryI(ctx, manager, executor, p,
	86	sf1 = new ServiceFactoryI(current, ctx, manager, executor, p,
80	87	new ArrayList<HardWiredInterceptor>());
81	88	curr1.id = id1;
…	…
83	90
84	91	Principal p2 = new Principal("user2", "group", "event");
85		sf2 = new ServiceFactoryI(ctx, manager, executor, p2,
	92	sf2 = new ServiceFactoryI(current, ctx, manager, executor, p2,
86	93	new ArrayList<HardWiredInterceptor>());
87	94	curr2.id = id2;

r2383	r2602
18	18	import omero.api.ServiceInterfacePrx;
19	19	import omero.api._IQueryTie;
	20	import omero.constants.CLIENTUUID;
20	21
21	22	import org.jmock.Mock;
…	…
42	43	Ice.Identity id = Ice.Util.stringToIdentity("test");
43	44	Map<String, Ice.Object> map = new HashMap<String, Ice.Object>();
	45	Ice.Current current = new Ice.Current();
	46	{
	47	current.ctx = new HashMap<String, String>();
	48	current.ctx.put(CLIENTUUID.value, "clientuuid");
	49	}
44	50
45	51	@Override
…	…
58	64	cacheMock.expects(once()).method("get").will(
59	65	returnValue(new Element("activeServants", map)));
60		sf = new ServiceFactoryI(~~null, manager, executor, new Principal("a"~~,
61		"b", "c"), null);
	66	sf = new ServiceFactoryI(current, null, manager, executor,
	67	new Principal("a", "b", "c"), null);
62	68	}
63	69