Changeset 1061 for branches/bioformats-omero
- Timestamp:
- 11/02/06 15:36:32 (2 years ago)
- Location:
- branches/bioformats-omero
- Files:
-
- 1 added
- 3 modified
Legend:
- Unmodified
- Added
- Removed
-
branches/bioformats-omero/test/ome/formats/testclient/ExampleUnitTest.java
r998 r1061 39 39 40 40 import ome.formats.OMEROMetadataStore; 41 import ome.formats.importer.ImportFixture; 42 import ome.formats.importer.ImportLibrary; 41 43 import ome.model.containers.Dataset; 44 import ome.system.Login; 42 45 import ome.system.ServiceFactory; 43 46 … … 52 55 53 56 public void testUseHardCoded() throws Exception { 54 ServiceFactory sf = new ServiceFactory( );57 ServiceFactory sf = new ServiceFactory(new Login("root","ome")); 55 58 56 59 Dataset d = new Dataset(); -
branches/bioformats-omero/test/ome/formats/testclient/StatefulServiceTest.java
r1026 r1061 31 31 32 32 import java.util.Collections; 33 import java.util.List; 33 34 import java.util.Set; 34 35 … … 38 39 import org.testng.annotations.Test; 39 40 41 import ome.api.RawPixelsStore; 42 import ome.formats.importer.ImportLibrary; 43 import ome.formats.importer.TinyImportFixture; 40 44 import ome.model.containers.Dataset; 41 45 import ome.model.core.Image; 42 46 import ome.model.core.Pixels; 43 47 import ome.model.meta.Event; 48 import ome.model.meta.EventLog; 49 import ome.parameters.Parameters; 44 50 import ome.system.EventContext; 45 51 import ome.system.Login; … … 47 53 import ome.util.builders.PojoOptions; 48 54 import omeis.providers.re.RenderingEngine; 55 import omeis.providers.re.codomain.ReverseIntensityContext; 49 56 50 57 import junit.framework.TestCase; … … 61 68 protected Dataset d; 62 69 70 protected Pixels p; 71 63 72 @Configuration( beforeTestClass = true ) 64 73 public void setup() throws Exception { … … 67 76 fixture = new TinyImportFixture(sf); 68 77 fixture.setUp(); 69 fixture.doImport( ImportLibrary.SimpleStep);78 fixture.doImport(); 70 79 d = fixture.getDataset(); 80 81 // TODO ImportLibrary.Step.step(int) should be refactored to 82 // step(long pixId, int planenum, byte[] plane, int z, int c, int z) 83 // then we can simply get the pixId directly from the fixture since 84 // it's only importing one image. (could also make step nullable and 85 // get rid of SimpleStep (add though, LoggingStep) 86 Set<Dataset> set = sf.getPojosService() 87 .loadContainerHierarchy(Dataset.class,Collections.singleton(d.getId()), 88 new PojoOptions().leaves().map()); 89 90 Image i = (Image) set.iterator().next().linkedImageList().get(0); 91 p = i.getDefaultPixels(); 92 93 assertNotNull( p ); 71 94 } 72 95 … … 82 105 * than client-->bioformats. need to fix that 83 106 */ 84 @Test( groups = {" eventcontext"} )107 @Test( groups = {"ticket:326"} ) 85 108 public void testTwoCallsToSameStatefulService() throws Exception { 86 109 87 // TODO ImportLibrary.Step.step(int) should be refactored to 88 // step(long pixId, int planenum, byte[] plane, int z, int c, int z) 89 // then we can simply get the pixId directly from the fixture since 90 // it's only importing one image. (could also make step nullable and 91 // get rid of SimpleStep (add though, LoggingStep) 92 Set<Dataset> set = sf.getPojosService() 93 .loadContainerHierarchy(Dataset.class,Collections.singleton(d.getId()), 94 new PojoOptions().leaves().map()); 95 96 Image i = (Image) set.iterator().next().linkedImageList().get(0); 97 Pixels p = i.getDefaultPixels(); 98 99 assertNotNull( p ); 100 101 RenderingEngine re = sf.createRenderingEngine(); 102 re.lookupPixels( p.getId() ); 103 re.lookupRenderingDef( p.getId() ); 104 re.load(); 110 RenderingEngine re = newRE(); 105 111 106 112 EventContext e0 = re.getCurrentEventContext(); … … 115 121 } 116 122 123 @Test( groups = {"ticket:326"} ) 124 public void testEventLogProduction() throws Exception { 125 126 RenderingEngine re = newRE(); 127 long eventId = re.getCurrentEventContext().getCurrentEventId(); 128 List<EventLog> logs = getLogsForEvent(eventId); 129 assertTrue( logs.size() == 0 ); 130 131 re.setRGBA(0, 0, 0, 0, 0); 132 re.saveCurrentSettings(); 133 134 logs = getLogsForEvent(eventId); 135 assertTrue( logs.size() > 0 ); 136 137 } 138 139 // ~ Helpers 140 // ========================================================================= 141 142 private RenderingEngine newRE() { 143 RenderingEngine re = sf.createRenderingEngine(); 144 re.lookupPixels( p.getId() ); 145 re.lookupRenderingDef( p.getId() ); 146 re.load(); 147 return re; 148 } 149 150 private List<EventLog> getLogsForEvent(long eventId) { 151 List<EventLog> logs = sf.getQueryService().findAllByQuery( 152 "from EventLog log where log.event.id = :id", 153 new Parameters().addId(eventId)); 154 return logs; 155 } 156 117 157 } -
branches/bioformats-omero/test/ome/formats/testclient/ThumbnailServiceTest.java
r1019 r1061 42 42 43 43 import ome.formats.OMEROMetadataStore; 44 import ome.formats.importer.ImportFixture; 45 import ome.formats.importer.ImportLibrary; 44 46 import ome.model.containers.Dataset; 45 47 import ome.model.core.Image;
