Changeset 1402

Timestamp:

04/13/07 13:09:42 (20 months ago)

Author:

jmoore

Message:

#614 Fixed missing static. Blitz licensing should be functional.

Location:

trunk/components/tools/licenses

Files:

• src/ome/services/licenses/LicenseSessionListener.java (modified) (2 diffs)
• src/ome/services/licenses/LicenseWiring.java (modified) (2 diffs)
• test/ome/services/licenses/test/BlitzLicenseTest.java (modified) (5 diffs)

trunk/components/tools/licenses/src/ome/services/licenses/LicenseSessionListener.java

@@ -22 +22 @@
 /**
  * Listens for {@link AbstractSessionMessages} sent by
- * {@link ome.services.icy.fire.SesssionManagerI} and 
+ * {@link ome.services.icy.fire.SesssionManagerI} and
  * {@link ome.services.icy.impl.ServiceFactoryI} and creates licenses
- * when necessary for the user. The listener decouples the session 
+ * when necessary for the user. The listener decouples the session
  * creation from the licensing logic.
  *
  * This is notably different from the process needed to acquire a
- * license in the application server case, since there is no 
+ * license in the application server case, since there is no
  * central session.
  *
@@ -60 +60 @@
                 try {
                     byte[] token = lic.acquireLicense();
+                    wiring.setToken(create.getSessionId(),token);
                 } finally {
                     logout();

trunk/components/tools/licenses/src/ome/services/licenses/LicenseWiring.java

@@ -56 +56 @@
     LicenseStore store = new LicenseBean();
 
-    private Map<String, byte[]> tokensBySession = Collections
+    private static Map<String, byte[]> tokensBySession = Collections
             .synchronizedMap(new HashMap<String, byte[]>());
 
@@ -64 +64 @@
     byte[] getToken(String sessionName) {
         return tokensBySession.get(sessionName);
+    }
+
+    void setToken(String sessionName, byte[] token) {
+        tokensBySession.put(sessionName, token);
     }
 

trunk/components/tools/licenses/test/ome/services/licenses/test/BlitzLicenseTest.java

@@ -11 +11 @@
 import ome.services.icy.client.IceServiceFactory;
 import ome.services.licenses.LicensedServiceFactory;
+import ome.system.Login;
+import ome.system.OmeroContext;
+import omero.ServerError;
 import omero.api.ServiceInterfacePrx;
 import omero.licenses.ILicense;
@@ -18 +21 @@
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 @Test( groups = {"client","integration","blitz"} )
-public class BlitzLicenseTest extends TestCase{
+public class BlitzLicenseTest extends TestCase {
 
-    IceServiceFactory ice;
+    OmeroContext context;
+    Login rootLogin;
+    IceServiceFactory ice, root;
     ILicensePrx licenseService;
     byte[] token;
-    
+
     @Override
-    @BeforeClass
+    @BeforeMethod
     protected void setUp() throws Exception {
         super.setUp();
-        
+
+        context = OmeroContext.getInstance("ome.client.test");
+        rootLogin = (Login) context.getBean("rootLogin");
         ice = new IceServiceFactory(null,null,null);
         ice.createSession();
-        ServiceInterfacePrx prx = ice.getProxy().getByName("omero.licenses.ILicense");
-        licenseService = ILicensePrxHelper.uncheckedCast(prx);
+        root = new IceServiceFactory(null, null, rootLogin);
+        root.createSession();
+
+        licenseService = licensePrx(ice);
+
     }
-     
+
     @Override
     @AfterClass
     protected void tearDown() throws Exception {
-        licenseService.resetLicenses();
+        licensePrx(root).resetLicenses();
         super.tearDown();
     }
-    
+
     @Test
     public void testAcquireLicenseAutomatically() throws Exception {
@@ -50 +61 @@
         passes(true);
     }
-    
+
     @Test
     public void testAcquireLicenseManually() throws Exception {
         passes(true);
-        licenseService.releaseLicense(token);
+        assertTrue( licenseService.releaseLicense(token) );
         passes(false);
         token = licenseService.acquireLicense();
         passes(true);
     }
-    
+
     @Test
     public void testReset() throws Exception {
-        
+
         long totalA = licenseService.getTotalLicenseCount();
         long availA  = licenseService.getAvailableLicenseCount();
-        
+
         token = licenseService.acquireLicense();
-        
+
         long totalB = licenseService.getTotalLicenseCount();
         long availB = licenseService.getAvailableLicenseCount();
-        
-        licenseService.resetLicenses();
-        
+
+        licensePrx(root).resetLicenses();
+
         long totalC = licenseService.getTotalLicenseCount();
         long availC = licenseService.getAvailableLicenseCount();
-        
+
         assertTrue(totalA == totalB && totalB == totalC);
-        assertTrue(availA == totalA && totalC == availC);
-        assertTrue(availB == totalB - 1);
-        
+        assertTrue(availA < totalA && totalC == availC);
+        assertTrue(availB == (availA - 1));
+
     }
-    
-    @Test
+
+    @Test(groups = {"ignore","NYI"})
     public void testTimeouts() {
         fail("Not implemented.");
@@ -89 +100 @@
     // // ~ Helpers
     // =========================================================================
-    
+
     protected void passes(boolean shouldpass) throws Exception {
         try {
@@ -103 +114 @@
 
     }
+
+    private ILicensePrx licensePrx(IceServiceFactory sf) throws ServerError {
+        ServiceInterfacePrx prx = sf.getProxy().getByName("omero.licenses.ILicense");
+        ILicensePrx licenses = ILicensePrxHelper.uncheckedCast(prx);
+        return licenses;
+    }
 }