MCL/sf/app/jrt: comparison javacommons/security/tsrc/javasrc/com/nokia/mj/impl/security/midp/authorization/PermissionGranterTests.java

equal deleted inserted replaced

-:2455ef1f5bbc
+:d5e927d5853b
 */
 public class PermissionGranterTests extends TestCase implements InstallerMain
 {
 private static String TEST_DATA_DIR;
+int assertTrace = 0;
 static
 {
 String platform = System.getProperty("os.name");
 if (platform != null && platform.equalsIgnoreCase("linux"))
 }
 else
 {
 TEST_DATA_DIR = "C:\\java\\securitytestdata\\";
 }
+}
+private void assertWithTrace(boolean aCondition)
+{
+assertTrue("" + assertTrace, aCondition);
+assertTrace++;
 }
 // general-purpose constants
 private static final String MIDP_PROFILE_ATTRIBUTE_NAME = "MicroEdition-Profile";
 private static final String MIDP3 = "MIDP-3.0";
 AuthenticationCredentials[] authCredentials = null;
 Hashtable allAttributes = new Hashtable();
 MIDPPermission[] jadPermissions;
 MIDPPermission[] jarPermissions;
 MIDPPermission[] allPermissions;
-assertTrue(permissionGranter != null);
+assertWithTrace(permissionGranter != null);
 // test the null values
 permissionGranter.removeSecurityData(session, appUID);
-permissionGranter.grantJarPermissions(null, null, null, (PermissionAttribute[])null);
+permissionGranter.grantJarPermissions(null, null, (PermissionAttribute[])null, null);
 grantedPermissions = storage.readGrantedPermissions(appUID);
