--- a/javacommons/security/tsrc/javasrc/com/nokia/mj/impl/security/midp/authorization/AccessControllerTests.java	Wed Sep 15 12:05:25 2010 +0300
+++ b/javacommons/security/tsrc/javasrc/com/nokia/mj/impl/security/midp/authorization/AccessControllerTests.java	Wed Oct 13 14:23:59 2010 +0300
@@ -47,7 +47,6 @@
 public class AccessControllerTests extends TestCase implements InstallerMain
 {
 
-    int assertTrace = 0;
     // Begin j2meunit test framework setup
     public void installerMain(String[] args)
     {
@@ -92,12 +91,6 @@
     {
     }
 
-    private void assertWithTrace(boolean aCondition)
-    {
-        assertTrue("" + assertTrace, aCondition);
-        assertTrace++;
-    }
-
     protected void testAccessControllerFactory()
     {
         Uid appUID1 = Uid.createUid("appUID1");
@@ -107,17 +100,17 @@
         String appName = "AccessControllerTests";
         // check null values
         ac1 = AccessControllerFactoryImpl.getAccessController(null, null);
-        assertWithTrace(ac1 == null);
+        assertTrue(ac1 == null);
         AccessControllerFactoryImpl.destroyAccessController(null);
         ac1 = AccessControllerFactoryImpl.getAccessController(null, "appName");
-        assertWithTrace(ac1 == null);
+        assertTrue(ac1 == null);
         AccessControllerFactoryImpl.destroyAccessController(null);
         // check duplicates
         AccessControllerFactoryImpl.destroyAccessController(appUID1);
         ac1 = AccessControllerFactoryImpl.getAccessController(appUID1, appName);
         ac2 = AccessControllerFactoryImpl.getAccessController(appUID1, appName);
         AccessControllerFactoryImpl.destroyAccessController(appUID1);
-        assertWithTrace(ac1 == ac2);
+        assertTrue(ac1 == ac2);
         // check destroy
         ac1 = AccessControllerFactoryImpl.getAccessController(appUID1, appName);
         AccessControllerFactoryImpl.destroyAccessController(appUID1);
@@ -125,7 +118,7 @@
         // call destroy two times (or calling it on a UID which does not have an instance)
         AccessControllerFactoryImpl.destroyAccessController(appUID1);
         AccessControllerFactoryImpl.destroyAccessController(appUID1);
-        assertWithTrace(ac1 != ac2);
+        assertTrue(ac1 != ac2);
     }
 
     protected void testAccessController()
@@ -142,32 +135,32 @@
         try
         {
             ac.checkPermission((Permission)null);
-            assertWithTrace(false);
+            assertTrue(false);
         }
         catch (AccessControlException e)
         {
-            assertWithTrace(true);
+            assertTrue(true);
         }
-        assertWithTrace(ac.checkPermission((String)null) == 0);
+        assertTrue(ac.checkPermission((String)null) == 0);
         // check permission which is not granted
         PermissionResolver.testClearCache();
         try
         {
             ac.checkPermission(new CommProtocolPermission("comm://"));
-            assertWithTrace(false);
+            assertTrue(false);
         }
         catch (AccessControlException e)
         {
-            assertWithTrace(true);
+            assertTrue(true);
         }
         try
         {
             ac.checkPermission(new CommProtocolPermission("comm://"));
-            assertWithTrace(false);
+            assertTrue(false);
         }
         catch (AccessControlException e)
         {
-            assertWithTrace(true);
+            assertTrue(true);
         }
         // check allowed permission which is granted
         PermissionResolver.testClearCache();
@@ -183,11 +176,11 @@
         try
         {
             ac.checkPermission(new FileProtocolPermission("file://myFile.txt", "read"));
-            assertWithTrace(false);
+            assertTrue(false);
         }
         catch (AccessControlException e)
         {
-            assertWithTrace(true);
+            assertTrue(true);
         }
         storage.removeGrantedPermissions(appUID);
         // check permission not allowed
@@ -209,11 +202,11 @@
         try
         {
             ac.checkPermission(new SocketProtocolPermission("socket://:100"));
-            assertWithTrace(false);
+            assertTrue(false);
         }
         catch (AccessControlException e)
         {
-            assertWithTrace(true);
+            assertTrue(true);
         }
         storage.removeGrantedPermissions(appUID);
         // check user permission with NO as interaction mode -> security exception thrown
@@ -235,35 +228,35 @@
         try
         {
             ac.checkPermission(new HttpProtocolPermissionImpl("http://"));
-            assertWithTrace(false);
+            assertTrue(false);
         }
         catch (AccessControlException e)
         {
-            assertWithTrace(true);
+            assertTrue(true);
         }
         try
         {
             ac.checkPermission(new HttpProtocolPermission("http://"));
-            assertWithTrace(false);
+            assertTrue(false);
         }
         catch (AccessControlException e)
         {
-            assertWithTrace(true);
+            assertTrue(true);
         }
         storage.removeGrantedPermissions(appUID);
         // check the named permissions: unknown permission
-        assertWithTrace(ac.checkPermission("unknownPermission") == 0);
+        assertTrue(ac.checkPermission("unknownPermission") == 0);
         // check the named permissions: allowed permission
         PermissionResolver.testClearCache();
         grantedPermissions = new Vector();
         grantedPermissions.addElement(new PolicyBasedPermissionImpl(
                                           "com.nokia.mj.impl.gcf.protocol.socket.SocketPermissionImpl",
-                                          "socket://*",
+                                          "socket://",
                                           null,
                                           null));
         storage.removeGrantedPermissions(appUID);
         storage.writeGrantedPermissions(appUID, null, grantedPermissions);
-        assertWithTrace(ac.checkPermission("javax.microedition.io.Connector.socket") == 1);
+        assertTrue(ac.checkPermission("javax.microedition.io.Connector.socket") == 1);
         // check the named permissions: user permission with NO interaction mode
         PermissionResolver.testClearCache();
         grantedPermissions = new Vector();
@@ -280,7 +273,7 @@
                                                                                  })));
         storage.removeGrantedPermissions(appUID);
         storage.writeGrantedPermissions(appUID, null, grantedPermissions);
