You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2004/10/19 13:35:36 UTC
cvs commit: jakarta-turbine-fulcrum/crypto/impl/src/test TestComponentConfig.xml TestRoleConfig.xml
epugh 2004/10/19 04:35:36
Modified: crypto/impl/xdocs changes.xml
crypto/impl maven.xml project.xml
crypto/impl/src/test/org/apache/fulcrum/crypto
CryptoServiceTest.java
Added: crypto/impl/src/test TestComponentConfig.xml
TestRoleConfig.xml
Log:
Add ECM based test
Revision Changes Path
1.3 +3 -0 jakarta-turbine-fulcrum/crypto/impl/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/crypto/impl/xdocs/changes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- changes.xml 14 Oct 2004 10:52:52 -0000 1.2
+++ changes.xml 19 Oct 2004 11:35:35 -0000 1.3
@@ -7,6 +7,9 @@
<body>
<release version="1.0.5" date="">
+ <action dev="epugh" type="update">
+ Add ECM based tests.
+ </action>
<action dev="epugh" type="update" due-to="Youngho Cho">
Update to use commons-codec-1.3
</action>
1.2 +2 -2 jakarta-turbine-fulcrum/crypto/impl/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/crypto/impl/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 18 Nov 2003 11:44:28 -0000 1.1
+++ maven.xml 19 Oct 2004 11:35:35 -0000 1.2
@@ -1,7 +1,7 @@
<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
- <preGoal name="java:compile">
+ <!--preGoal name="java:compile">
<attainGoal name="avalon:meta"/>
- </preGoal>
+ </preGoal-->
</project>
1.9 +9 -2 jakarta-turbine-fulcrum/crypto/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/crypto/impl/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 16 Oct 2004 17:46:32 -0000 1.8
+++ project.xml 19 Oct 2004 11:35:35 -0000 1.9
@@ -3,7 +3,7 @@
<project>
<id>fulcrum-crypto-impl</id>
- <extend>${basedir}/../../merlin-project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<name>Fulcrum Crypto Component Implementation</name>
<currentVersion>1.0.5-dev</currentVersion>
<package>org.apache.fulcrum.crypto</package>
@@ -25,7 +25,7 @@
<dependency>
<groupId>javamail</groupId>
<artifactId>javamail</artifactId>
- <version>1.3</version>
+ <version>1.3.1</version>
<url>http://java.sun.com/products/javamail/</url>
</dependency>
@@ -40,6 +40,13 @@
<artifactId>cryptix</artifactId>
<version>3.2.0</version>
</dependency>
+
+ <!-- Needed only for testing -->
+ <dependency>
+ <groupId>fulcrum</groupId>
+ <artifactId>fulcrum-testcontainer</artifactId>
+ <version>1.0.4-dev</version>
+ </dependency>
</dependencies>
1.3 +55 -125 jakarta-turbine-fulcrum/crypto/impl/src/test/org/apache/fulcrum/crypto/CryptoServiceTest.java
Index: CryptoServiceTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/crypto/impl/src/test/org/apache/fulcrum/crypto/CryptoServiceTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CryptoServiceTest.java 14 Feb 2004 14:22:44 -0000 1.2
+++ CryptoServiceTest.java 19 Oct 2004 11:35:36 -0000 1.3
@@ -53,10 +53,7 @@
* <http://www.apache.org/>.
*/
-import org.apache.avalon.merlin.unit.AbstractMerlinTestCase;
-import org.apache.avalon.util.exception.ExceptionHelper;
-
-import junit.framework.TestSuite;
+import org.apache.fulcrum.testcontainer.BaseUnitTest;
/**
* Basic testing of the Container
@@ -65,7 +62,7 @@
* @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
* @version $Id$
*/
-public class CryptoServiceTest extends AbstractMerlinTestCase
+public class CryptoServiceTest extends BaseUnitTest
{
private CryptoService sc = null;
private static final String preDefinedInput = "Oeltanks";
@@ -80,153 +77,86 @@
super(testName);
}
- /**
- * Factory method for creating a TestSuite for this class.
- *
- * @return the test suite
- */
- public static TestSuite suite()
- {
- TestSuite suite = new TestSuite(CryptoServiceTest.class);
- return suite;
- }
public void setUp() throws Exception
{
super.setUp();
- try
- {
- sc = (CryptoService) this.resolve( "crypto" );
- }
- catch ( Exception e)
- {
- final String error =
- ExceptionHelper.packException( e.getMessage(), e, true );
- fail( error );
- }
+ sc = (CryptoService) this.lookup( CryptoService.ROLE );
+
}
- public void testUnixCrypt()
+ public void testUnixCrypt() throws Exception
{
String preDefinedSeed = "z5";
String preDefinedResult = "z5EQaXpuu059c";
- try
- {
- CryptoAlgorithm ca = sc.getCryptoAlgorithm("unix");
- /*
- * Test predefined Seed
- */
- ca.setSeed(preDefinedSeed);
- String output = ca.encrypt(preDefinedInput);
- assertEquals("Encryption failed ", preDefinedResult, output);
- /*
- * Test random Seed
- *
- */
- ca.setSeed(null);
- String result = ca.encrypt(preDefinedInput);
- ca.setSeed(result);
- output = ca.encrypt(preDefinedInput);
- assertEquals("Encryption failed ", output, result);
+
+ CryptoAlgorithm ca = sc.getCryptoAlgorithm("unix");
+ /*
+ * Test predefined Seed
+ */
+ ca.setSeed(preDefinedSeed);
+ String output = ca.encrypt(preDefinedInput);
+ assertEquals("Encryption failed ", preDefinedResult, output);
+ /*
+ * Test random Seed
+ *
+ */
+ ca.setSeed(null);
+ String result = ca.encrypt(preDefinedInput);
+ ca.setSeed(result);
+ output = ca.encrypt(preDefinedInput);
+ assertEquals("Encryption failed ", output, result);
- }
- catch (Exception e)
- {
- final String error =
- ExceptionHelper.packException( e.getMessage(), e, true );
- fail();
- }
+
+
}
- public void testClearCrypt()
+ public void testClearCrypt() throws Exception
{
String preDefinedResult = "Oeltanks";
- try
- {
- CryptoAlgorithm ca = sc.getCryptoAlgorithm("clear");
- String output = ca.encrypt(preDefinedInput);
- assertEquals("Encryption failed ", preDefinedResult, output);
-
- }
- catch (Exception e)
- {
- final String error =
- ExceptionHelper.packException( e.getMessage(), e, true );
- fail();
- }
+
+ CryptoAlgorithm ca = sc.getCryptoAlgorithm("clear");
+ String output = ca.encrypt(preDefinedInput);
+ assertEquals("Encryption failed ", preDefinedResult, output);
+
}
- public void testOldJavaCryptMd5()
+ public void testOldJavaCryptMd5() throws Exception
{
String preDefinedResult = "XSop0mncK19Ii2r2CUe2";
- try
- {
- CryptoAlgorithm ca = sc.getCryptoAlgorithm("oldjava");
- ca.setCipher("MD5");
- String output = ca.encrypt(preDefinedInput);
- assertEquals("MD5 Encryption failed ", preDefinedResult, output);
+
+ CryptoAlgorithm ca = sc.getCryptoAlgorithm("oldjava");
+ ca.setCipher("MD5");
+ String output = ca.encrypt(preDefinedInput);
+ assertEquals("MD5 Encryption failed ", preDefinedResult, output);
- }
- catch (Exception e)
- {
- final String error =
- ExceptionHelper.packException( e.getMessage(), e, true );
- fail();
- }
}
- public void testOldJavaCryptSha1()
+ public void testOldJavaCryptSha1() throws Exception
{
String preDefinedResult = "uVDiJHaavRYX8oWt5ctkaa7j";
- try
- {
- CryptoAlgorithm ca = sc.getCryptoAlgorithm("oldjava");
- ca.setCipher("SHA1");
- String output = ca.encrypt(preDefinedInput);
- assertEquals("SHA1 Encryption failed ", preDefinedResult, output);
-
- }
- catch (Exception e)
- {
- final String error =
- ExceptionHelper.packException( e.getMessage(), e, true );
- fail();
- }
+
+ CryptoAlgorithm ca = sc.getCryptoAlgorithm("oldjava");
+ ca.setCipher("SHA1");
+ String output = ca.encrypt(preDefinedInput);
+ assertEquals("SHA1 Encryption failed ", preDefinedResult, output);
+
}
- public void testJavaCryptMd5()
+ public void testJavaCryptMd5() throws Exception
{
String preDefinedResult = "XSop0mncK19Ii2r2CUe29w==";
- try
- {
- CryptoAlgorithm ca = sc.getCryptoAlgorithm("java");
- ca.setCipher("MD5");
- String output = ca.encrypt(preDefinedInput);
- assertEquals("MD5 Encryption failed ", preDefinedResult, output);
-
- }
- catch (Exception e)
- {
- final String error =
- ExceptionHelper.packException( e.getMessage(), e, true );
- fail();
- }
+ CryptoAlgorithm ca = sc.getCryptoAlgorithm("java");
+ ca.setCipher("MD5");
+ String output = ca.encrypt(preDefinedInput);
+ assertEquals("MD5 Encryption failed ", preDefinedResult, output);
}
- public void testJavaCryptSha1()
+ public void testJavaCryptSha1() throws Exception
{
String preDefinedResult = "uVDiJHaavRYX8oWt5ctkaa7j1cw=";
- try
- {
- CryptoAlgorithm ca = sc.getCryptoAlgorithm("java");
- ca.setCipher("SHA1");
- String output = ca.encrypt(preDefinedInput);
- assertEquals("SHA1 Encryption failed ", preDefinedResult, output);
-
- }
- catch (Exception e)
- {
- final String error =
- ExceptionHelper.packException( e.getMessage(), e, true );
- fail();
- }
+ CryptoAlgorithm ca = sc.getCryptoAlgorithm("java");
+ ca.setCipher("SHA1");
+ String output = ca.encrypt(preDefinedInput);
+ assertEquals("SHA1 Encryption failed ", preDefinedResult, output);
+
}
}
1.1 jakarta-turbine-fulcrum/crypto/impl/src/test/TestComponentConfig.xml
Index: TestComponentConfig.xml
===================================================================
<componentConfig>
<crypto>
<algorithm>
<unix>org.apache.fulcrum.crypto.provider.UnixCrypt</unix>
<clear>org.apache.fulcrum.crypto.provider.ClearCrypt</clear>
<java>org.apache.fulcrum.crypto.provider.JavaCrypt</java>
<oldjava>org.apache.fulcrum.crypto.provider.OldJavaCrypt</oldjava>
</algorithm>
</crypto>
</componentConfig>
1.1 jakarta-turbine-fulcrum/crypto/impl/src/test/TestRoleConfig.xml
Index: TestRoleConfig.xml
===================================================================
<!-- This configuration file for Avalon components is used for testing the TestComponent -->
<role-list>
<role
name="org.apache.fulcrum.crypto.CryptoService"
shorthand="crypto"
default-class="org.apache.fulcrum.crypto.DefaultCryptoService"/>
</role-list>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org