-assertTrue(grantedPermissions == null);
+assertWithTrace(grantedPermissions == null);
 // populate the storage
 storage.removeAuthenticationStorageData(appUID);
 permissionGranter.removeSecurityData(session, appUID);
 AuthenticationStorageData authStorageData = new AuthenticationStorageData("protDomain", "category", "jarHash", "certHash", null, null);
 storage.writeAuthenticationStorageData(appUID, authStorageData);
 permissionGranter.grantJadPermissions(appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
 allAttributes.clear();
 allAttributes.put(PermissionAttribute.OPTIONAL_LEGACY_ATTRIBUTE_NAME, new Attribute("",MIDP2_DATAGRAM_PERMISSION + COMMA + "                  " + MIDP2_COMM_PERMISSION));
 allAttributes.put(PermissionAttribute.MANDATORY_LEGACY_ATTRIBUTE_NAME, new Attribute("",MIDP2_SOCKET_PERMISSION + COMMA + MIDP2_HTTP_PERMISSION));
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
-grantedPermissions = storage.readGrantedPermissions(appUID);
+permissionGranter.addSecurityData(session, appUID, null);
-assertTrue(checkGrantedPermissions(grantedPermissions, getPolicyPermissions("Manufacturer", new String[]
+grantedPermissions = storage.readGrantedPermissions(appUID);
+assertWithTrace(checkGrantedPermissions(grantedPermissions, getPolicyPermissions("Manufacturer", new String[]
 {
 INTERNAL_DATAGRAM_PERMISSION, INTERNAL_COMM_PERMISSION, INTERNAL_SOCKET_PERMISSION,INTERNAL_HTTP_PERMISSION,"javax.microedition.PropertyPermission","javax.microedition.midlet.AutoStartPermission"
 }),
 getDefaultPermissions()));
 // 1.1 Legacy, signed: P1, P2 requested in the JAD, P3, P4 requested in the JAR -> grant the requested permissions filled in with right targets/actions from the policy
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP2));
 allAttributes.put(PermissionAttribute.OPTIONAL_LEGACY_ATTRIBUTE_NAME, new Attribute("",MIDP2_DATAGRAM_PERMISSION + COMMA + "                  " + MIDP2_COMM_PERMISSION));
 allAttributes.put(PermissionAttribute.MANDATORY_LEGACY_ATTRIBUTE_NAME, new Attribute("",MIDP2_SOCKET_PERMISSION + COMMA + MIDP2_HTTP_PERMISSION));
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
-grantedPermissions = storage.readGrantedPermissions(appUID);
+permissionGranter.addSecurityData(session, appUID, null);
-assertTrue(checkGrantedPermissions(grantedPermissions, getPolicyPermissions("IdentifiedThirdParty",
+grantedPermissions = storage.readGrantedPermissions(appUID);
+assertWithTrace(checkGrantedPermissions(grantedPermissions, getPolicyPermissions("IdentifiedThirdParty",
 new String[] {INTERNAL_DATAGRAM_PERMISSION, INTERNAL_COMM_PERMISSION, INTERNAL_SOCKET_PERMISSION,INTERNAL_HTTP_PERMISSION}),
 getAssignedPermissions("IdentifiedThirdParty")));
 // 1.2 One of the requested mandatory permission is not available in the domain -> fail
 try
 {
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP3));
 allAttributes.put(PermissionAttribute.OPTIONAL_ATTRIBUTE_PREFIX + "1", new Attribute("",MIDP3_DATAGRAM_PERMISSION));
 allAttributes.put(PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "1", new Attribute("",MIDP3_RUNTIME_PERMISSION + " name"));
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
-assertTrue(INVALID_PERMISSION_VALUE_MSG, false);
+permissionGranter.addSecurityData(session, appUID, null);
+assertWithTrace(false);
 }
 catch (InvalidAttributeException e)
 {
-assertTrue(INVALID_PERMISSION_VALUE_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
+assertWithTrace(
 e.getOtaStatusCode() == OtaStatusCode.APPLICATION_AUTHORIZATION_FAILURE
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_UNSUPPORTED,
 new String[] {PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "1"})));
 }
 permissionGranter.grantJadPermissions(appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP3));
 allAttributes.put(PermissionAttribute.OPTIONAL_ATTRIBUTE_PREFIX + "1", new Attribute("",MIDP3_RUNTIME_PERMISSION + " name"));
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
-grantedPermissions = storage.readGrantedPermissions(appUID);
+permissionGranter.addSecurityData(session, appUID, null);
-assertTrue(checkGrantedPermissions(grantedPermissions, getAssignedPermissions("IdentifiedThirdParty"), true));
+grantedPermissions = storage.readGrantedPermissions(appUID);
+assertWithTrace(checkGrantedPermissions(grantedPermissions, getAssignedPermissions("IdentifiedThirdParty"), true));
 // 2. Legacy, signed : permissions NOT requested in JAD & permissions requested in JAR -> grant the requested permissions filled in with right
 // targets/actions from the policy plus the assigned ones
 storage.removeAuthenticationStorageData(appUID);
 permissionGranter.removeSecurityData(session, appUID);
 authData = new AuthenticationStorageData("Operator", "OPD", null, null, null, null);
 permissionGranter.grantJadPermissions(appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP2));
 allAttributes.put(PermissionAttribute.MANDATORY_LEGACY_ATTRIBUTE_NAME, new Attribute("",MIDP2_SOCKET_PERMISSION + COMMA + MIDP2_HTTP_PERMISSION));
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
-grantedPermissions = storage.readGrantedPermissions(appUID);
+permissionGranter.addSecurityData(session, appUID, null);
-assertTrue(checkGrantedPermissions(grantedPermissions, getPolicyPermissions("Operator", new String[]
+grantedPermissions = storage.readGrantedPermissions(appUID);
+assertWithTrace(checkGrantedPermissions(grantedPermissions, getPolicyPermissions("Operator", new String[]
 {
 INTERNAL_SOCKET_PERMISSION, INTERNAL_HTTP_PERMISSION,"javax.microedition.PropertyPermission","javax.microedition.midlet.AutoStartPermission"
 }),
 getDefaultPermissions()));
 // 3. Legacy, signed : permissions NOT requested in JAD & permissions NOT requested in JAR -> grant only the "assigned" permissions
 authCredentials[0] = new AuthenticationCredentials("IdentifiedThirdParty", "ITDP");
 permissionGranter.grantJadPermissions(appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP3));
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
-grantedPermissions = storage.readGrantedPermissions(appUID);
+permissionGranter.addSecurityData(session, appUID, null);
-assertTrue(grantedPermissions != null && checkGrantedPermissions(grantedPermissions, getAssignedPermissions("IdentifiedThirdParty"), true));
+grantedPermissions = storage.readGrantedPermissions(appUID);
+assertWithTrace(grantedPermissions != null && checkGrantedPermissions(grantedPermissions, getAssignedPermissions("IdentifiedThirdParty"), true));
 // same for a domain which has one assigned permissions -> only the assigned + default permissions are granted
 storage.removeAuthenticationStorageData(appUID);
 permissionGranter.removeSecurityData(session, appUID);
 authData = new AuthenticationStorageData("Operator", "OPD", null, null, null, null);
 storage.writeAuthenticationStorageData(appUID, authData);
 authCredentials[0] = new AuthenticationCredentials("Operator", "OPD");
 permissionGranter.grantJadPermissions(appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP3));
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
-grantedPermissions = storage.readGrantedPermissions(appUID);
+permissionGranter.addSecurityData(session, appUID, null);
-assertTrue(checkGrantedPermissions(grantedPermissions, getPolicyPermissions("Operator", new String[] {"javax.microedition.PropertyPermission","javax.microedition.midlet.AutoStartPermission"}),
+grantedPermissions = storage.readGrantedPermissions(appUID);
+assertWithTrace(checkGrantedPermissions(grantedPermissions, getPolicyPermissions("Operator", new String[] {"javax.microedition.PropertyPermission","javax.microedition.midlet.AutoStartPermission"}),
 getDefaultPermissions()));
 // 4. Legacy, unsigned : permissions requested in JAD & permissions requested in JAR -> ignore requested permissions and
 //    grant all the permissions available in the policy for untrusted MIDlets
 storage.removeAuthenticationStorageData(appUID);
 permissionGranter.removeSecurityData(session, appUID);
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP2));
 allAttributes.put(PermissionAttribute.OPTIONAL_LEGACY_ATTRIBUTE_NAME, new Attribute("","MyOwnOptionalPermission"));
 allAttributes.put(PermissionAttribute.MANDATORY_LEGACY_ATTRIBUTE_NAME, new Attribute("","MyOwnMandatoryPermission"));
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
-grantedPermissions = storage.readGrantedPermissions(appUID);
+permissionGranter.addSecurityData(session, appUID, null);
-assertTrue(checkGrantedPermissions(grantedPermissions, getPolicyPermissions("UnidentifiedThirdParty")));
+grantedPermissions = storage.readGrantedPermissions(appUID);
+assertWithTrace(checkGrantedPermissions(grantedPermissions, getPolicyPermissions("UnidentifiedThirdParty")));
 // 5. Legacy, unsigned : permissions requested in JAD & permissions NOT requested in JAR -> ignore requested permissions and,
 //    grant all the permissions available in the policy for untrusted MIDlets
 storage.removeAuthenticationStorageData(appUID);
 permissionGranter.removeSecurityData(session, appUID);
 authData = new AuthenticationStorageData("UnidentifiedThirdParty", "UTPD", null, null, null, null);
 authCredentials[0] = new AuthenticationCredentials("UnidentifiedThirdParty", "ITDP");
 permissionGranter.grantJadPermissions(appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP2));
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
-grantedPermissions = storage.readGrantedPermissions(appUID);
+permissionGranter.addSecurityData(session, appUID, null);
-assertTrue(checkGrantedPermissions(grantedPermissions, getPolicyPermissions("UnidentifiedThirdParty")));
+grantedPermissions = storage.readGrantedPermissions(appUID);
+assertWithTrace(checkGrantedPermissions(grantedPermissions, getPolicyPermissions("UnidentifiedThirdParty")));
 // 6. Legacy, unsigned : permissions NOT requested in JAD & permissions requested in JAR -> ignore requested permissions and
 //    grant all the permissions available in the policy for untrusted MIDlets
 storage.removeAuthenticationStorageData(appUID);
 permissionGranter.removeSecurityData(session, appUID);
 authData = new AuthenticationStorageData("UnidentifiedThirdParty", "UTDP", null, null, null, null);
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP2));
 allAttributes.put(PermissionAttribute.OPTIONAL_LEGACY_ATTRIBUTE_NAME, new Attribute("","MyOwnOptionalPermission"));
 allAttributes.put(PermissionAttribute.MANDATORY_LEGACY_ATTRIBUTE_NAME, new Attribute("","MyOwnMandatoryPermission"));
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
-grantedPermissions = storage.readGrantedPermissions(appUID);
+permissionGranter.addSecurityData(session, appUID, null);
-assertTrue(checkGrantedPermissions(grantedPermissions, getPolicyPermissions("UnidentifiedThirdParty")));
+grantedPermissions = storage.readGrantedPermissions(appUID);
+assertWithTrace(checkGrantedPermissions(grantedPermissions, getPolicyPermissions("UnidentifiedThirdParty")));
 // 7. Legacy, unsigned : permissions NOT requested in JAD & permissions NOT requested in JAR -> grant all the permissions available in the policy for untrusted MIDlets
 storage.removeAuthenticationStorageData(appUID);
 permissionGranter.removeSecurityData(session, appUID);
 authData = new AuthenticationStorageData("UnidentifiedThirdParty", "UTDP", null, null, null, null);
 storage.writeAuthenticationStorageData(appUID, authData);
 authCredentials[0] = new AuthenticationCredentials("UnidentifiedThirdParty", "UIDP");
 permissionGranter.grantJadPermissions(appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP2));
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
-grantedPermissions = storage.readGrantedPermissions(appUID);
+permissionGranter.addSecurityData(session, appUID, null);
-assertTrue(checkGrantedPermissions(grantedPermissions, getPolicyPermissions("UnidentifiedThirdParty")));
+grantedPermissions = storage.readGrantedPermissions(appUID);
+assertWithTrace(checkGrantedPermissions(grantedPermissions, getPolicyPermissions("UnidentifiedThirdParty")));
 // 8. MIDP3 unsigned, unknown mandatory permission in JAD file -> failure
 permissionGranter.removeSecurityData(session, appUID);
 try
 {
 allAttributes.clear();
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
 authCredentials = new AuthenticationCredentials[1];
 authCredentials[0] = new AuthenticationCredentials("UnidentifiedThirdParty", "UIDP");
 permissionGranter.grantJadPermissions(appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
-assertTrue(UNKNOWN_PERMISSION_MSG, false);
+assertWithTrace(false);
 }
 catch (InvalidAttributeException e)
 {
-assertTrue(UNKNOWN_PERMISSION_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
+assertWithTrace(
 e.getOtaStatusCode() == OtaStatusCode.APPLICATION_AUTHORIZATION_FAILURE
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_UNSUPPORTED,
 new String[] {PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "1"})));
 }
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP3));
 allAttributes.put(PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "1",new Attribute("","MyMandatoryClass MyMandatoryTarget MyMandatoryAction1,MyMandatoryAction2,MyMandatoryAction3"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
-assertTrue(UNKNOWN_PERMISSION_MSG, false);
+permissionGranter.addSecurityData(session, appUID, null);
+assertWithTrace(false);
 }
 catch (InvalidAttributeException e)
 {
-assertTrue(UNKNOWN_PERMISSION_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
+assertWithTrace(
 e.getOtaStatusCode() == OtaStatusCode.APPLICATION_AUTHORIZATION_FAILURE
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_UNSUPPORTED,
 new String[] {PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "1"})));
 }
 authCredentials[0] = new AuthenticationCredentials("UnidentifiedThirdParty", "UIDP");
 permissionGranter.grantJadPermissions(appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP3));
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
-grantedPermissions = storage.readGrantedPermissions(appUID);
+permissionGranter.addSecurityData(session, appUID, null);
-assertTrue(grantedPermissions != null && checkGrantedPermissions(grantedPermissions, getAssignedPermissions("UnidentifiedThirdParty"), true));
+grantedPermissions = storage.readGrantedPermissions(appUID);
+assertWithTrace(grantedPermissions != null && checkGrantedPermissions(grantedPermissions, getAssignedPermissions("UnidentifiedThirdParty"), true));
 // 9.1. MIDP3 unsigned, P1, unknown optional P2 requested in JAD -> unknown permission is ignored, grant only P1 plus the assigned permissions
 storage.removeAuthenticationStorageData(appUID);
 permissionGranter.removeSecurityData(session, appUID);
 authData = new AuthenticationStorageData("UnidentifiedThirdParty", "UTDP", null, null, null, null);
 storage.writeAuthenticationStorageData(appUID, authData);
 authCredentials[0] = new AuthenticationCredentials("UnidentifiedThirdParty", "UIDP");
 permissionGranter.grantJadPermissions(appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP3));
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
-grantedPermissions = storage.readGrantedPermissions(appUID);
+permissionGranter.addSecurityData(session, appUID, null);
-assertTrue(grantedPermissions != null && checkGrantedPermissions(grantedPermissions,
+grantedPermissions = storage.readGrantedPermissions(appUID);
+assertWithTrace(grantedPermissions != null && checkGrantedPermissions(grantedPermissions,
 new MIDPPermission[] {new MIDPPermission(INTERNAL_SOCKET_PERMISSION,"socket://")},getAssignedPermissions("UnidentifiedThirdParty")));
 // 10. MIDP3 unsigned MIDlet, unknown mandatory permission in JAR file -> failure
 permissionGranter.removeSecurityData(session, appUID);
 try
 {
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP3));
 allAttributes.put(PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "1",new Attribute("","MyMandatoryClass MyMandatoryTarget MyMandatoryAction1,MyMandatoryAction2,MyMandatoryAction3"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
-assertTrue(UNKNOWN_PERMISSION_MSG, false);
+permissionGranter.addSecurityData(session, appUID, null);
+assertWithTrace(false);
 }
 catch (InvalidAttributeException e)
 {
-assertTrue(UNKNOWN_PERMISSION_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
+assertWithTrace(
 e.getOtaStatusCode() == OtaStatusCode.APPLICATION_AUTHORIZATION_FAILURE
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_UNSUPPORTED,
 new String[] {PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "1"})));
 }
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "1-1", new Attribute("","cert1"));
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "1-2", new Attribute("","cert2"));
 allAttributes.put(AuthenticationAttribute.SECOND_ATTRIBUTE_PREFIX + "1", new Attribute("","signature"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
-assertTrue(UNKNOWN_PERMISSION_MSG, false);
+permissionGranter.addSecurityData(session, appUID, null);
+assertWithTrace(false);
 }
 catch (InvalidAttributeException e)
 {
-assertTrue(UNKNOWN_PERMISSION_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
+assertWithTrace(
 e.getOtaStatusCode() == OtaStatusCode.APPLICATION_AUTHORIZATION_FAILURE
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_UNSUPPORTED,
 new String[] {PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "1"})));
 }
 allAttributes.put(AuthenticationAttribute.SECOND_ATTRIBUTE_PREFIX + "1", new Attribute("","signature"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
 allAttributes.put(PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "1",new Attribute("","MyMandatoryClass MyMandatoryTarget MyMandatoryAction1,MyMandatoryAction2,MyMandatoryAction3"));
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
-assertTrue(UNKNOWN_PERMISSION_MSG, false);
+permissionGranter.addSecurityData(session, appUID, null);
+assertWithTrace(false);
 }
 catch (InvalidAttributeException e)
 {
-assertTrue(UNKNOWN_PERMISSION_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
+assertWithTrace(
 e.getOtaStatusCode() == OtaStatusCode.APPLICATION_AUTHORIZATION_FAILURE
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_UNSUPPORTED,
 new String[] {PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "1"})));
 }
 allAttributes.put(AuthenticationAttribute.SECOND_ATTRIBUTE_PREFIX + "1", new Attribute("","signature"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
 allAttributes.put(PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "1",new Attribute("","MyMandatoryClass MyMandatoryTarget MyMandatoryAction1,MyMandatoryAction2,MyMandatoryAction3"));
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
-assertTrue(UNKNOWN_PERMISSION_MSG, false);
+permissionGranter.addSecurityData(session, appUID, null);
+assertWithTrace(false);
 }
 catch (InvalidAttributeException e)
 {
-assertTrue(UNKNOWN_PERMISSION_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
+assertWithTrace(
 e.getOtaStatusCode() == OtaStatusCode.APPLICATION_AUTHORIZATION_FAILURE
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_UNSUPPORTED,
 new String[] {PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "1"})));
 }
 authCredentials[0] = new AuthenticationCredentials("UnidentifiedThirdParty", "UIDP");
 permissionGranter.grantJadPermissions(appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP3));
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
-grantedPermissions = storage.readGrantedPermissions(appUID);
+permissionGranter.addSecurityData(session, appUID, null);
-assertTrue(grantedPermissions != null && checkGrantedPermissions(grantedPermissions,
+grantedPermissions = storage.readGrantedPermissions(appUID);
+assertWithTrace(grantedPermissions != null && checkGrantedPermissions(grantedPermissions,
 new MIDPPermission[]
 {
 new MIDPPermission(INTERNAL_SOCKET_PERMISSION,"socket://50"),
 new MIDPPermission(INTERNAL_HTTP_PERMISSION,"http://www.google.com"),
 new MIDPPermission(INTERNAL_HTTPS_PERMISSION,"https://www.myurl.com/mypage"),
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
 authCredentials = new AuthenticationCredentials[1];
 authCredentials[0] = new AuthenticationCredentials("UnidentifiedThirdParty", "UIDP");
 permissionGranter.grantJadPermissions(appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
-assertTrue(INVALID_PERMISSION_VALUE_MSG, false);
+assertWithTrace(false);
 }
 catch (InvalidAttributeException e)
 {
-assertTrue(INVALID_PERMISSION_VALUE_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
+assertWithTrace(
 e.getOtaStatusCode() == OtaStatusCode.APPLICATION_AUTHORIZATION_FAILURE
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_UNSUPPORTED,
 new String[] {PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "7"})));
 }
 allAttributes.put(PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "3",new Attribute("",MIDP3_HTTPS_PERMISSION + " https://www.myurl.com/mypage"));
 allAttributes.put(PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "4",new Attribute("",MIDP3_SSL_PERMISSION + " ssl://*.sun.com"));
 allAttributes.put(PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "5",new Attribute("",MIDP3_DATAGRAM_PERMISSION + " datagram://12345"));
 allAttributes.put(PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "6",new Attribute("",MIDP3_COMM_PERMISSION + " comm:123"));
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
-grantedPermissions = storage.readGrantedPermissions(appUID);
+permissionGranter.addSecurityData(session, appUID, null);
-assertTrue(grantedPermissions != null && checkGrantedPermissions(grantedPermissions,
+grantedPermissions = storage.readGrantedPermissions(appUID);
+assertWithTrace(grantedPermissions != null && checkGrantedPermissions(grantedPermissions,
 new MIDPPermission[]
 {
 new MIDPPermission(INTERNAL_SOCKET_PERMISSION,"socket://50"),
 new MIDPPermission(INTERNAL_HTTP_PERMISSION,"http://www.google.com"),
 new MIDPPermission(INTERNAL_HTTPS_PERMISSION,"https://www.myurl.com/mypage"),
 allAttributes.put(PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "3",new Attribute("",MIDP3_HTTPS_PERMISSION + " https://www.myurl.com/mypage"));
 allAttributes.put(PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "4",new Attribute("",MIDP3_SSL_PERMISSION + " ssl://*.sun.com"));
 allAttributes.put(PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "5",new Attribute("",MIDP3_DATAGRAM_PERMISSION + " datagram://12345"));
 allAttributes.put(PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "6",new Attribute("",MIDP3_COMM_PERMISSION + " comm:123"));
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
-grantedPermissions = storage.readGrantedPermissions(appUID);
+permissionGranter.addSecurityData(session, appUID, null);
-assertTrue(grantedPermissions != null && checkGrantedPermissions(grantedPermissions,
+grantedPermissions = storage.readGrantedPermissions(appUID);
+assertWithTrace(grantedPermissions != null && checkGrantedPermissions(grantedPermissions,
 new MIDPPermission[]
 {
 new MIDPPermission(INTERNAL_SOCKET_PERMISSION,"socket://50"),
 new MIDPPermission(INTERNAL_HTTP_PERMISSION,"http://www.google.com"),
 new MIDPPermission(INTERNAL_HTTPS_PERMISSION,"https://www.myurl.com/mypage"),
 getAssignedPermissions("IdentifiedThirdParty")));
 // 19. getBlanketPermissions - null appUID
 storage.removeAuthenticationStorageData(appUID);
 permissionGranter.removeSecurityData(session, appUID);
 blanketPermissions = permissionGranter.getBlanketPermissions(null);
-assertTrue(blanketPermissions == null);
+assertWithTrace(blanketPermissions == null);
 // 20. getBlanketPermissions - unknown appUID
 storage.removeAuthenticationStorageData(appUID);
 permissionGranter.removeSecurityData(session, appUID);
 blanketPermissions = permissionGranter.getBlanketPermissions(appUID);
-assertTrue(blanketPermissions == null);
+assertWithTrace(blanketPermissions == null);
 // 21. getBlanketPermissions - unsigned suite
 storage.removeAuthenticationStorageData(appUID);
 permissionGranter.removeSecurityData(session, appUID);
 authData = new AuthenticationStorageData("UnidentifiedThirdParty", "UTDP", null, null, null, null);
 storage.writeAuthenticationStorageData(appUID, authData);
 authCredentials[0] = new AuthenticationCredentials("UnidentifiedThirdParty", "UIDP");
 permissionGranter.grantJadPermissions(appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP2));
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
 blanketPermissions = permissionGranter.getBlanketPermissions(appUID);
-assertTrue(blanketPermissions == null);
+permissionGranter.addSecurityData(session, appUID, null);
+assertWithTrace(blanketPermissions == null);
 // 22. getBlanketPermissions - one of the requested permissions does not allow Blanket
 permissionGranter.removeSecurityData(session, appUID);
 storage.removeAuthenticationStorageData(appUID);
 permissionGranter.removeSecurityData(session, appUID);
 authData = new AuthenticationStorageData("IdentifiedThirdParty", "ITDP", null, null, null, null);
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP2));
 allAttributes.put(PermissionAttribute.OPTIONAL_LEGACY_ATTRIBUTE_NAME, new Attribute("",MIDP2_DATAGRAM_PERMISSION + COMMA + "                  " + MIDP2_SMS_SEND_PERMISSION));
 allAttributes.put(PermissionAttribute.MANDATORY_LEGACY_ATTRIBUTE_NAME, new Attribute("",MIDP2_SOCKET_PERMISSION + COMMA + MIDP2_HTTP_PERMISSION));
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
 blanketPermissions = permissionGranter.getBlanketPermissions(appUID);
-assertTrue(blanketPermissions == null);
+permissionGranter.addSecurityData(session, appUID, null);
+assertWithTrace(blanketPermissions == null);
 // 23. getBlanketPermissions - request one permissions which is already in Blanket
 permissionGranter.removeSecurityData(session, appUID);
 storage.removeAuthenticationStorageData(appUID);
 permissionGranter.removeSecurityData(session, appUID);
 authData = new AuthenticationStorageData("IdentifiedThirdParty", "ITDP", null, null, null, null);
 permissionGranter.grantJadPermissions(appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP2));
 allAttributes.put(PermissionAttribute.OPTIONAL_LEGACY_ATTRIBUTE_NAME, new Attribute("",MIDP2_HTTP_PERMISSION));
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
 blanketPermissions = permissionGranter.getBlanketPermissions(appUID);
-assertTrue(blanketPermissions == null);
+permissionGranter.addSecurityData(session, appUID, null);
+assertWithTrace(blanketPermissions == null);
 // 24. getBlanketPermissions - request Auto Invocation and Net Access -> mutually exclusive permissions
 permissionGranter.removeSecurityData(session, appUID);
 storage.removeAuthenticationStorageData(appUID);
 permissionGranter.removeSecurityData(session, appUID);
 authData = new AuthenticationStorageData("IdentifiedThirdParty", "ITDP", null, null, null, null);
 permissionGranter.grantJadPermissions(appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP2));
 allAttributes.put(PermissionAttribute.OPTIONAL_LEGACY_ATTRIBUTE_NAME, new Attribute("",MIDP2_PUSH_REGISTRY_PERMISSION + COMMA + MIDP2_HTTP_PERMISSION));
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
 blanketPermissions = permissionGranter.getBlanketPermissions(appUID);
-assertTrue(blanketPermissions == null);
+permissionGranter.addSecurityData(session, appUID, null);
+assertWithTrace(blanketPermissions == null);
 // 25. getBlanketPermissions - manufacturer signed MIDlet
 permissionGranter.removeSecurityData(session, appUID);
 storage.removeAuthenticationStorageData(appUID);
 permissionGranter.removeSecurityData(session, appUID);
 authData = new AuthenticationStorageData("Manufacturer", "MFD", null, null, null, null);
 permissionGranter.grantJadPermissions(appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP2));
 allAttributes.put(PermissionAttribute.MANDATORY_LEGACY_ATTRIBUTE_NAME, new Attribute("",MIDP2_HTTP_PERMISSION + COMMA + MIDP2_SMS_SEND_PERMISSION + COMMA + MIDP2_MMS_OPEN_PERMISSION + COMMA + MIDP2_COMM_PERMISSION));
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
 blanketPermissions = permissionGranter.getBlanketPermissions(appUID);
-assertTrue(blanketPermissions == null);
+permissionGranter.addSecurityData(session, appUID, null);
+assertWithTrace(blanketPermissions == null);
 // 26. getBlanketPermissions - request Messaging, Net Access and Local connectivity. Since Messaging and Net Access have the current interaction mode set to Blanket, only Local connectivity is returned
 permissionGranter.removeSecurityData(session, appUID);
 storage.removeAuthenticationStorageData(appUID);
 permissionGranter.removeSecurityData(session, appUID);
 authData = new AuthenticationStorageData("IdentifiedThirdParty", "ITDP", null, null, null, null);
 permissionGranter.grantJadPermissions(appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP2));
 allAttributes.put(PermissionAttribute.MANDATORY_LEGACY_ATTRIBUTE_NAME, new Attribute("",MIDP2_HTTP_PERMISSION + COMMA + MIDP2_SMS_SEND_PERMISSION + COMMA + MIDP2_MMS_OPEN_PERMISSION + COMMA + MIDP2_COMM_PERMISSION));
 securityAttributes.addManifestAttributes(allAttributes);
-permissionGranter.grantJarPermissions(session, appUID, null, securityAttributes.getPermissionAttributes());
+permissionGranter.grantJarPermissions( appUID, null, securityAttributes.getPermissionAttributes(), authCredentials);
 blanketPermissions = permissionGranter.getBlanketPermissions(appUID);
-assertTrue(blanketPermissions != null && blanketPermissions.length == 1 && blanketPermissions[0].equals(UserSecuritySettingsImpl.getLocalizedName(UserSecuritySettings.LOCAL_CONNECTIVITY_SETTINGS)));
+permissionGranter.addSecurityData(session, appUID, null);
+assertWithTrace(blanketPermissions != null && blanketPermissions.length == 1 && blanketPermissions[0].equals(UserSecuritySettingsImpl.getLocalizedName(UserSecuritySettings.LOCAL_CONNECTIVITY_SETTINGS)));
 permissionGranter.setPermissionsToBlanket(session, appUID);
 grantedPermissions = storage.readGrantedPermissions(appUID);
 for (int i=0; i<grantedPermissions.size(); i++)
 {
 PolicyBasedPermission permission =
 ((PolicyBasedPermission)grantedPermissions.elementAt(i));
 UserSecuritySettings settings =
 permission.getUserSecuritySettings();
 if (settings != null && settings.getName() == UserSecuritySettings.LOCAL_CONNECTIVITY_SETTINGS)
 {
-assertTrue(settings.getCurrentInteractionMode() == UserSecuritySettings.BLANKET_INTERACTION_MODE);
+assertWithTrace(settings.getCurrentInteractionMode() == UserSecuritySettings.BLANKET_INTERACTION_MODE);
 }
 }
 // grantAllPermissions - null values
 permissionGranter.removeSecurityData(session, appUID);
 storage.removeAuthenticationStorageData(appUID);
-permissionGranter.grantJarPermissions(session, null, null, (ProtectionDomain)null);
+permissionGranter.grantJarPermissions(null, null, (ProtectionDomain)null);
-permissionGranter.removeSecurityData(session, appUID);
+permissionGranter.addSecurityData(session, null, null);
-storage.removeAuthenticationStorageData(appUID);
+permissionGranter.removeSecurityData(session, appUID);
-permissionGranter.grantJarPermissions(session, appUID, null, (ProtectionDomain)null);
+storage.removeAuthenticationStorageData(appUID);
-grantedPermissions = storage.readGrantedPermissions(appUID);
+permissionGranter.grantJarPermissions(appUID, null, (ProtectionDomain)null);
-permissionGranter.removeSecurityData(session, appUID);
+permissionGranter.addSecurityData(session, appUID, null);
-storage.removeAuthenticationStorageData(appUID);
+grantedPermissions = storage.readGrantedPermissions(appUID);
-assertTrue(grantedPermissions == null);
+permissionGranter.removeSecurityData(session, appUID);
+storage.removeAuthenticationStorageData(appUID);
+assertWithTrace(grantedPermissions == null);
 // grantAllPermissions - operator domain
 grantAllPermissions(ProtectionDomain.getOperatorDomain());
 // grantAllPermissions - manufacturer domain
 grantAllPermissions(ProtectionDomain.getManufacturerDomain());
 // grantAllPermissions - identified third party domain
 private void grantAllPermissions(ProtectionDomain domain)
 {
 permissionGranter.removeSecurityData(session, appUID);
 storage.removeAuthenticationStorageData(appUID);
-permissionGranter.grantJarPermissions(session, appUID, null, domain);
+permissionGranter.grantJarPermissions(appUID, null, domain);
-grantedPermissions = storage.readGrantedPermissions(appUID);
+permissionGranter.addSecurityData(session, appUID, null);
-permissionGranter.removeSecurityData(session, appUID);
+grantedPermissions = storage.readGrantedPermissions(appUID);
-storage.removeAuthenticationStorageData(appUID);
+permissionGranter.removeSecurityData(session, appUID);
-assertTrue(checkGrantedPermissions(grantedPermissions, getPolicyPermissions(domain.getName())));
+storage.removeAuthenticationStorageData(appUID);
+assertWithTrace(checkGrantedPermissions(grantedPermissions, getPolicyPermissions(domain.getName())));
 }
 private static MIDPPermission[] getPolicyPermissions(String policyName, String[] permissionNameFilter, String permissionTypeFilter)
 {
 Vector vPermissions = new Vector();
 {
 if (((permissionNameFilter != null
 && findString(policyPerms[i].getName(), permissionNameFilter) != -1)
 || permissionNameFilter == null) && (permissionTypeFilter == null
 || (permissionTypeFilter.equals("assigned")
 && (policyPerms[i].getType() == PolicyBasedPermission.ASSIGNED_TYPE
 || policyPerms[i].getType() == PolicyBasedPermission.USER_ASSIGNED_TYPE))))
 {
 vPermissions.addElement(new MIDPPermission(policyPerms[i].getName(), policyPerms[i].getTarget(), policyPerms[i].getActionList()));
 }
 }

branch	RCL_3
changeset 27	d5e927d5853b
parent 26	2455ef1f5bbc