diff -r 7cee158cb8cd -r 26b2b12093af javacommons/security/tsrc/javasrc/com/nokia/mj/impl/security/midp/common/SecurityDescriptorAttributesTests.java --- a/javacommons/security/tsrc/javasrc/com/nokia/mj/impl/security/midp/common/SecurityDescriptorAttributesTests.java Wed Sep 15 12:05:25 2010 +0300 +++ b/javacommons/security/tsrc/javasrc/com/nokia/mj/impl/security/midp/common/SecurityDescriptorAttributesTests.java Wed Oct 13 14:23:59 2010 +0300 @@ -39,7 +39,6 @@ */ public class SecurityDescriptorAttributesTests extends TestCase implements InstallerMain { - int assertTrace = 0; /** * Hashtable holding all the attributes. Tests populate this hashtable @@ -79,7 +78,7 @@ 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, "*"); } @@ -165,7 +164,7 @@ // no attributes allAttributes.clear(); authAttributes = securityAttributes.getAuthenticationAttributes(); - assertWithTrace((authAttributes == null) || (authAttributes.length == 0)); + assertTrue((authAttributes == null) || (authAttributes.length == 0)); // empty certificate attribute try { @@ -173,11 +172,11 @@ 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, @@ -190,11 +189,11 @@ 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, @@ -205,7 +204,7 @@ 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 { @@ -213,11 +212,11 @@ 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, @@ -231,11 +230,11 @@ 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, @@ -250,11 +249,11 @@ 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, @@ -269,11 +268,11 @@ 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, @@ -287,11 +286,11 @@ 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, @@ -306,11 +305,11 @@ 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, @@ -327,11 +326,11 @@ 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, @@ -345,7 +344,7 @@ securityAttributes = new SecurityAttributes(); securityAttributes.addDescriptorAttributes(allAttributes); authAttributes = securityAttributes.getAuthenticationAttributes(); - assertWithTrace(authAttributes != null + assertTrue(authAttributes != null && authAttributes.length == 1 && checkChainsAndSignatures(authAttributes, new String[] {"cert1", "cert2"}, @@ -361,7 +360,7 @@ securityAttributes = new SecurityAttributes(); securityAttributes.addDescriptorAttributes(allAttributes); authAttributes = securityAttributes.getAuthenticationAttributes(); - assertWithTrace(authAttributes != null + assertTrue(authAttributes != null && authAttributes.length == 1 && checkChainsAndSignatures(authAttributes, new String[] {"cert1", "cert2"}, @@ -378,7 +377,7 @@ securityAttributes = new SecurityAttributes(); securityAttributes.addDescriptorAttributes(allAttributes); authAttributes = securityAttributes.getAuthenticationAttributes(); - assertWithTrace(authAttributes != null + assertTrue(authAttributes != null && authAttributes.length == 1 && checkChainsAndSignatures(authAttributes, new String[] {"cert1", "cert2"}, @@ -392,7 +391,7 @@ securityAttributes = new SecurityAttributes(); securityAttributes.addDescriptorAttributes(allAttributes); authAttributes = securityAttributes.getAuthenticationAttributes(); - assertWithTrace(authAttributes != null + assertTrue(authAttributes != null && authAttributes.length == 1 && checkChainsAndSignatures(authAttributes, new String[] {"cert1", "cert2"}, @@ -411,7 +410,7 @@ securityAttributes = new SecurityAttributes(); securityAttributes.addDescriptorAttributes(allAttributes); authAttributes = securityAttributes.getAuthenticationAttributes(); - assertWithTrace(authAttributes != null + assertTrue(authAttributes != null && authAttributes.length == 1 && checkChainsAndSignatures(authAttributes, new String[] {"cert11", "cert12"}, @@ -431,11 +430,11 @@ 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, @@ -453,11 +452,11 @@ 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, @@ -480,7 +479,7 @@ 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"}, @@ -499,18 +498,18 @@ 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))); } } @@ -527,11 +526,11 @@ 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, @@ -545,11 +544,11 @@ 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, @@ -564,11 +563,11 @@ 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, @@ -583,11 +582,11 @@ 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, @@ -602,7 +601,7 @@ 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 @@ -617,11 +616,11 @@ 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, @@ -641,11 +640,11 @@ 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, @@ -664,7 +663,7 @@ securityAttributes = new SecurityAttributes(); securityAttributes.addDescriptorAttributes(allAttributes); permissionAttributes = securityAttributes.getPermissionAttributes(); - assertWithTrace(permissionAttributes != null + assertTrue(permissionAttributes != null && permissionAttributes.length == 2 && checkImportance(permissionAttributes, 0, 2) && checkNamesAndTargets(permissionAttributes, @@ -682,7 +681,7 @@ securityAttributes = new SecurityAttributes(); securityAttributes.addDescriptorAttributes(allAttributes); permissionAttributes = securityAttributes.getPermissionAttributes(); - assertWithTrace(permissionAttributes != null + assertTrue(permissionAttributes != null && permissionAttributes.length == 1 && checkImportance(permissionAttributes, 0, 1) && checkNamesAndTargets(permissionAttributes, @@ -699,11 +698,11 @@ 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 @@ -717,11 +716,11 @@ 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(); @@ -735,7 +734,7 @@ securityAttributes = new SecurityAttributes(); securityAttributes.addDescriptorAttributes(allAttributes); permissionAttributes = securityAttributes.getPermissionAttributes(); - assertWithTrace(permissionAttributes != null + assertTrue(permissionAttributes != null && permissionAttributes.length == 2 && checkImportance(permissionAttributes, 2, 0) && checkNamesAndTargets(permissionAttributes, @@ -757,7 +756,7 @@ securityAttributes = new SecurityAttributes(); securityAttributes.addDescriptorAttributes(allAttributes); permissionAttributes = securityAttributes.getPermissionAttributes(); - assertWithTrace(permissionAttributes != null + assertTrue(permissionAttributes != null && permissionAttributes.length == 1 && checkImportance(permissionAttributes, 1, 0) && checkNamesAndTargets(permissionAttributes, @@ -778,7 +777,7 @@ securityAttributes = new SecurityAttributes(); securityAttributes.addDescriptorAttributes(allAttributes); permissionAttributes = securityAttributes.getPermissionAttributes(); - assertWithTrace(permissionAttributes != null + assertTrue(permissionAttributes != null && permissionAttributes.length == 4 && checkImportance(permissionAttributes, 2, 2) && checkNamesAndTargets(permissionAttributes, @@ -798,7 +797,7 @@ securityAttributes = new SecurityAttributes(); securityAttributes.addDescriptorAttributes(allAttributes); permissionAttributes = securityAttributes.getPermissionAttributes(); - assertWithTrace(permissionAttributes != null + assertTrue(permissionAttributes != null && permissionAttributes.length == 2 && checkImportance(permissionAttributes, 1, 1) && checkNamesAndTargets(permissionAttributes, @@ -812,7 +811,7 @@ securityAttributes = new SecurityAttributes(); securityAttributes.addDescriptorAttributes(allAttributes); permissionAttributes = securityAttributes.getPermissionAttributes(); - assertWithTrace(permissionAttributes != null + assertTrue(permissionAttributes != null && permissionAttributes.length == 2 && checkImportance(permissionAttributes, 1, 1) && checkNamesAndTargets(permissionAttributes, @@ -826,7 +825,7 @@ securityAttributes = new SecurityAttributes(); securityAttributes.addDescriptorAttributes(allAttributes); permissionAttributes = securityAttributes.getPermissionAttributes(); - assertWithTrace(permissionAttributes != null + assertTrue(permissionAttributes != null && permissionAttributes.length == 2 && checkImportance(permissionAttributes, 1, 1) && checkNamesAndTargets(permissionAttributes, @@ -842,7 +841,7 @@ securityAttributes = new SecurityAttributes(); securityAttributes.addDescriptorAttributes(allAttributes); permissionAttributes = securityAttributes.getPermissionAttributes(); - assertWithTrace(permissionAttributes != null + assertTrue(permissionAttributes != null && permissionAttributes.length == 2 && checkImportance(permissionAttributes, 1, 1) && checkNamesAndTargets(permissionAttributes, @@ -856,11 +855,11 @@ 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, @@ -874,11 +873,11 @@ 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, @@ -891,7 +890,7 @@ securityAttributes = new SecurityAttributes(); securityAttributes.addDescriptorAttributes(allAttributes); permissionAttributes = securityAttributes.getPermissionAttributes(); - assertWithTrace(permissionAttributes != null + assertTrue(permissionAttributes != null && permissionAttributes.length == 1 && checkImportance(permissionAttributes, 1, 0) && checkNamesAndTargets(permissionAttributes, @@ -933,7 +932,7 @@ 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) { @@ -1111,13 +1110,6 @@ 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