You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2010/07/01 22:39:58 UTC
svn commit: r959775 - in /myfaces/shared/trunk/core: ./
src/test/java/org/apache/myfaces/shared/taglib/
src/test/java/org/apache/myfaces/shared/util/
Author: lu4242
Date: Thu Jul 1 20:39:57 2010
New Revision: 959775
URL: http://svn.apache.org/viewvc?rev=959775&view=rev
Log:
MYFACESTEST-14 Update myfaces-test to use JUnit 4.x
Modified:
myfaces/shared/trunk/core/pom.xml
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/taglib/UIComponentTagUtilsTest.java
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsBlowfish_ECBTest.java
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsDefaultTest.java
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsTripleDES_ECBTest.java
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java
Modified: myfaces/shared/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/pom.xml?rev=959775&r1=959774&r2=959775&view=diff
==============================================================================
--- myfaces/shared/trunk/core/pom.xml (original)
+++ myfaces/shared/trunk/core/pom.xml Thu Jul 1 20:39:57 2010
@@ -21,6 +21,7 @@
<build>
<plugins>
+ <!--
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.1.2</version>
@@ -30,6 +31,7 @@
</excludes>
</configuration>
</plugin>
+ -->
<plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
@@ -72,10 +74,12 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>jxr-maven-plugin</artifactId>
</plugin>
+ <!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>surefire-report-maven-plugin</artifactId>
</plugin>
+ -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
Modified: myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/taglib/UIComponentTagUtilsTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/taglib/UIComponentTagUtilsTest.java?rev=959775&r1=959774&r2=959775&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/taglib/UIComponentTagUtilsTest.java (original)
+++ myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/taglib/UIComponentTagUtilsTest.java Thu Jul 1 20:39:57 2010
@@ -30,9 +30,9 @@ public class UIComponentTagUtilsTest ext
super(name);
}
- public static Test suite() {
- return null; // keep this method or maven won't run it
- }
+ //public static Test suite() {
+ // return null; // keep this method or maven won't run it
+ //}
/**
* Simple custom component that counts how many times its
Modified: myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java?rev=959775&r1=959774&r2=959775&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java (original)
+++ myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java Thu Jul 1 20:39:57 2010
@@ -44,15 +44,16 @@ public class CachedStateUtilsAES_CBCTest
super(name);
}
- public static Test suite() {
- return null; // keep this method or maven won't run it
- }
+ //No longer necessary using junit 4 to run tests
+ //public static Test suite() {
+ // return null; // keep this method or maven won't run it
+ //}
public void setUp() throws Exception
{
super.setUp();
- servletContext.addInitParameter(StateUtils.INIT_SECRET, BASE64_KEY_SIZE_24);
+ servletContext.addInitParameter(StateUtils.INIT_SECRET, BASE64_KEY_SIZE_16);
servletContext.addInitParameter(StateUtils.INIT_ALGORITHM, "AES");
servletContext.addInitParameter(StateUtils.INIT_ALGORITHM_PARAM, "CBC/PKCS5Padding");
servletContext.addInitParameter(StateUtils.INIT_ALGORITHM_IV, BASE64_KEY_SIZE_16);
Modified: myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsBlowfish_ECBTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsBlowfish_ECBTest.java?rev=959775&r1=959774&r2=959775&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsBlowfish_ECBTest.java (original)
+++ myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsBlowfish_ECBTest.java Thu Jul 1 20:39:57 2010
@@ -34,9 +34,10 @@ public class CachedStateUtilsBlowfish_EC
super(name);
}
- public static Test suite() {
- return null; // keep this method or maven won't run it
- }
+ // No longer necessary using junit 4 to run tests
+ //public static Test suite() {
+ // return null; // keep this method or maven won't run it
+ //}
public void setUp() throws Exception
{
Modified: myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsDefaultTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsDefaultTest.java?rev=959775&r1=959774&r2=959775&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsDefaultTest.java (original)
+++ myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsDefaultTest.java Thu Jul 1 20:39:57 2010
@@ -34,9 +34,10 @@ public class CachedStateUtilsDefaultTest
super(name);
}
- public static Test suite() {
- return null; // keep this method or maven won't run it
- }
+ // No longer necessary using junit 4 to run tests
+ //public static Test suite() {
+ // return null; // keep this method or maven won't run it
+ //}
public void setUp() throws Exception
{
Modified: myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsTripleDES_ECBTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsTripleDES_ECBTest.java?rev=959775&r1=959774&r2=959775&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsTripleDES_ECBTest.java (original)
+++ myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsTripleDES_ECBTest.java Thu Jul 1 20:39:57 2010
@@ -34,9 +34,10 @@ public class CachedStateUtilsTripleDES_E
super(name);
}
- public static Test suite() {
- return null; // keep this method or maven won't run it
- }
+ // No longer necessary using junit 4 to run tests
+ //public static Test suite() {
+ // return null; // keep this method or maven won't run it
+ //}
public void setUp() throws Exception
{
Modified: myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java?rev=959775&r1=959774&r2=959775&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java (original)
+++ myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java Thu Jul 1 20:39:57 2010
@@ -32,9 +32,10 @@ public class InitVector_CBCTestCase exte
super(name);
}
- public static Test suite() {
- return null; // keep this method or maven won't run it
- }
+ // No longer necessary using junit 4 to run tests
+ //public static Test suite() {
+ // return null; // keep this method or maven won't run it
+ //}
public void setUp() throws Exception{
Modified: myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java?rev=959775&r1=959774&r2=959775&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java (original)
+++ myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java Thu Jul 1 20:39:57 2010
@@ -39,9 +39,10 @@ public class MessageUtilsTest extends Ab
super(name);
}
- public static Test suite() {
- return null; // keep this method or maven won't run it
- }
+ // No longer necessary using junit 4 to run tests
+ //public static Test suite() {
+ // return null; // keep this method or maven won't run it
+ //}
/**
* Test method for 'org.apache.myfaces.shared.util.MessageUtils.getMessage(Severity, String, Object)'
Modified: myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java?rev=959775&r1=959774&r2=959775&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java (original)
+++ myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java Thu Jul 1 20:39:57 2010
@@ -34,9 +34,10 @@ public class SecretKeyCacheTest extends
super(name);
}
- public static Test suite() {
- return null; // keep this method or maven won't run it
- }
+ // No longer necessary using junit 4 to run tests
+ //public static Test suite() {
+ // return null; // keep this method or maven won't run it
+ //}
public void setUp() throws Exception
{
Modified: myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java?rev=959775&r1=959774&r2=959775&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java (original)
+++ myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java Thu Jul 1 20:39:57 2010
@@ -32,9 +32,10 @@ public class SecretKeyConfigurationTest
super(name);
}
- public static Test suite() {
- return null; // keep this method or maven won't run it
- }
+ // No longer necessary using junit 4 to run tests
+ //public static Test suite() {
+ // return null; // keep this method or maven won't run it
+ //}
public void setUp() throws Exception
{
Modified: myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java?rev=959775&r1=959774&r2=959775&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java (original)
+++ myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java Thu Jul 1 20:39:57 2010
@@ -38,15 +38,16 @@ public class StateUtilsAES_CBCTest exten
super(name);
}
- public static Test suite() {
- return null; // keep this method or maven won't run it
- }
+ // No longer necessary using junit 4 to run tests
+ //public static Test suite() {
+ // return null; // keep this method or maven won't run it
+ //}
public void setUp() throws Exception
{
super.setUp();
- servletContext.addInitParameter(StateUtils.INIT_SECRET, BASE64_KEY_SIZE_24);
+ servletContext.addInitParameter(StateUtils.INIT_SECRET, BASE64_KEY_SIZE_16);
servletContext.addInitParameter(StateUtils.INIT_ALGORITHM, "AES");
servletContext.addInitParameter(StateUtils.INIT_ALGORITHM_PARAM, "CBC/PKCS5Padding");
servletContext.addInitParameter(StateUtils.INIT_ALGORITHM_IV, BASE64_KEY_SIZE_16);
@@ -55,5 +56,4 @@ public class StateUtilsAES_CBCTest exten
StateUtils.initSecret(servletContext);// should do nothing
}
-
}
Modified: myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java?rev=959775&r1=959774&r2=959775&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java (original)
+++ myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java Thu Jul 1 20:39:57 2010
@@ -37,9 +37,10 @@ public class StateUtilsBlowfish_ECBTest
super(name);
}
- public static Test suite() {
- return null; // keep this method or maven won't run it
- }
+ // No longer necessary using junit 4 to run tests
+ //public static Test suite() {
+ // return null; // keep this method or maven won't run it
+ //}
public void setUp() throws Exception
{
Modified: myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java?rev=959775&r1=959774&r2=959775&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java (original)
+++ myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java Thu Jul 1 20:39:57 2010
@@ -31,9 +31,10 @@ public class StateUtilsDefaultTest exten
super(name);
}
- public static Test suite() {
- return null; // keep this method or maven won't run it
- }
+ // No longer necessary using junit 4 to run tests
+ //public static Test suite() {
+ // return null; // keep this method or maven won't run it
+ //}
public void setUp() throws Exception
{
Modified: myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java?rev=959775&r1=959774&r2=959775&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java (original)
+++ myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java Thu Jul 1 20:39:57 2010
@@ -37,9 +37,10 @@ public class StateUtilsTripleDES_ECBTest
super(name);
}
- public static Test suite() {
- return null; // keep this method or maven won't run it
- }
+ // No longer necessary using junit 4 to run tests
+ //public static Test suite() {
+ // return null; // keep this method or maven won't run it
+ //}
public void setUp() throws Exception
{