-        assertWithTrace(ac.checkPermission("javax.microedition.io.Connector.http") == 0);
+        assertTrue(ac.checkPermission("javax.microedition.io.Connector.http") == 0);
         // check the named permissions: user permission with ONESHOT interaction mode
         PermissionResolver.testClearCache();
         grantedPermissions = new Vector();
@@ -297,7 +290,7 @@
                                                                                  })));
         storage.removeGrantedPermissions(appUID);
         storage.writeGrantedPermissions(appUID, null, grantedPermissions);
-        assertWithTrace(ac.checkPermission("javax.microedition.io.Connector.http") == -1);
+        assertTrue(ac.checkPermission("javax.microedition.io.Connector.http") == -1);
         // check the named permissions: user permission with BLANKET interaction mode (blanket prompt not shown yet)
         PermissionResolver.testClearCache();
         grantedPermissions = new Vector();
@@ -314,7 +307,7 @@
                                                                                  })));
         storage.removeGrantedPermissions(appUID);
         storage.writeGrantedPermissions(appUID, null, grantedPermissions);
-        assertWithTrace(ac.checkPermission("javax.microedition.io.Connector.http") == -1);
+        assertTrue(ac.checkPermission("javax.microedition.io.Connector.http") == -1);
         // check the named permissions: user permission with BLANKET interaction mode (blanket prompt shown already)
         PermissionResolver.testClearCache();
         grantedPermissions = new Vector();
@@ -332,7 +325,7 @@
         storage.removeGrantedPermissions(appUID);
         storage.writeGrantedPermissions(appUID, null, grantedPermissions);
         storage.writeUserSecuritySettingsPromptFlag(appUID, "Net Access", true);
-        assertWithTrace(ac.checkPermission("javax.microedition.io.Connector.http") == 1);
+        assertTrue(ac.checkPermission("javax.microedition.io.Connector.http") == 1);
         // check the named permissions: user permission with SESSION interaction mode (session prompt not shown already)
         PermissionResolver.testClearCache();
         grantedPermissions = new Vector();
@@ -350,7 +343,7 @@
         storage.removeGrantedPermissions(appUID);
         storage.writeGrantedPermissions(appUID, null, grantedPermissions);
         storage.writeUserSecuritySettingsPromptFlag(appUID, "Net Access", true);
-        assertWithTrace(ac.checkPermission("javax.microedition.io.Connector.http") == -1);
+        assertTrue(ac.checkPermission("javax.microedition.io.Connector.http") == -1);
         // check the named permissions: denied permission
         PermissionResolver.testClearCache();
         grantedPermissions = new Vector();
@@ -361,7 +354,7 @@
                                           null));
         storage.removeGrantedPermissions(appUID);
         storage.writeGrantedPermissions(appUID, null, grantedPermissions);
-        assertWithTrace(ac.checkPermission("javax.wireless.messaging.mms.send") == 0);
+        assertTrue(ac.checkPermission("javax.wireless.messaging.mms.send") == 0);
         // cleanup
         storage.removeGrantedPermissions(appUID);
         AccessControllerFactoryImpl.destroyAccessController(appUID);