Changeset 2601
Legend:
- Unmodified
- Added
- Removed
-
trunk/components/server/test/ome/server/itests/spw/SpwTest.java
r2236 r2601 30 30 @Test 31 31 public void testMinimalSave() { 32 // The trick is to save via the WellSample 32 33 33 Screen s = new Screen("s"); 34 34 Plate p = new Plate("p"); 35 35 Well w = new Well(); 36 Reagent r = new Reagent("r"); 36 Reagent r = new Reagent(); 37 r.setName("r"); 37 38 ScreenAcquisition sa = new ScreenAcquisition(s); 38 WellSample ws = new WellSample(w, sa); 39 WellSample ws = new WellSample(w); 40 ws.linkScreenAcquisition(sa); 39 41 40 42 s.linkPlate(p); 41 43 p.addWell(w); 42 44 43 s. linkReagent(r);44 r. addWell(w);45 s.addReagent(r); 46 r.linkWell(w); 45 47 46 48 ws.linkImage(new Image("i")); 47 49 w.addWellSample(ws); 48 sa. addWellSample(ws);50 sa.linkWellSample(ws); 49 51 50 ws = iUpdate.saveAndReturnObject(ws);52 s = iUpdate.saveAndReturnObject(s); 51 53 } 52 54 … … 61 63 p.addWell(w); 62 64 63 Reagent r = new Reagent("r"); 64 s.linkReagent(r); 65 r.addWell(w); 65 Reagent r = new Reagent(); 66 r.setName("r"); 67 s.addReagent(r); 68 r.linkWell(w); 66 69 67 70 s = iUpdate.saveAndReturnObject(s); … … 69 72 w = p.unmodifiableWells().iterator().next(); 70 73 71 w = iQuery 72 .findByQuery( 73 "select w from Well w left outer join fetch w.wellSamples where w.id = :id", 74 new Parameters().addId(w.getId())); 74 w = iQuery.findByQuery("select w from Well w " 75 + "left outer join fetch w.wellSample " + "where w.id = :id", 76 new Parameters().addId(w.getId())); 75 77 76 78 sa = new ScreenAcquisition(s); 77 79 sa = iUpdate.saveAndReturnObject(sa); 78 80 79 WellSample ws = new WellSample(w, sa); 81 WellSample ws = new WellSample(w); 82 ws.linkScreenAcquisition(sa); 80 83 ws.linkImage(new Image("i")); 81 84 w.addWellSample(ws); 82 sa.addWellSample(ws);83 85 ws = iUpdate.saveAndReturnObject(ws); 84 86
