Reorganized one of the tests and added some new test cases.

Author: kwwall

src/test/java/org/owasp/esapi/crypto/CryptoTokenTest.java

@@ -288,34 +288,42 @@ public final void testSetAndGetAttribute() {
         // where attribute values contains each of the values that will
         // be quoted, namely:   '\', '=', and ';'
         try {
+            String[] attrValues = { "\\", ";", "=", "foo=", "bar\\=", "foobar=\"" };
             String complexValue = "kwwall;1291183520293;abc=x=yx;xyz=;efg=a;a;;bbb=quotes\\tuff";
-            
-            ctok.setAttribute("..--__", ""); // Ugly, but legal attr name; empty is legal value.
-            ctok.setAttribute("attr1", "\\");
-            ctok.setAttribute("attr2", ";");
-            ctok.setAttribute("attr3", "=");
+
             ctok.setAttribute("complexAttr", complexValue);
+            ctok.setAttribute("..--__", ""); // Ugly weird but legal attr name; empty is legal value.
+            
+            for ( int i = 0; i < attrValues.length; i++ ) {
+                String attrName = "attr" + i;
+                String attrVal  = attrValues[i];
+
+                ctok.setAttribute( attrName, attrVal );
+            }
+
             String tokenVal = ctok.getToken();
             assertNotNull("tokenVal should not be null", tokenVal);
 
             CryptoToken ctok2 = new CryptoToken(tokenVal);
+
             String weirdAttr = ctok2.getAttribute("..--__");
             assertTrue("Expecting empty string for value of weird attr, but got: " + weirdAttr,
                        weirdAttr.equals(""));
 
-            String attr1 = ctok2.getAttribute("attr1");
-            assertTrue("attr1 has unexpected value of " + attr1, attr1.equals("\\") );
-
-            String attr2 = ctok2.getAttribute("attr2");
-            assertTrue("attr2 has unexpected value of " + attr2, attr2.equals(";") );
-
-            String attr3 = ctok2.getAttribute("attr3");
-            assertTrue("attr3 has unexpected value of " + attr3, attr3.equals("=") );
-
             String complexAttr = ctok2.getAttribute("complexAttr");
             assertNotNull(complexAttr);
             assertTrue("complexAttr has unexpected value of " + complexAttr, complexAttr.equals(complexValue) );
 
+            for ( int i = 0; i < attrValues.length; i++ ) {
+                String attrName  = "attr" + i;
+                String attrVal   = attrValues[i];
+                String retrieved = ctok2.getAttribute( attrName );
+                String assertMsg = "Exptected attribute '" + attrName + "' to have value of '" + attrVal + "', but had value of '" + retrieved;
+
+                assertTrue( assertMsg, attrVal.equals( attrVal ) );
+                ctok.setAttribute( attrName, attrVal );
+            }
+
         } catch (ValidationException e) {
             fail("Caught unexpected ValidationException: " + e);
         } catch (Exception e) {