FCL/sf/app/jrt: comparison javacommons/security/tsrc/javasrc/com/nokia/mj/impl/security/midp/common/SecurityDescriptorAttributesTests.java

equal deleted inserted replaced

-:7cee158cb8cd
+:26b2b12093af
 /**
 * SecurityDescriptorAttributes unit tests.
 */
 public class SecurityDescriptorAttributesTests extends TestCase implements InstallerMain
 {
-int assertTrace = 0;
 /**
 * Hashtable holding all the attributes. Tests populate this hashtable
 * prior to being executed
 */
 midp2PermissionTargets.put(INTERNAL_SOCKET_PERMISSION, "socket://*");
 midp2PermissionTargets.put(INTERNAL_HTTP_PERMISSION, "http://*");
 midp2PermissionTargets.put(INTERNAL_HTTPS_PERMISSION, "https://*");
 midp2PermissionTargets.put(INTERNAL_SSL_PERMISSION, "ssl://*");
 midp2PermissionTargets.put(INTERNAL_DATAGRAM_PERMISSION,"datagram://*");
-midp2PermissionTargets.put(INTERNAL_COMM_PERMISSION, "comm:*");
+midp2PermissionTargets.put(INTERNAL_COMM_PERMISSION, "comm://*");
 midp2PermissionTargets.put(INTERNAL_PUSH_REGISTRY_PERMISSION, "*");
 }
 // data being tested
 protected SecurityAttributes securityAttributes;
 protected void testAuthenticationAttributes()
 {
 // no attributes
 allAttributes.clear();
 authAttributes = securityAttributes.getAuthenticationAttributes();
-assertWithTrace((authAttributes == null) || (authAttributes.length == 0));
+assertTrue((authAttributes == null) || (authAttributes.length == 0));
 // empty certificate attribute
 try
 {
 allAttributes.clear();
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "1-1", new Attribute("", ""));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
-assertWithTrace(false);
+assertTrue(EMPTY_CERTIFICATE_MSG, false);
 }
 catch (InvalidAttributeException e)
 {
-assertWithTrace(
+assertTrue(EMPTY_CERTIFICATE_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
 e.getOtaStatusCode() == OtaStatusCode.APPLICATION_AUTHENTICATION_FAILURE
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_HANDLING_FAILED,
 new String[] {AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "1-1"})));
 }
 {
 allAttributes.clear();
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "1-1", new Attribute("","?%cert"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
-assertWithTrace(false);
+assertTrue(INVALID_CERTIFICATE_MSG, false);
 }
 catch (InvalidAttributeException e)
 {
-assertWithTrace(
+assertTrue(INVALID_CERTIFICATE_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
 e.getOtaStatusCode() == OtaStatusCode.APPLICATION_AUTHENTICATION_FAILURE
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_HANDLING_FAILED,
 new String[] {AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "1-1"})));
 }
 // missing signature attribute
 allAttributes.clear();
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "1-1", new Attribute("","cert"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
-assertWithTrace(securityAttributes.getAuthenticationAttributes() == null);
+assertTrue(securityAttributes.getAuthenticationAttributes() == null);
 // missing certificate attribute
 try
 {
 allAttributes.clear();
 allAttributes.put(AuthenticationAttribute.SECOND_LEGACY_ATTRIBUTE_NAME, new Attribute("","signature"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
-assertWithTrace(false);
+assertTrue(MISSING_CERTIFICATE_ATTRIBUTE_MSG, false);
 }
 catch (InvalidAttributeException e)
 {
-assertWithTrace(
+assertTrue(MISSING_CERTIFICATE_ATTRIBUTE_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
 e.getOtaStatusCode() == OtaStatusCode.APPLICATION_AUTHENTICATION_FAILURE
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_MISSING,
 new String[] {AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "1-1"})));
 }
 allAttributes.clear();
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "1-1", new Attribute("","cert"));
 allAttributes.put(AuthenticationAttribute.SECOND_LEGACY_ATTRIBUTE_NAME, new Attribute("","?signature"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
-assertWithTrace(false);
+assertTrue(INVALID_CERTIFICATE_SIGNATURE_MSG, false);
 }
 catch (InvalidAttributeException e)
 {
-assertWithTrace(
+assertTrue(INVALID_CERTIFICATE_SIGNATURE_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
 e.getOtaStatusCode() == OtaStatusCode.APPLICATION_AUTHENTICATION_FAILURE
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_HANDLING_FAILED,
 new String[] {AuthenticationAttribute.SECOND_LEGACY_ATTRIBUTE_NAME})));
 }
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP3));
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "1-1", new Attribute("","cert"));
 allAttributes.put(AuthenticationAttribute.SECOND_ATTRIBUTE_PREFIX + "1", new Attribute("","?signature"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
-assertWithTrace(false);
+assertTrue(INVALID_CERTIFICATE_SIGNATURE_MSG, false);
 }
 catch (InvalidAttributeException e)
 {
-assertWithTrace(
+assertTrue(INVALID_CERTIFICATE_SIGNATURE_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
 e.getOtaStatusCode() == OtaStatusCode.APPLICATION_AUTHENTICATION_FAILURE
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_HANDLING_FAILED,
 new String[] {AuthenticationAttribute.SECOND_ATTRIBUTE_PREFIX + "1"})));
 }
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP3));
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "1-1", new Attribute("","cert"));
 allAttributes.put(AuthenticationAttribute.SECOND_ATTRIBUTE_PREFIX + "2", new Attribute("","signature"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
-assertWithTrace(false);
+assertTrue(MISSING_CERTIFICATE_ATTRIBUTE_MSG, false);
 }
 catch (InvalidAttributeException e)
 {
-assertWithTrace(
+assertTrue(MISSING_CERTIFICATE_ATTRIBUTE_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
 e.getOtaStatusCode() == OtaStatusCode.APPLICATION_AUTHENTICATION_FAILURE
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_MISSING,
 new String[] {AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "2-1"})));
 }
 allAttributes.clear();
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "1-1", new Attribute("","cert"));
 allAttributes.put(AuthenticationAttribute.SECOND_ATTRIBUTE_PREFIX + "1", new Attribute("","signature"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
-assertWithTrace(false);
+assertTrue(MIDP3_ATTRIBUTE_NOT_ALLOWED_MSG, false);
 }
 catch (InvalidAttributeException e)
 {
-assertWithTrace(
+assertTrue(MIDP3_ATTRIBUTE_NOT_ALLOWED_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
 e.getOtaStatusCode() == OtaStatusCode.INVALID_DESCRIPTOR
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_HANDLING_FAILED,
 new String[] {AuthenticationAttribute.SECOND_ATTRIBUTE_PREFIX + "1"})));
 }
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP3));
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "1-1", new Attribute("","cert"));
 allAttributes.put(AuthenticationAttribute.SECOND_LEGACY_ATTRIBUTE_NAME, new Attribute("","signature"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
-assertWithTrace(false);
+assertTrue(MIDP2_SIGNATURE_NOT_ALLOWED_MSG, false);
 }
 catch (InvalidAttributeException e)
 {
-assertWithTrace(
+assertTrue(MIDP2_SIGNATURE_NOT_ALLOWED_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
 e.getOtaStatusCode() == OtaStatusCode.INVALID_DESCRIPTOR
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_HANDLING_FAILED,
 new String[] {AuthenticationAttribute.SECOND_LEGACY_ATTRIBUTE_NAME})));
 }
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "1-1", new Attribute("","cert"));
 allAttributes.put(AuthenticationAttribute.SECOND_ATTRIBUTE_PREFIX + "1", new Attribute("","signature"));
 allAttributes.put(AuthenticationAttribute.SECOND_LEGACY_ATTRIBUTE_NAME, new Attribute("","signature"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
-assertWithTrace(false);
+assertTrue(MIDP2_SIGNATURE_NOT_ALLOWED_MSG, false);
 }
 catch (InvalidAttributeException e)
 {
-assertWithTrace(
+assertTrue(MIDP2_SIGNATURE_NOT_ALLOWED_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
 e.getOtaStatusCode() == OtaStatusCode.INVALID_DESCRIPTOR
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_HANDLING_FAILED,
 new String[] {AuthenticationAttribute.SECOND_LEGACY_ATTRIBUTE_NAME})));
 }
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "1-2", new Attribute("","cert2"));
 allAttributes.put(AuthenticationAttribute.SECOND_LEGACY_ATTRIBUTE_NAME, new Attribute("","signature"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
 authAttributes = securityAttributes.getAuthenticationAttributes();
-assertWithTrace(authAttributes != null
+assertTrue(authAttributes != null
 && authAttributes.length == 1
 && checkChainsAndSignatures(authAttributes,
 new String[] {"cert1", "cert2"},
 new String[] {"signature"}));
 // 2 identical certificate chains and 1 signature -> only one chain and signature returned (duplicates ignored)
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "2-2", new Attribute("","cert2"));
 allAttributes.put(AuthenticationAttribute.SECOND_LEGACY_ATTRIBUTE_NAME, new Attribute("","signature"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
 authAttributes = securityAttributes.getAuthenticationAttributes();
-assertWithTrace(authAttributes != null
+assertTrue(authAttributes != null
 && authAttributes.length == 1
 && checkChainsAndSignatures(authAttributes,
 new String[] {"cert1", "cert2"},
 new String[] {"signature"}));
 // 2 identical certificate chains and 2 signatures -> only one chain and signature returned (duplicates ignored)
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "2-2", new Attribute("","cert2"));
 allAttributes.put(AuthenticationAttribute.SECOND_ATTRIBUTE_PREFIX + "2", new Attribute("","signature"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
 authAttributes = securityAttributes.getAuthenticationAttributes();
-assertWithTrace(authAttributes != null
+assertTrue(authAttributes != null
 && authAttributes.length == 1
 && checkChainsAndSignatures(authAttributes,
 new String[] {"cert1", "cert2"},
 new String[] {"signature"}));
 // one certificate chain with 2 certificates and signature
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "1-4", new Attribute("","cert4"));
 allAttributes.put(AuthenticationAttribute.SECOND_LEGACY_ATTRIBUTE_NAME, new Attribute("","signature"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
 authAttributes = securityAttributes.getAuthenticationAttributes();
-assertWithTrace(authAttributes != null
+assertTrue(authAttributes != null
 && authAttributes.length == 1
 && checkChainsAndSignatures(authAttributes,
 new String[] {"cert1", "cert2"},
 new String[] {"signature"}));
 // two certificate chains with missing one signature -> pick up the valid certificate and ignore the invalid one
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "4-2", new Attribute("","cert42"));
 allAttributes.put(AuthenticationAttribute.SECOND_ATTRIBUTE_PREFIX + "1" , new Attribute("","signature1"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
 authAttributes = securityAttributes.getAuthenticationAttributes();
-assertWithTrace(authAttributes != null
+assertTrue(authAttributes != null
 && authAttributes.length == 1
 && checkChainsAndSignatures(authAttributes,
 new String[] {"cert11", "cert12"},
 new String[] {"signature1"}));
 // two invalid certificate chains: first one with missing signature, the second one invalid certificate -> signal the invalid certificate
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "4-1", new Attribute("","cert41"));
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "4-2", new Attribute("","cert42"));
 allAttributes.put(AuthenticationAttribute.SECOND_ATTRIBUTE_PREFIX + "2" , new Attribute("","signature2"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
-assertWithTrace(false);
+assertTrue(CERTIFICATE_WITHOUT_SIGNATURE_MSG, false);
 }
 catch (InvalidAttributeException e)
 {
-assertWithTrace(
+assertTrue(INVALID_CERTIFICATE_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
 e.getOtaStatusCode() == OtaStatusCode.APPLICATION_AUTHENTICATION_FAILURE
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_HANDLING_FAILED,
 new String[] {AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "2-2"})));
 }
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "1-1", new Attribute("","cert11"));
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "1-2", new Attribute("","*cert12"));
 allAttributes.put(AuthenticationAttribute.SECOND_ATTRIBUTE_PREFIX + "1" , new Attribute("","signature1"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
-assertWithTrace(false);
+assertTrue(INVALID_CERTIFICATE_MSG, false);
 }
 catch (InvalidAttributeException e)
 {
-assertWithTrace(
+assertTrue(INVALID_CERTIFICATE_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
 e.getOtaStatusCode() == OtaStatusCode.APPLICATION_AUTHENTICATION_FAILURE
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_HANDLING_FAILED,
 new String[] {AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "1-2"})));
 }
 allAttributes.put(AuthenticationAttribute.SECOND_ATTRIBUTE_PREFIX + "2" , new Attribute("","signature2"));
 allAttributes.put(AuthenticationAttribute.SECOND_ATTRIBUTE_PREFIX + "5" , new Attribute("","signature5"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
 authAttributes = securityAttributes.getAuthenticationAttributes();
-assertWithTrace(authAttributes != null
+assertTrue(authAttributes != null
 && authAttributes.length == 2
 && checkChainsAndSignatures(authAttributes,
 new String[] {"cert11", "cert12", "cert21", "cert22", "cert23"},
 new String[] {"signature1", "signature2"}));
 // 100 certificate chains (10 certificates each) with 100 signatures
 allAttributes.put(AuthenticationAttribute.SECOND_ATTRIBUTE_PREFIX + i , new Attribute("","signature" + i));
 }
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
 authAttributes = securityAttributes.getAuthenticationAttributes();
-assertWithTrace(authAttributes != null && authAttributes.length == 100);
+assertTrue(authAttributes != null && authAttributes.length == 100);
 for (int i=0; i<100; i++)
 {
 // make sure we have 10 certs in each chain and a corresponding signature
-assertWithTrace(authAttributes[i].getCertChain() != null
+assertTrue(authAttributes[i].getCertChain() != null
 && authAttributes[i].getSignature() != null
 && authAttributes[i].getCertChain().length == 10
 && authAttributes[i].getSignature().equals("signature" + (i+1)));
 // check each chain
 for (int j=0; j<10; j++)
 {
-assertWithTrace((authAttributes[i].getCertChain())[j]
+assertTrue((authAttributes[i].getCertChain())[j]
 .equals("cert" + (i+1) + "" + (j+1)));
 }
 }
 }
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP3));
 allAttributes.put(PermissionAttribute.MANDATORY_LEGACY_ATTRIBUTE_NAME, new Attribute("","Perm1, Perm2"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
-assertWithTrace(false);
+assertTrue(LEGACY_NOT_ALLOWED_MSG, false);
 }
 catch (InvalidAttributeException e)
 {
-assertWithTrace(
+assertTrue(LEGACY_NOT_ALLOWED_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
 e.getOtaStatusCode() == OtaStatusCode.INVALID_DESCRIPTOR
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_HANDLING_FAILED,
 new String[] {PermissionAttribute.MANDATORY_LEGACY_ATTRIBUTE_NAME})));
 }
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP3));
 allAttributes.put(PermissionAttribute.OPTIONAL_LEGACY_ATTRIBUTE_NAME, new Attribute("","Perm1, Perm2"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
-assertWithTrace(false);
+assertTrue(LEGACY_NOT_ALLOWED_MSG, false);
 }
 catch (InvalidAttributeException e)
 {
-assertWithTrace(
+assertTrue(LEGACY_NOT_ALLOWED_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
 e.getOtaStatusCode() == OtaStatusCode.INVALID_DESCRIPTOR
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_HANDLING_FAILED,
 new String[] {PermissionAttribute.OPTIONAL_LEGACY_ATTRIBUTE_NAME})));
 }
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP2));
 allAttributes.put(PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "1",
 new Attribute("","PermissionClassName TargetName ActionList"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
-assertWithTrace(false);
+assertTrue(MIDP3_ATTRIBUTE_NOT_ALLOWED_MSG, false);
 }
 catch (InvalidAttributeException e)
 {
-assertWithTrace(
+assertTrue(MIDP3_ATTRIBUTE_NOT_ALLOWED_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
 e.getOtaStatusCode() == OtaStatusCode.INVALID_DESCRIPTOR
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_HANDLING_FAILED,
 new String[] {PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "1"})));
 }
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP2));
 allAttributes.put(PermissionAttribute.OPTIONAL_ATTRIBUTE_PREFIX + "1",
 new Attribute("","PermissionClassName TargetName ActionList"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
-assertWithTrace(false);
+assertTrue(MIDP3_ATTRIBUTE_NOT_ALLOWED_MSG, false);
 }
 catch (InvalidAttributeException e)
 {
-assertWithTrace(
+assertTrue(MIDP3_ATTRIBUTE_NOT_ALLOWED_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
 e.getOtaStatusCode() == OtaStatusCode.INVALID_DESCRIPTOR
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_HANDLING_FAILED,
 new String[] {PermissionAttribute.OPTIONAL_ATTRIBUTE_PREFIX + "1"})));
 }
 allAttributes.put(PermissionAttribute.MANDATORY_LEGACY_ATTRIBUTE_NAME,
 new Attribute("","PermissionClassName TargetName ActionList"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
 permissionAttributes = securityAttributes.getPermissionAttributes();
-assertWithTrace(permissionAttributes != null
+assertTrue(permissionAttributes != null
 && permissionAttributes.length == 1
 && permissionAttributes[0].isLegacyAttribute());
 // MIDP2 mandatory permissions handling - invalid permission value
 try
 {
 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_LEGACY_ATTRIBUTE_NAME, new Attribute("","signature"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
-assertWithTrace(false);
+assertTrue(UNKNOWN_PERMISSION_MSG, false);
 }
 catch (InvalidAttributeException e)
 {
-assertWithTrace(
+assertTrue(UNKNOWN_PERMISSION_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
 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_LEGACY_ATTRIBUTE_NAME})));
 }
 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_LEGACY_ATTRIBUTE_NAME, new Attribute("","signature"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
-assertWithTrace(false);
+assertTrue(UNKNOWN_PERMISSION_MSG, false);
 }
 catch (InvalidAttributeException e)
 {
-assertWithTrace(
+assertTrue(UNKNOWN_PERMISSION_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
 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_LEGACY_ATTRIBUTE_NAME})));
 }
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "1-2", new Attribute("","cert2"));
 allAttributes.put(AuthenticationAttribute.SECOND_LEGACY_ATTRIBUTE_NAME, new Attribute("","signature"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
 permissionAttributes = securityAttributes.getPermissionAttributes();
-assertWithTrace(permissionAttributes != null
+assertTrue(permissionAttributes != null
 && permissionAttributes.length == 2
 && checkImportance(permissionAttributes, 0, 2)
 && checkNamesAndTargets(permissionAttributes,
 new String[] {INTERNAL_SOCKET_PERMISSION, INTERNAL_HTTP_PERMISSION})
 && checkActionLists(permissionAttributes));
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "1-2", new Attribute("","cert2"));
 allAttributes.put(AuthenticationAttribute.SECOND_LEGACY_ATTRIBUTE_NAME, new Attribute("","signature"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
 permissionAttributes = securityAttributes.getPermissionAttributes();
-assertWithTrace(permissionAttributes != null
+assertTrue(permissionAttributes != null
 && permissionAttributes.length == 1
 && checkImportance(permissionAttributes, 0, 1)
 && checkNamesAndTargets(permissionAttributes,
 new String[] {INTERNAL_SSL_PERMISSION})
 && checkActionLists(permissionAttributes));
 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_LEGACY_ATTRIBUTE_NAME, new Attribute("","signature"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
-assertWithTrace(true);
+assertTrue(UNKNOWN_PERMISSION_MSG, true);
 }
 catch (InvalidAttributeException e)
 {
-assertWithTrace(false);
+assertTrue(UNKNOWN_PERMISSION_MSG, false);
 }
 // MIDP2 optional permissions handling - unknown permission value
 try
 {
 allAttributes.clear();
 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_LEGACY_ATTRIBUTE_NAME, new Attribute("","signature"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
-assertWithTrace(true);
+assertTrue(UNKNOWN_PERMISSION_MSG, true);
 }
 catch (InvalidAttributeException e)
 {
-assertWithTrace(false);
+assertTrue(UNKNOWN_PERMISSION_MSG, false);
 }
 // MIDP2 optional permissions handling - known permission value
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP2));
 allAttributes.put(PermissionAttribute.OPTIONAL_LEGACY_ATTRIBUTE_NAME,
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "1-2", new Attribute("","cert2"));
 allAttributes.put(AuthenticationAttribute.SECOND_LEGACY_ATTRIBUTE_NAME, new Attribute("","signature"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
 permissionAttributes = securityAttributes.getPermissionAttributes();
-assertWithTrace(permissionAttributes != null
+assertTrue(permissionAttributes != null
 && permissionAttributes.length == 2
 && checkImportance(permissionAttributes, 2, 0)
 && checkNamesAndTargets(permissionAttributes,
 new String[]
 {
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "1-2", new Attribute("","cert2"));
 allAttributes.put(AuthenticationAttribute.SECOND_LEGACY_ATTRIBUTE_NAME, new Attribute("","signature"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
 permissionAttributes = securityAttributes.getPermissionAttributes();
-assertWithTrace(permissionAttributes != null
+assertTrue(permissionAttributes != null
 && permissionAttributes.length == 1
 && checkImportance(permissionAttributes, 1, 0)
 && checkNamesAndTargets(permissionAttributes,
 new String[] {INTERNAL_PUSH_REGISTRY_PERMISSION})
 && checkActionLists(permissionAttributes));
 allAttributes.put(AuthenticationAttribute.MAIN_ATTRIBUTE_PREFIX + "1-2", new Attribute("","cert2"));
 allAttributes.put(AuthenticationAttribute.SECOND_LEGACY_ATTRIBUTE_NAME, new Attribute("","signature"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
 permissionAttributes = securityAttributes.getPermissionAttributes();
-assertWithTrace(permissionAttributes != null
+assertTrue(permissionAttributes != null
 && permissionAttributes.length == 4
 && checkImportance(permissionAttributes, 2, 2)
 && checkNamesAndTargets(permissionAttributes,
 new String[]
 {
 allAttributes.put(PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "1",new Attribute("","MyMandatoryClass"));
 allAttributes.put(PermissionAttribute.OPTIONAL_ATTRIBUTE_PREFIX + "1",new Attribute("","MyOptionalClass"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
 permissionAttributes = securityAttributes.getPermissionAttributes();
-assertWithTrace(permissionAttributes != null
+assertTrue(permissionAttributes != null
 && permissionAttributes.length == 2
 && checkImportance(permissionAttributes, 1, 1)
 && checkNamesAndTargets(permissionAttributes,
 new String[] {"MyMandatoryClass", "MyOptionalClass"}, new String[] {null, null})
 && checkActionLists(permissionAttributes));
 allAttributes.put(PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "1",new Attribute("","MyMandatoryClass MyMandatoryTarget"));
 allAttributes.put(PermissionAttribute.OPTIONAL_ATTRIBUTE_PREFIX + "1",new Attribute("","MyOptionalClass MyOptionalTarget"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
 permissionAttributes = securityAttributes.getPermissionAttributes();
-assertWithTrace(permissionAttributes != null
+assertTrue(permissionAttributes != null
 && permissionAttributes.length == 2
 && checkImportance(permissionAttributes, 1, 1)
 && checkNamesAndTargets(permissionAttributes,
 new String[] {"MyMandatoryClass", "MyOptionalClass"}, new String[] {"MyMandatoryTarget","MyOptionalTarget"})
 && checkActionLists(permissionAttributes));
 allAttributes.put(PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "1",new Attribute("","MyMandatoryClass MyMandatoryTarget MyMandatoryAction1,MyMandatoryAction2,MyMandatoryAction3"));
 allAttributes.put(PermissionAttribute.OPTIONAL_ATTRIBUTE_PREFIX + "1",new Attribute("","MyOptionalClass MyOptionalTarget MyOptionalAction"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
 permissionAttributes = securityAttributes.getPermissionAttributes();
-assertWithTrace(permissionAttributes != null
+assertTrue(permissionAttributes != null
 && permissionAttributes.length == 2
 && checkImportance(permissionAttributes, 1, 1)
 && checkNamesAndTargets(permissionAttributes,
 new String[] {"MyMandatoryClass", "MyOptionalClass"}, new String[] {"MyMandatoryTarget","MyOptionalTarget"})
 && checkActionLists(permissionAttributes, new String[] {"MyMandatoryAction1,MyMandatoryAction2,MyMandatoryAction3", "MyOptionalAction"}));
 allAttributes.put(PermissionAttribute.OPTIONAL_ATTRIBUTE_PREFIX + "1",new Attribute("","MyOptionalClass MyOptionalTarget MyOptionalAction"));
 allAttributes.put(PermissionAttribute.OPTIONAL_ATTRIBUTE_PREFIX + "2",new Attribute("","MyOptionalClass MyOptionalTarget MyOptionalAction"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
 permissionAttributes = securityAttributes.getPermissionAttributes();
-assertWithTrace(permissionAttributes != null
+assertTrue(permissionAttributes != null
 && permissionAttributes.length == 2
 && checkImportance(permissionAttributes, 1, 1)
 && checkNamesAndTargets(permissionAttributes,
 new String[] {"MyMandatoryClass", "MyOptionalClass"}, new String[] {"MyMandatoryTarget","MyOptionalTarget"})
 && checkActionLists(permissionAttributes, new String[] {"MyMandatoryAction1,MyMandatoryAction2,MyMandatoryAction3", "MyOptionalAction"}));
 allAttributes.clear();
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP3));
 allAttributes.put(PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "1",new Attribute("","MyMandatoryClass MyMandatoryTarget MyMandatoryAction1 MyMandatoryAction2"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
-assertWithTrace(false);
+assertTrue(INVALID_PERMISSION_VALUE_MSG, false);
 }
 catch (InvalidAttributeException e)
 {
-assertWithTrace(
+assertTrue(INVALID_PERMISSION_VALUE_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
 e.getOtaStatusCode() == OtaStatusCode.APPLICATION_AUTHENTICATION_FAILURE
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_HANDLING_FAILED,
 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"));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
-assertWithTrace(false);
+assertTrue(INVALID_PERMISSION_VALUE_MSG, false);
 }
 catch (InvalidAttributeException e)
 {
-assertWithTrace(
+assertTrue(INVALID_PERMISSION_VALUE_MSG + e.getOtaStatusCode() + " " + e.getShortMessage() + "," + e.getDetailedMessage(),
 e.getOtaStatusCode() == OtaStatusCode.APPLICATION_AUTHENTICATION_FAILURE
 && e.getShortMessage().equals(errorMessage.get(InstallerErrorMessage.INST_CORRUPT_PKG, null))
 && e.getDetailedMessage().equals(detailedErrorMessage.get(InstallerDetailedErrorMessage.ATTR_HANDLING_FAILED,
 new String[] {PermissionAttribute.MANDATORY_ATTRIBUTE_PREFIX + "1"})));
 }
 allAttributes.put(MIDP_PROFILE_ATTRIBUTE_NAME,new Attribute("",MIDP3));
 allAttributes.put(PermissionAttribute.OPTIONAL_ATTRIBUTE_PREFIX + "1",new Attribute("","    MyMandatoryClass            MyMandatoryTarget  MyMandatoryAction      "));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
 permissionAttributes = securityAttributes.getPermissionAttributes();
-assertWithTrace(permissionAttributes != null
+assertTrue(permissionAttributes != null
 && permissionAttributes.length == 1
 && checkImportance(permissionAttributes, 1, 0)
 && checkNamesAndTargets(permissionAttributes,
 new String[] {"MyMandatoryClass"}, new String[] {"MyMandatoryTarget"})
 && checkActionLists(permissionAttributes, new String[] {"MyMandatoryAction"}));
 try
 {
 allAttributes.put(PermissionAttribute.OPTIONAL_ATTRIBUTE_PREFIX + "1",new Attribute("",className + "            MyMandatoryTarget  MyMandatoryAction      "));
 securityAttributes = new SecurityAttributes();
 securityAttributes.addDescriptorAttributes(allAttributes);
-assertWithTrace(false);
+assertTrue(INVALID_PERMISSION_VALUE_MSG, false);
 }
 catch (InvalidAttributeException e)
 {
 }
 }
 }
 }
 return (checkBoolArray(certsChecked) && checkBoolArray(signaturesChecked));
 }
-private void assertWithTrace(boolean aCondition)
-{
-assertTrue("" + assertTrace, aCondition);
-assertTrace++;
-}
 private int findString(String str, String[] strings)
 {
 for (int i=0; i<strings.length; i++)
 {
 if (str.equals(strings[i]))

branch	RCL_3
changeset 83	26b2b12093af
parent 71	d5e927d5853b