You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2023/02/06 10:58:52 UTC
[myfaces] 02/02: MYFACES-4408 - Junit4 style
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces.git
commit 3c52885c2def1d91c65ba4ee05567013a8ace888
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Mon Feb 6 11:58:41 2023 +0100
MYFACES-4408 - Junit4 style
---
.../component/_AttachedListStateWrapperTest.java | 30 +++-----------------
.../faces/component/_AttachedStateWrapperTest.java | 32 ++++-----------------
.../faces/component/_ComponentUtilsTest.java | 2 --
.../faces/component/_DeltaStateHelperTest.java | 13 ++++++++-
.../jakarta/faces/convert/NumberConverterTest.java | 2 +-
.../myfaces/application/ApplicationImplTest.java | 19 +++++++++----
.../digister/FacesConfigUnmarshallerImplTest.java | 13 ++++++++-
.../apache/myfaces/context/ContextRegexpTest.java | 7 +++--
.../html/behavior/AjaxBehaviorRenderTestCase.java | 33 +++++++++++-----------
.../renderkit/html/util/HTMLEncoderTest.java | 30 +++++++++++++++++++-
.../renderkit/html/util/HTMLEncoderWriterTest.java | 30 ++++++++++++++++++--
11 files changed, 128 insertions(+), 83 deletions(-)
diff --git a/impl/src/test/java/jakarta/faces/component/_AttachedListStateWrapperTest.java b/impl/src/test/java/jakarta/faces/component/_AttachedListStateWrapperTest.java
index 94d234042..448bed5ec 100644
--- a/impl/src/test/java/jakarta/faces/component/_AttachedListStateWrapperTest.java
+++ b/impl/src/test/java/jakarta/faces/component/_AttachedListStateWrapperTest.java
@@ -19,7 +19,6 @@
package jakarta.faces.component;
-import jakarta.faces.component._AttachedListStateWrapper;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
@@ -27,37 +26,15 @@ import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
import org.junit.Assert;
+import org.junit.Test;
-public class _AttachedListStateWrapperTest extends TestCase
+public class _AttachedListStateWrapperTest
{
-
- public static void main(String[] args)
- {
- junit.textui.TestRunner.run(_AttachedListStateWrapperTest.class);
- }
-
- public _AttachedListStateWrapperTest(String name)
- {
- super(name);
- }
-
- @Override
- public void setUp() throws Exception
- {
- super.setUp();
- }
-
- @Override
- public void tearDown() throws Exception
- {
- super.tearDown();
- }
-
/*
* Test method for 'jakarta.faces.component._AttachedListStateWrapper._AttachedListStateWrapper(List)'
*/
+ @Test
public void test_AttachedListStateWrapper()
{
List<Object> foo = new ArrayList<Object>();
@@ -66,6 +43,7 @@ public class _AttachedListStateWrapperTest extends TestCase
Assert.assertTrue(subject.getWrappedStateList() == foo);
}
+ @Test
public void testSerialize() throws Exception
{
String foo = "foo";
diff --git a/impl/src/test/java/jakarta/faces/component/_AttachedStateWrapperTest.java b/impl/src/test/java/jakarta/faces/component/_AttachedStateWrapperTest.java
index fd048beb0..f265d7ca3 100644
--- a/impl/src/test/java/jakarta/faces/component/_AttachedStateWrapperTest.java
+++ b/impl/src/test/java/jakarta/faces/component/_AttachedStateWrapperTest.java
@@ -19,43 +19,20 @@
package jakarta.faces.component;
-import jakarta.faces.component._AttachedStateWrapper;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import junit.framework.TestCase;
import org.junit.Assert;
+import org.junit.Test;
-public class _AttachedStateWrapperTest extends TestCase
+public class _AttachedStateWrapperTest
{
-
- public static void main(String[] args)
- {
- junit.textui.TestRunner.run(_AttachedStateWrapperTest.class);
- }
-
- public _AttachedStateWrapperTest(String name)
- {
- super(name);
- }
-
- @Override
- public void setUp() throws Exception
- {
- super.setUp();
- }
-
- @Override
- public void tearDown() throws Exception
- {
- super.tearDown();
- }
-
/*
* Test method for 'jakarta.faces.component._AttachedStateWrapper._AttachedStateWrapper(Class, Object)'
*/
+ @Test
public void test_AttachedStateWrapper()
{
_AttachedStateWrapper subject = new _AttachedStateWrapper(null, null);
@@ -66,6 +43,7 @@ public class _AttachedStateWrapperTest extends TestCase
/*
* Test method for 'jakarta.faces.component._AttachedStateWrapper.getClazz()'
*/
+ @Test
public void testGetClazz()
{
_AttachedStateWrapper subject = new _AttachedStateWrapper(String.class, "foo");
@@ -75,12 +53,14 @@ public class _AttachedStateWrapperTest extends TestCase
/*
* Test method for 'jakarta.faces.component._AttachedStateWrapper.getWrappedStateObject()'
*/
+ @Test
public void testGetWrappedStateObject()
{
_AttachedStateWrapper subject = new _AttachedStateWrapper(String.class, "foo");
Assert.assertEquals(subject.getClazz(), String.class);
}
+ @Test
public void testSerialize() throws Exception
{
String foo = "foo";
diff --git a/impl/src/test/java/jakarta/faces/component/_ComponentUtilsTest.java b/impl/src/test/java/jakarta/faces/component/_ComponentUtilsTest.java
index 904e67392..2dffa7f66 100644
--- a/impl/src/test/java/jakarta/faces/component/_ComponentUtilsTest.java
+++ b/impl/src/test/java/jakarta/faces/component/_ComponentUtilsTest.java
@@ -18,8 +18,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIOutput;
-import jakarta.faces.component.UIComponent;
import org.apache.myfaces.core.api.shared.ComponentUtils;
import org.apache.myfaces.test.mock.MockRenderedValueExpression;
diff --git a/impl/src/test/java/jakarta/faces/component/_DeltaStateHelperTest.java b/impl/src/test/java/jakarta/faces/component/_DeltaStateHelperTest.java
index f8449d9ea..f037b7f87 100644
--- a/impl/src/test/java/jakarta/faces/component/_DeltaStateHelperTest.java
+++ b/impl/src/test/java/jakarta/faces/component/_DeltaStateHelperTest.java
@@ -18,10 +18,10 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component._DeltaStateHelper;
import java.util.List;
import java.util.Map;
import org.junit.Assert;
+import org.junit.Test;
/**
* A generic framework less testcase for our _DeltaStateHelper class!
@@ -103,6 +103,7 @@ public class _DeltaStateHelperTest extends AbstractComponentTest
/**
* Test of isInitalStateMarked method, of class _DeltaStateHelper.
*/
+ @Test
public void testIsInitalStateMarked()
{
Assert.assertTrue("Initial state must be marked", _instance
@@ -115,6 +116,7 @@ public class _DeltaStateHelperTest extends AbstractComponentTest
/**
* Test of add method, of class _DeltaStateHelper.
*/
+ @Test
public void testAdd()
{
_instance.add(KEY1, VAL1);
@@ -156,6 +158,7 @@ public class _DeltaStateHelperTest extends AbstractComponentTest
/**
* Test of get method, of class _DeltaStateHelper.
*/
+ @Test
public void testGet()
{
_setupGetTests();
@@ -165,6 +168,7 @@ public class _DeltaStateHelperTest extends AbstractComponentTest
/**
* Test of put method, of class _DeltaStateHelper.
*/
+ @Test
public void testPut_Serializable_Object()
{
_setupGetTests();
@@ -179,6 +183,7 @@ public class _DeltaStateHelperTest extends AbstractComponentTest
&& entry.get(KEY_2_2).equals(VAL3));
}
+ @Test
public void testPut_null()
{
_instance.put(KEY1, null);
@@ -204,6 +209,7 @@ public class _DeltaStateHelperTest extends AbstractComponentTest
/**
* Test of put method, of class _DeltaStateHelper.
*/
+ @Test
public void testPut_3args()
{
//covered already by testPut_Serializable_Object()
@@ -212,6 +218,7 @@ public class _DeltaStateHelperTest extends AbstractComponentTest
/**
* Test of remove method, of class _DeltaStateHelper.
*/
+ @Test
public void testRemove_Serializable()
{
_setupGetTests();
@@ -224,6 +231,7 @@ public class _DeltaStateHelperTest extends AbstractComponentTest
/**
* Test of remove method, of class _DeltaStateHelper.
*/
+ @Test
public void testRemove_Serializable_Object()
{
_setupGetTests();
@@ -240,6 +248,7 @@ public class _DeltaStateHelperTest extends AbstractComponentTest
/**
* Test of saveState method, of class _DeltaStateHelper.
*/
+ @Test
public void testSaveState()
{
@@ -269,6 +278,7 @@ public class _DeltaStateHelperTest extends AbstractComponentTest
/**
* Test of restoreState method, of class _DeltaStateHelper.
*/
+ @Test
public void testRestoreState()
{
_setupGetTests();
@@ -293,6 +303,7 @@ public class _DeltaStateHelperTest extends AbstractComponentTest
/**
* Test of isTransient method, of class _DeltaStateHelper.
*/
+ @Test
public void testIsTransient()
{
_instance.setTransient(true);
diff --git a/impl/src/test/java/jakarta/faces/convert/NumberConverterTest.java b/impl/src/test/java/jakarta/faces/convert/NumberConverterTest.java
index d862c13e9..9e614bdac 100644
--- a/impl/src/test/java/jakarta/faces/convert/NumberConverterTest.java
+++ b/impl/src/test/java/jakarta/faces/convert/NumberConverterTest.java
@@ -233,7 +233,7 @@ public class NumberConverterTest extends AbstractJsfTestCase
try
{
Number number = (Number) mock.getAsObject(FacesContext.getCurrentInstance(), input, "1,234.56");
- assertEquals(number.intValue(), 1234);
+ Assert.assertEquals(number.intValue(), 1234);
}
catch (ConverterException e)
{
diff --git a/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java b/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java
index c72eae693..bee0a5c71 100644
--- a/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java
@@ -39,20 +39,20 @@ import jakarta.faces.convert.Converter;
import jakarta.faces.convert.ConverterException;
import jakarta.faces.convert.EnumConverter;
-import junit.framework.TestCase;
import org.apache.myfaces.test.MyFacesAsserts;
import org.apache.myfaces.test.TestRunner;
import org.apache.myfaces.config.RuntimeConfig;
import org.apache.myfaces.test.mock.MockFacesContext;
-import org.apache.myfaces.test.mock.MockFacesContext12;
import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
/**
* @author Mathias Broekelmann (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public class ApplicationImplTest extends TestCase
+public class ApplicationImplTest
{
//TODO: need mock objects for VDL/VDLFactory
//remove from excludes list in pom.xml after complete
@@ -60,6 +60,7 @@ public class ApplicationImplTest extends TestCase
protected ApplicationImpl application;
protected MockFacesContext facesContext;
+ @Before
public void setUp() throws Exception
{
application = new ApplicationImpl(new RuntimeConfig());
@@ -70,6 +71,7 @@ public class ApplicationImplTest extends TestCase
* Test method for
* {@link org.apache.myfaces.application.ApplicationImpl#getResourceBundle(jakarta.faces.context.FacesContext, java.lang.String)}.
*/
+ @Test
public void testGetResourceBundleNPE()
{
MyFacesAsserts.assertException(NullPointerException.class, new TestRunner()
@@ -95,6 +97,7 @@ public class ApplicationImplTest extends TestCase
* Test method for
* {@link org.apache.myfaces.application.ApplicationImpl#getResourceBundle(jakarta.faces.context.FacesContext, java.lang.String)}.
*/
+ @Test
public void testGetResourceBundleFacesException()
{
final ApplicationImpl myApp = new ApplicationImpl(new RuntimeConfig())
@@ -118,6 +121,7 @@ public class ApplicationImplTest extends TestCase
* Test method for
* {@link org.apache.myfaces.application.ApplicationImpl#getResourceBundle(jakarta.faces.context.FacesContext, java.lang.String)}.
*/
+ @Test
public void testGetResourceBundleWithDefaultLocale()
{
assertGetResourceBundleWithLocale(Locale.getDefault());
@@ -127,6 +131,7 @@ public class ApplicationImplTest extends TestCase
* Test method for
* {@link org.apache.myfaces.application.ApplicationImpl#getResourceBundle(jakarta.faces.context.FacesContext, java.lang.String)}.
*/
+ @Test
public void testGetResourceBundleWithUIViewRootLocale()
{
Locale locale = new Locale("xx");
@@ -136,6 +141,7 @@ public class ApplicationImplTest extends TestCase
assertGetResourceBundleWithLocale(locale);
}
+ @Test
public void testCreateComponentCallSetValueOnExpressionIfValueNull() throws Exception
{
ValueExpression expr = createMock(ValueExpression.class);
@@ -150,6 +156,7 @@ public class ApplicationImplTest extends TestCase
Assert.assertTrue(UIOutput.class.isAssignableFrom(application.createComponent(expr, context, "testComponent").getClass()));
}
+ @Test
public void testCreateComponentExpressionFacesExceptionTest() throws Exception
{
ValueExpression expr = createMock(ValueExpression.class);
@@ -203,7 +210,7 @@ public class ApplicationImplTest extends TestCase
return bundle;
}
};
- assertSame(bundle, myapp.getResourceBundle(facesContext, var));
+ Assert.assertSame(bundle, myapp.getResourceBundle(facesContext, var));
}
private enum MyEnum {VALUE1, VALUE2};
@@ -212,6 +219,7 @@ public class ApplicationImplTest extends TestCase
* Test method for
* {@link jakarta.faces.application.Application#createConverter(java.lang.Class)}.
*/
+ @Test
public void testCreateEnumConverter() throws Exception
{
application.addConverter(Enum.class, EnumConverter.class.getName());
@@ -257,13 +265,14 @@ public class ApplicationImplTest extends TestCase
* The interface should take precedence over the fact that our object is also
* an enum.
*/
+ @Test
public void testCreateConverterForInterface() throws Exception
{
application.addConverter(Enum.class, EnumConverter.class.getName());
application.addConverter(EnumCoded.class, EnumCodedTestConverter.class.getName());
Converter converter = application.createConverter(AnotherEnum.class);
- assertNotNull(converter);
+ Assert.assertNotNull(converter);
Assert.assertEquals(converter.getClass(), EnumCodedTestConverter.class);
}
}
diff --git a/impl/src/test/java/org/apache/myfaces/config/impl/digister/FacesConfigUnmarshallerImplTest.java b/impl/src/test/java/org/apache/myfaces/config/impl/digister/FacesConfigUnmarshallerImplTest.java
index 940da9f34..8a6b005f7 100644
--- a/impl/src/test/java/org/apache/myfaces/config/impl/digister/FacesConfigUnmarshallerImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/config/impl/digister/FacesConfigUnmarshallerImplTest.java
@@ -28,20 +28,24 @@ import org.apache.myfaces.config.element.LocaleConfig;
import org.apache.myfaces.config.element.OrderSlot;
import org.apache.myfaces.config.impl.element.ConfigOthersSlotImpl;
import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
/**
* @author Mathias Broekelmann (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public class FacesConfigUnmarshallerImplTest extends TestCase
+public class FacesConfigUnmarshallerImplTest
{
private FacesConfigUnmarshallerImpl _impl;
+ @Before
public void setUp() throws Exception
{
_impl = new FacesConfigUnmarshallerImpl(null);
}
+ @Test
public void testEmptyConfig() throws Exception
{
FacesConfig cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
@@ -57,6 +61,7 @@ public class FacesConfigUnmarshallerImplTest extends TestCase
Assert.assertTrue(cfg.getValidators().isEmpty());
}
+ @Test
public void testApplicationConfig() throws Exception
{
FacesConfig cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
@@ -108,6 +113,7 @@ public class FacesConfigUnmarshallerImplTest extends TestCase
Assert.assertEquals("bb", cfg.getSupportedLocales().get(1));
}
+ @Test
public void testAbsoluteOrderingConfig() throws Exception
{
FacesConfig cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
@@ -133,6 +139,7 @@ public class FacesConfigUnmarshallerImplTest extends TestCase
Assert.assertTrue(cfg.getValidators().isEmpty());
}
+ @Test
public void testOrderingConfig() throws Exception
{
FacesConfig cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
@@ -158,6 +165,7 @@ public class FacesConfigUnmarshallerImplTest extends TestCase
Assert.assertTrue(cfg.getValidators().isEmpty());
}
+ @Test
public void testFacesFlowConfig() throws Exception
{/*
FacesConfig cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
@@ -227,6 +235,7 @@ public class FacesConfigUnmarshallerImplTest extends TestCase
Assert.assertEquals("value1", facesFlowParameter.getValue());*/
}
+ @Test
public void testCsrf() throws Exception
{
FacesConfig cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
@@ -240,6 +249,7 @@ public class FacesConfigUnmarshallerImplTest extends TestCase
}
+ @Test
public void testContracts() throws Exception
{
FacesConfig cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
@@ -256,6 +266,7 @@ public class FacesConfigUnmarshallerImplTest extends TestCase
Assert.assertEquals("contractA contractB", mapping.getContractList().get(0));
}
+ @Test
public void testContracts2() throws Exception
{
FacesConfig cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
diff --git a/impl/src/test/java/org/apache/myfaces/context/ContextRegexpTest.java b/impl/src/test/java/org/apache/myfaces/context/ContextRegexpTest.java
index d586841e5..b26ea0695 100644
--- a/impl/src/test/java/org/apache/myfaces/context/ContextRegexpTest.java
+++ b/impl/src/test/java/org/apache/myfaces/context/ContextRegexpTest.java
@@ -15,8 +15,8 @@
*/
package org.apache.myfaces.context;
-import junit.framework.TestCase;
import org.junit.Assert;
+import org.junit.Test;
/**
* Regular Expression tests used within the faces context submodules
@@ -24,7 +24,7 @@ import org.junit.Assert;
* @author Werner Punz(latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public class ContextRegexpTest extends TestCase {
+public class ContextRegexpTest {
static final String RE_SPLITTER = "[\\s\\t\\r\\n]*\\,[\\s\\t\\r\\n]*";
@@ -35,6 +35,7 @@ public class ContextRegexpTest extends TestCase {
/**
* condition valid string
*/
+ @Test
public void testCondition1() {
String[] splitted = " hello ,world \n ,bla ".split(RE_SPLITTER);
splitted[0] = splitted[0].trim();
@@ -52,6 +53,7 @@ public class ContextRegexpTest extends TestCase {
* test the condition 2
* empty string
*/
+ @Test
public void testCondition2() {
String[] splitted = " ".split(RE_SPLITTER);
Assert.assertTrue(splitted.length == 1);
@@ -62,6 +64,7 @@ public class ContextRegexpTest extends TestCase {
* test the condition 3
* empty string no blanks
*/
+ @Test
public void testCondition3() {
String[] splitted = "".split(RE_SPLITTER);
Assert.assertTrue(splitted.length == 1);
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AjaxBehaviorRenderTestCase.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AjaxBehaviorRenderTestCase.java
index e8d8c5675..0f6ac128d 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AjaxBehaviorRenderTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AjaxBehaviorRenderTestCase.java
@@ -25,6 +25,7 @@ import jakarta.faces.component.UIViewRoot;
import org.apache.myfaces.test.mock.MockResponseWriter;
import org.apache.myfaces.view.facelets.FaceletTestCase;
+import org.junit.Assert;
import org.junit.Test;
public class AjaxBehaviorRenderTestCase extends FaceletTestCase {
@@ -48,8 +49,8 @@ public class AjaxBehaviorRenderTestCase extends FaceletTestCase {
sw.flush();
String response = sw.toString();
- assertFalse(response.contains("faces.util.chain"));
- assertFalse(response.contains("myfaces.ab"));
+ Assert.assertFalse(response.contains("faces.util.chain"));
+ Assert.assertFalse(response.contains("myfaces.ab"));
}
@Test
@@ -64,8 +65,8 @@ public class AjaxBehaviorRenderTestCase extends FaceletTestCase {
sw.flush();
String response = sw.toString();
- assertTrue(response.contains("myfaces.ab"));
- assertEquals(countMatches(response, "myfaces.ab"), 1);
+ Assert.assertTrue(response.contains("myfaces.ab"));
+ Assert.assertEquals(countMatches(response, "myfaces.ab"), 1);
}
@Test
@@ -80,8 +81,8 @@ public class AjaxBehaviorRenderTestCase extends FaceletTestCase {
sw.flush();
String response = sw.toString();
- assertTrue(response.contains("myfaces.ab"));
- assertEquals(countMatches(response, "myfaces.ab"), 1);
+ Assert.assertTrue(response.contains("myfaces.ab"));
+ Assert.assertEquals(countMatches(response, "myfaces.ab"), 1);
}
@Test
@@ -96,9 +97,9 @@ public class AjaxBehaviorRenderTestCase extends FaceletTestCase {
sw.flush();
String response = sw.toString();
- assertTrue(response.contains("myfaces.ab"));
- assertEquals(countMatches(response, "faces.util.chain"), 1);
- assertEquals(countMatches(response, "myfaces.ab"), 2);
+ Assert.assertTrue(response.contains("myfaces.ab"));
+ Assert.assertEquals(countMatches(response, "faces.util.chain"), 1);
+ Assert.assertEquals(countMatches(response, "myfaces.ab"), 2);
}
@Test
@@ -113,8 +114,8 @@ public class AjaxBehaviorRenderTestCase extends FaceletTestCase {
sw.flush();
String response = sw.toString();
- assertFalse(response.contains("myfaces.ab"));
- assertFalse(response.contains("faces.util.chain"));
+ Assert.assertFalse(response.contains("myfaces.ab"));
+ Assert.assertFalse(response.contains("faces.util.chain"));
}
@Test
@@ -129,7 +130,7 @@ public class AjaxBehaviorRenderTestCase extends FaceletTestCase {
sw.flush();
String response = sw.toString();
- assertTrue(response.contains("myfaces.ab"));
+ Assert.assertTrue(response.contains("myfaces.ab"));
}
@Test
@@ -144,10 +145,10 @@ public class AjaxBehaviorRenderTestCase extends FaceletTestCase {
sw.flush();
String response = sw.toString();
- assertTrue(response.contains("myfaces.ab"));
- assertTrue(response.contains("faces.util.chain"));
- assertEquals(countMatches(response, "faces.util.chain"), 1);
- assertEquals(countMatches(response, "myfaces.ab"), 2);
+ Assert.assertTrue(response.contains("myfaces.ab"));
+ Assert.assertTrue(response.contains("faces.util.chain"));
+ Assert.assertEquals(countMatches(response, "faces.util.chain"), 1);
+ Assert.assertEquals(countMatches(response, "myfaces.ab"), 2);
}
public int countMatches(String all, String search)
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderTest.java
index f818e2473..22a36e917 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderTest.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockFacesContext;
import org.junit.Assert;
+import org.junit.Test;
/**
* <code>HTMLEncoderTest</code> tests <code>org.apache.myfaces.shared.renderkit.html.util.HTMLEncoder</code>.
@@ -46,41 +47,49 @@ public class HTMLEncoderTest extends AbstractJsfTestCase {
* Test method for
* {@link org.apache.myfaces.shared.renderkit.html.util.HTMLEncoder#encode(String)}.
*/
+ @Test
public void testEncodeStringNoSpecialChars() {
String encodedStr = HTMLEncoder.encode(new MockFacesContext(), stringNoSpecialChars);
Assert.assertEquals(stringNoSpecialCharsEncoded, encodedStr);
}
+ @Test
public void testEncodeStringSpecialChars1() {
String encodedStr = HTMLEncoder.encode(new MockFacesContext(), stringSpecialChars1);
Assert.assertEquals(stringSpecialChars1Encoded, encodedStr);
}
+ @Test
public void testEncodeStringSpecialChars2() {
String encodedStr = HTMLEncoder.encode(new MockFacesContext(), stringSpecialChars2);
Assert.assertEquals(stringSpecialChars2Encoded, encodedStr);
}
+ @Test
public void testEncodeStringLineBreak1() {
String encodedStr = HTMLEncoder.encode(new MockFacesContext(), stringLineBreak, true);
Assert.assertEquals(stringLineBreakEncoded1, encodedStr);
}
+ @Test
public void testEncodeStringLineBreak2() {
String encodedStr = HTMLEncoder.encode(new MockFacesContext(), stringLineBreak, false);
Assert.assertEquals(stringLineBreakEncoded2, encodedStr);
}
+ @Test
public void testEncodeStringEmpty() {
String encodedStr = HTMLEncoder.encode(new MockFacesContext(), "");
Assert.assertEquals("", encodedStr);
}
+ @Test
public void testEncodeStringNull() {
String encodedStr = HTMLEncoder.encode(new MockFacesContext(), null);
Assert.assertEquals("", encodedStr);
}
+ @Test
public void testEncodeArrayNoSpecialChars() {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -92,6 +101,7 @@ public class HTMLEncoderTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testEncodeArrayNoSpecialCharsPartial() {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -103,6 +113,7 @@ public class HTMLEncoderTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testEncodeArraySpecialChars1() {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -114,6 +125,7 @@ public class HTMLEncoderTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testEncodeArraySpecialChars2() {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -125,6 +137,7 @@ public class HTMLEncoderTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testEncodeArrayEmpty() {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -135,6 +148,7 @@ public class HTMLEncoderTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testEncodeArrayNull() {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -145,6 +159,7 @@ public class HTMLEncoderTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testEncodeArrayWrongIndex1() {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -156,6 +171,7 @@ public class HTMLEncoderTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testEncodeArrayWrongIndex2() {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -167,6 +183,7 @@ public class HTMLEncoderTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testEncodeArrayWrongIndex3() {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -178,6 +195,7 @@ public class HTMLEncoderTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testEncodeArrayLineBreak1() {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -189,6 +207,7 @@ public class HTMLEncoderTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testEncodeArrayLineBreak2() {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -200,6 +219,7 @@ public class HTMLEncoderTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testEncodeArrayLineBreak2WrongIndex() {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -211,6 +231,7 @@ public class HTMLEncoderTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testEncodeArrayLineBreakPartial() {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -223,6 +244,7 @@ public class HTMLEncoderTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testSimpleWriteURIAttribute() throws Exception
{
String cad1 = "http://myfaces.apache.org/hello.jsf?key1=val&key2=val2#id";
@@ -231,6 +253,7 @@ public class HTMLEncoderTest extends AbstractJsfTestCase {
Assert.assertEquals(cad2, cad3);
}
+ @Test
public void testUsAsciiEscapedCharactersBeforeQuery() throws Exception
{
// Escape
@@ -253,6 +276,7 @@ public class HTMLEncoderTest extends AbstractJsfTestCase {
}
+ @Test
public void testUsAsciiEscapedCharactersBeforeQueryLowerCase() throws Exception
{
// Escape
@@ -274,6 +298,7 @@ public class HTMLEncoderTest extends AbstractJsfTestCase {
}
+ @Test
public void testWriteNonUsAsciiOnURIAttribute() throws Exception
{
// Character ü in ISO-8859-1 is %FC but on UTF-8 is %C3%BC. In this case,
@@ -286,6 +311,7 @@ public class HTMLEncoderTest extends AbstractJsfTestCase {
}
+ @Test
public void testReservedCharactersOnURIAttribute() throws Exception
{
//Reserved
@@ -305,6 +331,7 @@ public class HTMLEncoderTest extends AbstractJsfTestCase {
Assert.assertEquals(cad7, cad8);
}
+ @Test
public void testNonEncodedCharactersOnURIAttribute() throws Exception
{
// "... for consistency, percent-encoded octets in the ranges of ALPHA
@@ -324,6 +351,7 @@ public class HTMLEncoderTest extends AbstractJsfTestCase {
Assert.assertEquals(cad5, cad6);
}
+ @Test
public void testWriteURIAttribute() throws Exception
{
//Note char 256 or 0x100 should not be passed or percent encoded, because it is not
@@ -357,7 +385,7 @@ public class HTMLEncoderTest extends AbstractJsfTestCase {
Assert.fail();
}
for (int i = 0; i < expected.length; i++) {
- assertEquals(expected[i], actual[i]);
+ Assert.assertEquals(expected[i], actual[i]);
}
}
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderWriterTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderWriterTest.java
index 461595618..5bb3054cf 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderWriterTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderWriterTest.java
@@ -16,13 +16,13 @@
package org.apache.myfaces.renderkit.html.util;
-import org.apache.myfaces.renderkit.html.util.HTMLEncoder;
import java.io.CharArrayWriter;
import java.io.IOException;
import java.io.StringWriter;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.junit.Assert;
+import org.junit.Test;
/**
* <code>HTMLEncoderTest</code> tests <code>org.apache.myfaces.shared.renderkit.html.util.HTMLEncoder</code>.
@@ -60,41 +60,49 @@ public class HTMLEncoderWriterTest extends AbstractJsfTestCase {
* Test method for
* {@link org.apache.myfaces.shared.renderkit.html.util.HTMLEncoder#encode(String)}.
*/
+ @Test
public void testEncodeStringNoSpecialChars() throws Exception {
HTMLEncoder.encode(sw, stringNoSpecialChars);
Assert.assertEquals(stringNoSpecialCharsEncoded, sw.toString());
}
+ @Test
public void testEncodeStringSpecialChars1() throws Exception {
HTMLEncoder.encode(sw, stringSpecialChars1);
Assert.assertEquals(stringSpecialChars1Encoded, sw.toString());
}
+ @Test
public void testEncodeStringSpecialChars2() throws Exception {
HTMLEncoder.encode(sw, stringSpecialChars2);
Assert.assertEquals(stringSpecialChars2Encoded, sw.toString());
}
+ @Test
public void testEncodeStringLineBreak1() throws Exception {
HTMLEncoder.encode(sw, stringLineBreak, true);
Assert.assertEquals(stringLineBreakEncoded1, sw.toString());
}
+ @Test
public void testEncodeStringLineBreak2() throws Exception {
HTMLEncoder.encode(sw, stringLineBreak, false);
Assert.assertEquals(stringLineBreakEncoded2, sw.toString());
}
+ @Test
public void testEncodeStringEmpty() throws Exception {
HTMLEncoder.encode(sw, "");
Assert.assertEquals("", sw.toString());
}
+ @Test
public void testEncodeStringNull() throws Exception {
HTMLEncoder.encode(sw, null);
Assert.assertEquals("", sw.toString());
}
+ @Test
public void testEncodeArrayNoSpecialChars() throws Exception {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -106,6 +114,7 @@ public class HTMLEncoderWriterTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testEncodeArrayNoSpecialCharsPartial() throws Exception {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -117,6 +126,7 @@ public class HTMLEncoderWriterTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testEncodeArraySpecialChars1() throws Exception {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -128,6 +138,7 @@ public class HTMLEncoderWriterTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testEncodeArraySpecialChars2() throws Exception {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -139,6 +150,7 @@ public class HTMLEncoderWriterTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testEncodeArrayEmpty() throws Exception {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -149,6 +161,7 @@ public class HTMLEncoderWriterTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testEncodeArrayNull() throws Exception {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -159,6 +172,7 @@ public class HTMLEncoderWriterTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testEncodeArrayWrongIndex1() throws Exception {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -170,6 +184,7 @@ public class HTMLEncoderWriterTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testEncodeArrayWrongIndex2() throws Exception {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -181,6 +196,7 @@ public class HTMLEncoderWriterTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testEncodeArrayWrongIndex3() throws Exception {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -192,6 +208,7 @@ public class HTMLEncoderWriterTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testEncodeArrayLineBreak1() throws Exception {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -203,6 +220,7 @@ public class HTMLEncoderWriterTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testEncodeArrayLineBreak2() throws Exception {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -214,6 +232,7 @@ public class HTMLEncoderWriterTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testEncodeArrayLineBreak2WrongIndex() throws Exception {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -225,6 +244,7 @@ public class HTMLEncoderWriterTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testEncodeArrayLineBreakPartial() throws Exception {
try {
CharArrayWriter writer = new CharArrayWriter();
@@ -237,6 +257,7 @@ public class HTMLEncoderWriterTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testSimpleWriteURIAttribute() throws Exception
{
String cad1 = "http://myfaces.apache.org/hello.jsf?key1=val&key2=val2#id";
@@ -246,6 +267,7 @@ public class HTMLEncoderWriterTest extends AbstractJsfTestCase {
Assert.assertEquals(cad2, cad3);
}
+ @Test
public void testUsAsciiEscapedCharactersBeforeQuery() throws Exception
{
// Escape
@@ -271,6 +293,7 @@ public class HTMLEncoderWriterTest extends AbstractJsfTestCase {
}
+ @Test
public void testWriteNonUsAsciiOnURIAttribute() throws Exception
{
// Character ü in ISO-8859-1 is %FC but on UTF-8 is %C3%BC. In this case,
@@ -284,6 +307,7 @@ public class HTMLEncoderWriterTest extends AbstractJsfTestCase {
}
+ @Test
public void testReservedCharactersOnURIAttribute() throws Exception
{
//Reserved
@@ -306,6 +330,7 @@ public class HTMLEncoderWriterTest extends AbstractJsfTestCase {
Assert.assertEquals(cad7, cad8);
}
+ @Test
public void testNonEncodedCharactersOnURIAttribute() throws Exception
{
// "... for consistency, percent-encoded octets in the ranges of ALPHA
@@ -330,6 +355,7 @@ public class HTMLEncoderWriterTest extends AbstractJsfTestCase {
Assert.assertEquals(cad5, cad6);
}
+ @Test
public void testWriteURIAttribute() throws Exception
{
//Note char 256 or 0x100 should not be passed or percent encoded, because it is not
@@ -366,7 +392,7 @@ public class HTMLEncoderWriterTest extends AbstractJsfTestCase {
Assert.fail();
}
for (int i = 0; i < expected.length; i++) {
- assertEquals(expected[i], actual[i]);
+ Assert.assertEquals(expected[i], actual[i]);
}
}
}
\ No newline at end of file