Author: coheigea
Date: Mon Dec 6 13:25:20 2010
New Revision: 1042632
URL: http://svn.apache.org/viewvc?rev=1042632&view=rev
Log:
[WSS-250] - Upgraded to Junit4 and moved the component tests.
Added:
webservices/wss4j/trunk/lib/junit-4.8.2.jar (with props)
webservices/wss4j/trunk/src/test/java/org/
webservices/wss4j/trunk/src/test/java/org/apache/
webservices/wss4j/trunk/src/test/java/org/apache/ws/
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/MerlinTest.java
- copied, changed from r1042611,
webservices/wss4j/trunk/src/test/java/components/TestMerlin.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/X509NameTokenizerTest.java
- copied, changed from r1042611,
webservices/wss4j/trunk/src/test/java/components/TestX509NameTokenizer.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/ReferenceTest.java
- copied, changed from r1042611,
webservices/wss4j/trunk/src/test/java/components/TestReference.java
Removed:
webservices/wss4j/trunk/lib/junit-3.8.1.jar
webservices/wss4j/trunk/src/test/java/components/
Modified:
webservices/wss4j/trunk/pom.xml
Added: webservices/wss4j/trunk/lib/junit-4.8.2.jar
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/lib/junit-4.8.2.jar?rev=1042632&view=auto
==============================================================================
Binary file - no diff available.
Propchange: webservices/wss4j/trunk/lib/junit-4.8.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: webservices/wss4j/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/pom.xml?rev=1042632&r1=1042631&r2=1042632&view=diff
==============================================================================
--- webservices/wss4j/trunk/pom.xml (original)
+++ webservices/wss4j/trunk/pom.xml Mon Dec 6 13:25:20 2010
@@ -347,7 +347,7 @@
<commons.logging.version>1.1</commons.logging.version>
<xalan.version>2.7.1</xalan.version>
<xerces.version>2.9.1</xerces.version>
- <junit.version>3.8.1</junit.version>
+ <junit.version>4.8.2</junit.version>
</properties>
<dependencies>
Copied:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/MerlinTest.java
(from r1042611,
webservices/wss4j/trunk/src/test/java/components/TestMerlin.java)
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/MerlinTest.java?p2=webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/MerlinTest.java&p1=webservices/wss4j/trunk/src/test/java/components/TestMerlin.java&r1=1042611&r2=1042632&rev=1042632&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/components/TestMerlin.java (original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/MerlinTest.java
Mon Dec 6 13:25:20 2010
@@ -17,14 +17,7 @@
* under the License.
*/
-package components;
-
-import junit.framework.TestCase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.ws.security.components.crypto.AbstractCrypto;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+package org.apache.ws.security.components.crypto;
/**
* Created by IntelliJ IDEA.
@@ -33,32 +26,15 @@ import org.apache.ws.security.components
* Time: 10:50:05 AM
* To change this template use File | Settings | File Templates.
*/
-public class TestMerlin extends TestCase {
- /**
- * TestScenario1 constructor
- * <p/>
- *
- * @param name name of the test
- */
- public TestMerlin(String name) {
- super(name);
- }
-
- /**
- * JUnit suite
- * <p/>
- *
- * @return a junit test suite
- */
- public static Test suite() {
- return new TestSuite(TestMerlin.class);
- }
-
+public class MerlinTest extends org.junit.Assert {
+
+ @org.junit.Test
public void testCrypto() {
Crypto crypto = CryptoFactory.getInstance();
assertTrue(crypto != null);
}
+ @org.junit.Test
public void testAbstractCryptoWithNullProperties()
throws Exception {
Crypto crypto = new NullPropertiesCrypto();
Copied:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/X509NameTokenizerTest.java
(from r1042611,
webservices/wss4j/trunk/src/test/java/components/TestX509NameTokenizer.java)
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/X509NameTokenizerTest.java?p2=webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/X509NameTokenizerTest.java&p1=webservices/wss4j/trunk/src/test/java/components/TestX509NameTokenizer.java&r1=1042611&r2=1042632&rev=1042632&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/components/TestX509NameTokenizer.java
(original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/X509NameTokenizerTest.java
Mon Dec 6 13:25:20 2010
@@ -17,26 +17,14 @@
* under the License.
*/
-package components;
-
-import junit.framework.TestCase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.ws.security.components.crypto.X509NameTokenizer;
+package org.apache.ws.security.components.crypto;
/**
*
*/
-public class TestX509NameTokenizer extends TestCase {
-
- public TestX509NameTokenizer(String name) {
- super(name);
- }
-
- public static Test suite() {
- return new TestSuite(TestX509NameTokenizer.class);
- }
+public class X509NameTokenizerTest extends org.junit.Assert {
+ @org.junit.Test
public void
testEmptyX509NameTokenizer() {
checkEmpty(new X509NameTokenizer(""));
@@ -44,6 +32,7 @@ public class TestX509NameTokenizer exten
checkEmpty(new X509NameTokenizer(" \t \n \r\n"));
}
+ @org.junit.Test
public void
testWellFormedX509NameTokenizer() {
checkTokenizer(
Copied:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/ReferenceTest.java
(from r1042611,
webservices/wss4j/trunk/src/test/java/components/TestReference.java)
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/ReferenceTest.java?p2=webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/ReferenceTest.java&p1=webservices/wss4j/trunk/src/test/java/components/TestReference.java&r1=1042611&r2=1042632&rev=1042632&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/components/TestReference.java
(original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/ReferenceTest.java
Mon Dec 6 13:25:20 2010
@@ -17,19 +17,14 @@
* under the License.
*/
-package components;
-
-import junit.framework.TestCase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+package org.apache.ws.security.message.token;
import org.apache.ws.security.WSSecurityException;
-import org.apache.ws.security.message.token.Reference;
/**
* unit test for the Reference type
*/
-public class TestReference extends TestCase {
+public class ReferenceTest extends org.junit.Assert {
private static final String
TEST_REFERENCE_TEMPLATE =
@@ -52,15 +47,7 @@ public class TestReference extends TestC
;
- public TestReference(String name) {
- super(name);
- }
-
- public static Test suite() {
- return new TestSuite(TestReference.class);
- }
-
-
+ @org.junit.Test
public void
testConstructor() throws Exception {
//
@@ -103,6 +90,7 @@ public class TestReference extends TestC
);
}
+ @org.junit.Test
public void
testAccessors() throws Exception {
final Reference ref = new Reference(
