[jboss-svn-commits] JBL Code SVN: r21533 - in labs/jbossesb/workspace/dbevenius/security/product/rosetta: tests/src/org/jboss/soa/esb/services/security/auth/ws and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: beve
Date: 2008-08-14 03:17:08 -0400 (Thu, 14 Aug 2008)
New Revision: 21533

Modified:
   labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityToken.java
   labs/jbossesb/workspace/dbevenius/security/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityTokenTest.java
Log:
Added a test method and minor code mod


Modified: labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityToken.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityToken.java	2008-08-14 06:34:02 UTC (rev 21532)
+++ labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityToken.java	2008-08-14 07:17:08 UTC (rev 21533)
@@ -66,34 +66,7 @@
 		return cert;
 	}
 	
-	private String stripNSAlias(String value)
-	{
-		if ( value != null )
-		{
-			value = value.substring( value.indexOf(':') + 1 );
-		}
-		return value;
-	}
-	
 	private enum EncodingType { Base64Binary, HexBinary }
-	private enum ValueType 
-	{ 
-		X509v3( "X509" ), 
-		Kerberosv5TGT( "" ), 
-		Kerberosv5ST ( "" );
-		
-		private String certType;
-		
-		private ValueType(final String certType )
-		{
-			this.certType = certType;
-		}
-		
-		public String getCertType()
-		{
-			return certType;
-		}
-	}
 	
 	public void setKey(final String key)
 	{
@@ -130,5 +103,16 @@
 		
 		return valueType;
 	}
+
+	private String stripNSAlias(String value)
+	{
+		if ( value != null )
+		{
+			final int idx = value.indexOf(':');
+			if ( idx > 0 )
+				value = value.substring( idx + 1 );
+		}
+		return value;
+	}
 	
 }

Modified: labs/jbossesb/workspace/dbevenius/security/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityTokenTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityTokenTest.java	2008-08-14 06:34:02 UTC (rev 21532)
+++ labs/jbossesb/workspace/dbevenius/security/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityTokenTest.java	2008-08-14 07:17:08 UTC (rev 21533)
@@ -36,6 +36,7 @@
 import junit.framework.JUnit4TestAdapter;
 
 /**
+ * Unittest for {@link BinarySecurityToken}
  * 
  * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
  *
@@ -54,6 +55,20 @@
 	}
 	
 	@Test
+	public void setEncodingTypeWithNSPrefix2()
+	{
+		token.setEncodingType("d:" + expectedEncoding);
+		assertEquals( expectedEncoding, token.getEncodingType() );
+	}
+	
+	@Test
+	public void setEncodingTypeWithoutNSPrefix()
+	{
+		token.setEncodingType(expectedEncoding);
+		assertEquals( expectedEncoding, token.getEncodingType() );
+	}
+	
+	@Test
 	public void setEncodingType()
 	{
 		token.setEncodingType(expectedEncoding);
@@ -73,7 +88,6 @@
 		token.setEncodingType(expectedEncoding);
 		token.setValueType(expectedValueType);
 		token.setKey(getExampleCert());
-		System.out.println(token.getKey());
 	}
 	
 	private String getExampleCert() throws SAXException, IOException, ParserConfigurationException, ConfigurationException