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/02/14 15:22:44 UTC
cvs commit: jakarta-turbine-fulcrum/crypto/impl project.xml
epugh 2004/02/14 06:22:44
Modified: crypto/impl/src/test/org/apache/fulcrum/crypto
CryptoServiceTest.java
crypto/impl project.xml
Log:
Update merlin issues
Revision Changes Path
1.2 +16 -22 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CryptoServiceTest.java 18 Nov 2003 11:44:27 -0000 1.1
+++ CryptoServiceTest.java 14 Feb 2004 14:22:44 -0000 1.2
@@ -54,7 +54,8 @@
*/
import org.apache.avalon.merlin.unit.AbstractMerlinTestCase;
-import org.apache.avalon.merlin.unit.UnitHelper;
+import org.apache.avalon.util.exception.ExceptionHelper;
+
import junit.framework.TestSuite;
/**
@@ -100,8 +101,7 @@
catch ( Exception e)
{
final String error =
- UnitHelper.packException( e.getMessage(), e, true );
- getLogger().error( error );
+ ExceptionHelper.packException( e.getMessage(), e, true );
fail( error );
}
}
@@ -128,13 +128,12 @@
ca.setSeed(result);
output = ca.encrypt(preDefinedInput);
assertEquals("Encryption failed ", output, result);
- getLogger().info( "ok" );
+
}
catch (Exception e)
{
final String error =
- UnitHelper.packException( e.getMessage(), e, true );
- getLogger().error( error );
+ ExceptionHelper.packException( e.getMessage(), e, true );
fail();
}
}
@@ -147,13 +146,12 @@
CryptoAlgorithm ca = sc.getCryptoAlgorithm("clear");
String output = ca.encrypt(preDefinedInput);
assertEquals("Encryption failed ", preDefinedResult, output);
- getLogger().info( "ok" );
+
}
catch (Exception e)
{
final String error =
- UnitHelper.packException( e.getMessage(), e, true );
- getLogger().error( error );
+ ExceptionHelper.packException( e.getMessage(), e, true );
fail();
}
}
@@ -167,13 +165,12 @@
ca.setCipher("MD5");
String output = ca.encrypt(preDefinedInput);
assertEquals("MD5 Encryption failed ", preDefinedResult, output);
- getLogger().info( "ok" );
+
}
catch (Exception e)
{
final String error =
- UnitHelper.packException( e.getMessage(), e, true );
- getLogger().error( error );
+ ExceptionHelper.packException( e.getMessage(), e, true );
fail();
}
}
@@ -186,13 +183,12 @@
ca.setCipher("SHA1");
String output = ca.encrypt(preDefinedInput);
assertEquals("SHA1 Encryption failed ", preDefinedResult, output);
- getLogger().info( "ok" );
+
}
catch (Exception e)
{
final String error =
- UnitHelper.packException( e.getMessage(), e, true );
- getLogger().error( error );
+ ExceptionHelper.packException( e.getMessage(), e, true );
fail();
}
}
@@ -205,13 +201,12 @@
ca.setCipher("MD5");
String output = ca.encrypt(preDefinedInput);
assertEquals("MD5 Encryption failed ", preDefinedResult, output);
- getLogger().info( "ok" );
+
}
catch (Exception e)
{
final String error =
- UnitHelper.packException( e.getMessage(), e, true );
- getLogger().error( error );
+ ExceptionHelper.packException( e.getMessage(), e, true );
fail();
}
}
@@ -225,13 +220,12 @@
ca.setCipher("SHA1");
String output = ca.encrypt(preDefinedInput);
assertEquals("SHA1 Encryption failed ", preDefinedResult, output);
- getLogger().info( "ok" );
+
}
catch (Exception e)
{
final String error =
- UnitHelper.packException( e.getMessage(), e, true );
- getLogger().error( error );
+ ExceptionHelper.packException( e.getMessage(), e, true );
fail();
}
}
1.3 +1 -1 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 18 Jan 2004 14:15:52 -0000 1.2
+++ project.xml 14 Feb 2004 14:22:44 -0000 1.3
@@ -42,7 +42,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-unit</artifactId>
- <version>3.2.2-dev</version>
+ <version>3.2.10</version>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org