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:51 UTC
[myfaces] 01/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 d062420df7a48f6ea7aa017d0f1308c417e33217
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Mon Feb 6 11:58:12 2023 +0100
MYFACES-4408 - Junit4 style
---
.../faces/application/FacesMessageTest.java | 31 +++++++------
.../faces/application/StateManagerTest.java | 21 +++------
.../jakarta/faces/application/ViewHandlerTest.java | 15 ++++--
.../faces/component/InvokeOnComponentTest.java | 8 ++++
.../faces/component/UIComponentAttributesTest.java | 2 +
.../component/UIComponentBaseGetChildrenTest.java | 12 +++--
.../component/UIComponentBaseGetClientIdTest.java | 8 ++++
.../UIComponentEventListenerWrapperTest.java | 38 ++++++++++++++--
.../component/UIComponentFindComponentTest.java | 11 ++++-
.../UIComponentInvokeOnComponentTest.java | 3 ++
.../java/jakarta/faces/component/UIDataTest.java | 53 +++++++++++++++++++++-
.../jakarta/faces/component/UIGraphicTest.java | 1 -
.../java/jakarta/faces/component/UIInputTest.java | 27 ++++++++++-
.../jakarta/faces/component/UISelectItemsTest.java | 3 ++
.../faces/component/UIViewParameterTest.java | 3 ++
.../faces/component/_Delta2StateHelperTest.java | 36 +++++++++------
.../component/_DeltaFacesListenerListTest.java | 32 +++++++------
.../jakarta/faces/component/_DeltaListTest.java | 33 +++++++++-----
.../faces/component/_SharedRendererUtilsTest.java | 9 ++++
.../faces/convert/DateTimeConverterTest.java | 2 +
.../jakarta/faces/convert/EnumConverterTest.java | 9 ++++
.../jakarta/faces/convert/MessageUtilsTest.java | 4 ++
.../event/MethodExpressionActionListenerTest.java | 8 ++++
.../MethodExpressionValueChangeListenerTest.java | 10 ++++
.../jakarta/faces/validator/_MessageUtilsTest.java | 2 -
.../application/ApplicationImplJsfTest.java | 2 +
.../application/ClientBehaviorTestCase.java | 1 +
.../myfaces/application/ViewIdSupportMockTest.java | 7 ++-
.../viewstate/AbstractStateUtilsTest.java | 21 ++++++---
.../viewstate/InitVector_CBCTestCase.java | 4 ++
.../application/viewstate/SecretKeyCacheTest.java | 5 ++
.../config/FacesConfigValidatorTestCase.java | 2 +
.../myfaces/config/LogMetaInfUtilsTestCase.java | 2 +
.../myfaces/config/OrderingFacesConfigTest.java | 12 +++++
.../myfaces/context/ExecutePhaseClientIdsTest.java | 5 ++
.../org/apache/myfaces/context/IsRenderedTest.java | 2 +
.../context/PartialResponseWriterImplTest.java | 20 ++++++--
.../myfaces/context/RenderPhaseClientIdsTest.java | 5 ++
.../myfaces/context/ResponseWrapperSwitchTest.java | 2 +
.../apache/myfaces/context/TestIsAjaxRequest.java | 8 ++--
.../myfaces/lifecycle/RestoreViewExecutorTest.java | 2 +
.../myfaces/renderkit/ErrorPageWriterTest.java | 3 ++
.../myfaces/renderkit/RendererUtilsTest.java | 4 ++
.../html/ClientBehaviorRendererUtilsTest.java | 5 ++
.../renderkit/html/HtmlBodyRendererTest.java | 4 ++
.../renderkit/html/HtmlButtonRendererTest.java | 10 ++--
.../renderkit/html/HtmlCheckboxRendererTest.java | 10 ++--
.../renderkit/html/HtmlDoctypeRendererTest.java | 3 ++
.../renderkit/html/HtmlEscapeRendererTest.java | 12 +++--
.../renderkit/html/HtmlFormRendererTest.java | 9 ++--
.../renderkit/html/HtmlFormatRendererTest.java | 14 +++---
.../renderkit/html/HtmlGridRendererTest.java | 10 ++--
.../renderkit/html/HtmlGroupRendererTest.java | 11 +++--
.../renderkit/html/HtmlHeadRendererTest.java | 7 +--
.../renderkit/html/HtmlImageRendererTest.java | 10 ++--
.../renderkit/html/HtmlLabelRendererTest.java | 2 +
.../renderkit/html/HtmlLinkRendererTest.java | 18 ++++++--
.../renderkit/html/HtmlListboxRendererTest.java | 8 ++--
.../renderkit/html/HtmlMenuRendererTest.java | 8 ++--
.../renderkit/html/HtmlMessageRendererTest.java | 6 +--
.../html/HtmlOutcomeTargetButtonRendererTest.java | 10 ++--
.../renderkit/html/HtmlRadioRendererTest.java | 6 +--
.../html/HtmlResponseStateManagerTest.java | 1 -
.../renderkit/html/HtmlResponseWriterImplTest.java | 14 ++++++
.../renderkit/html/HtmlSecretRendererTest.java | 7 +--
.../renderkit/html/HtmlTableRendererTest.java | 8 ++--
.../renderkit/html/HtmlTextRendererTest.java | 13 ++++--
.../renderkit/html/HtmlTextareaRendererTest.java | 8 ++--
.../HtmlBodyClientBehaviorRendererTest.java | 2 +
...lectManyCheckboxClientBehaviorRendererTest.java | 2 +
...mlSelectOneRadioClientBehaviorRendererTest.java | 2 +
.../renderkit/html/util/UnicodeEncoderTest.java | 1 -
.../myfaces/renderkits/OwnRenderkitTest.java | 2 +
.../org/apache/myfaces/test/FacesTestCase.java | 7 ++-
.../org/apache/myfaces/util/CommentUtilsTest.java | 1 -
.../org/apache/myfaces/util/MessageUtilsTest.java | 12 +++++
.../view/facelets/component/UIRepeatTest.java | 1 +
.../junit/AbstractJsfConfigurableMockTestCase.java | 3 +-
...actJsfConfigurableMultipleRequestsTestCase.java | 3 +-
.../test/base/junit/AbstractJsfTestCase.java | 3 +-
80 files changed, 560 insertions(+), 181 deletions(-)
diff --git a/impl/src/test/java/jakarta/faces/application/FacesMessageTest.java b/impl/src/test/java/jakarta/faces/application/FacesMessageTest.java
index 3b6aa47be..b04f56129 100644
--- a/impl/src/test/java/jakarta/faces/application/FacesMessageTest.java
+++ b/impl/src/test/java/jakarta/faces/application/FacesMessageTest.java
@@ -19,7 +19,6 @@
package jakarta.faces.application;
-import jakarta.faces.application.FacesMessage;
import junit.framework.TestCase;
import jakarta.faces.application.FacesMessage.Severity;
@@ -29,24 +28,15 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.Map;
import org.junit.Assert;
+import org.junit.Test;
-public class FacesMessageTest extends TestCase
+public class FacesMessageTest
{
- @Override
- public void setUp() throws Exception
- {
- super.setUp();
- }
-
- @Override
- public void tearDown() throws Exception
- {
- super.tearDown();
- }
/*
* Test method for 'jakarta.faces.application.FacesMessage.FacesMessage()'
*/
+ @Test
public void testFacesMessage()
{
FacesMessage msg = new FacesMessage();
@@ -58,6 +48,7 @@ public class FacesMessageTest extends TestCase
/*
* Test method for 'jakarta.faces.application.FacesMessage.FacesMessage(String)'
*/
+ @Test
public void testFacesMessageString()
{
String summary = "summary";
@@ -70,6 +61,7 @@ public class FacesMessageTest extends TestCase
/*
* Test method for 'jakarta.faces.application.FacesMessage.FacesMessage(String, String)'
*/
+ @Test
public void testFacesMessageStringString()
{
String summary = "summary";
@@ -83,6 +75,7 @@ public class FacesMessageTest extends TestCase
/*
* Test method for 'jakarta.faces.application.FacesMessage.FacesMessage(Severity, String, String)'
*/
+ @Test
public void testFacesMessageSeverityStringString()
{
String summary = "summary";
@@ -96,6 +89,7 @@ public class FacesMessageTest extends TestCase
/*
* Test method for 'jakarta.faces.application.FacesMessage.FacesMessage(Severity, String, String)'
*/
+ @Test
public void testFacesMessageNullSeverityStringString()
{
String summary = "summary";
@@ -113,6 +107,7 @@ public class FacesMessageTest extends TestCase
/*
* Test method for 'jakarta.faces.application.FacesMessage.setSeverity(Severity)'
*/
+ @Test
public void testSetSeverity()
{
FacesMessage msg = new FacesMessage();
@@ -124,6 +119,7 @@ public class FacesMessageTest extends TestCase
/*
* Test method for 'jakarta.faces.application.FacesMessage.setSeverity(Severity)'
*/
+ @Test
public void testSetNullSeverity()
{
FacesMessage msg = new FacesMessage();
@@ -140,6 +136,7 @@ public class FacesMessageTest extends TestCase
/*
* Test method for 'jakarta.faces.application.FacesMessage.setSummary(String)'
*/
+ @Test
public void testSetSummary()
{
FacesMessage msg = new FacesMessage();
@@ -152,6 +149,7 @@ public class FacesMessageTest extends TestCase
/*
* Test method for 'jakarta.faces.application.FacesMessage.setDetail(String)'
*/
+ @Test
public void testSetDetail()
{
FacesMessage msg = new FacesMessage();
@@ -161,6 +159,7 @@ public class FacesMessageTest extends TestCase
Assert.assertEquals(msg.getDetail(), detail);
}
+ @Test
public void testSeverityOrdering()
{
// make sure they are ordered correctly from least to worst
@@ -173,6 +172,7 @@ public class FacesMessageTest extends TestCase
Assert.assertTrue(0 < FacesMessage.SEVERITY_WARN.compareTo(FacesMessage.SEVERITY_INFO));
}
+ @Test
public void testSeverityEquality()
{
// make sure they all respond as equals when they should
@@ -182,6 +182,7 @@ public class FacesMessageTest extends TestCase
Assert.assertEquals(0, FacesMessage.SEVERITY_FATAL.compareTo(FacesMessage.SEVERITY_FATAL));
}
+ @Test
public void testSeverityValues()
{
// Faces spec requires this list to be sorted by ordinal
@@ -193,6 +194,7 @@ public class FacesMessageTest extends TestCase
}
@SuppressWarnings("unchecked")
+ @Test
public void testSeverityValuesMap()
{
Map<String, FacesMessage.Severity> severityMap = (Map<String, FacesMessage.Severity>) FacesMessage.VALUES_MAP;
@@ -203,6 +205,7 @@ public class FacesMessageTest extends TestCase
}
}
+ @Test
public void testSerialization() throws Exception
{
String summary = "summary";
@@ -226,7 +229,7 @@ public class FacesMessageTest extends TestCase
FacesMessage deserialized = (FacesMessage) in.readObject();
// FacesMessage properties must equal!
- assertSame(msg.getSeverity(), deserialized.getSeverity());
+ Assert.assertSame(msg.getSeverity(), deserialized.getSeverity());
Assert.assertEquals(msg.getSummary(), deserialized.getSummary());
Assert.assertEquals(msg.getDetail(), deserialized.getDetail());
Assert.assertEquals(msg.isRendered(), deserialized.isRendered());
diff --git a/impl/src/test/java/jakarta/faces/application/StateManagerTest.java b/impl/src/test/java/jakarta/faces/application/StateManagerTest.java
index d44e51872..cdd876b40 100644
--- a/impl/src/test/java/jakarta/faces/application/StateManagerTest.java
+++ b/impl/src/test/java/jakarta/faces/application/StateManagerTest.java
@@ -19,7 +19,6 @@
package jakarta.faces.application;
-import jakarta.faces.application.StateManager;
import jakarta.faces.context.ExternalContext;
import jakarta.faces.context.FacesContext;
@@ -29,24 +28,14 @@ import org.apache.myfaces.test.mock.MockStateManager;
import org.easymock.MockControl;
import org.easymock.classextension.MockClassControl;
import org.junit.Assert;
+import org.junit.Test;
-public class StateManagerTest extends TestCase
+public class StateManagerTest
{
- @Override
- public void setUp() throws Exception
- {
- super.setUp();
- }
-
- @Override
- public void tearDown() throws Exception
- {
- super.tearDown();
- }
-
/*
* Test method for 'jakarta.faces.application.StateManager.isSavingStateInClient(FacesContext)'
*/
+ @Test
public void testNullThrowsIsSavingStateInClient()
{
MockStateManager subject = new MockStateManager();
@@ -63,6 +52,7 @@ public class StateManagerTest extends TestCase
/*
* Test method for 'jakarta.faces.application.StateManager.isSavingStateInClient(FacesContext)'
*/
+ @Test
public void testIsSavingStateInClientTrue()
{
MockControl contextControl = MockClassControl.createControl(FacesContext.class);
@@ -83,6 +73,7 @@ public class StateManagerTest extends TestCase
/*
* Test method for 'jakarta.faces.application.StateManager.isSavingStateInClient(FacesContext)'
*/
+ @Test
public void testIsSavingStateInClientFalse()
{
MockControl contextControl = MockClassControl.createControl(FacesContext.class);
@@ -105,6 +96,7 @@ public class StateManagerTest extends TestCase
/*
* Test method for 'jakarta.faces.application.StateManager.isSavingStateInClient(FacesContext)'
*/
+ @Test
public void testIsSavingStateInClientBogus()
{
MockControl contextControl = MockClassControl.createControl(FacesContext.class);
@@ -129,6 +121,7 @@ public class StateManagerTest extends TestCase
/*
* Test method for 'jakarta.faces.application.StateManager.isSavingStateInClient(FacesContext)'
*/
+ @Test
public void testIsSavingStateInClientNull()
{
MockControl contextControl = MockClassControl.createControl(FacesContext.class);
diff --git a/impl/src/test/java/jakarta/faces/application/ViewHandlerTest.java b/impl/src/test/java/jakarta/faces/application/ViewHandlerTest.java
index 9798a6566..e96d79187 100644
--- a/impl/src/test/java/jakarta/faces/application/ViewHandlerTest.java
+++ b/impl/src/test/java/jakarta/faces/application/ViewHandlerTest.java
@@ -33,23 +33,23 @@ import jakarta.faces.component.UIViewRoot;
import jakarta.faces.context.ExternalContext;
import jakarta.faces.context.FacesContext;
-import junit.framework.TestCase;
-
import org.apache.myfaces.test.MyFacesAsserts;
import org.apache.myfaces.test.TestRunner;
import org.apache.myfaces.test.mock.MockFacesContext;
import org.easymock.classextension.EasyMock;
import org.easymock.classextension.IMocksControl;
import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
-public class ViewHandlerTest extends TestCase
+public class ViewHandlerTest
{
private MockFacesContext _facesContext;
private IMocksControl _mocksControl;
private ExternalContext _externalContext;
private TestViewHandler _testimpl;
- @Override
+ @Before
public void setUp() throws Exception
{
_mocksControl = EasyMock.createControl();
@@ -63,6 +63,7 @@ public class ViewHandlerTest extends TestCase
* {@link jakarta.faces.application.ViewHandler#calculateCharacterEncoding(jakarta.faces.context.FacesContext)}.
*/
@SuppressWarnings("unchecked")
+ @Test
public void testCalculateCharacterEncodingWithRequestHeaderContentType()
{
Map<String, String> map = _mocksControl.createMock(Map.class);
@@ -77,6 +78,7 @@ public class ViewHandlerTest extends TestCase
* Test method for
* {@link jakarta.faces.application.ViewHandler#calculateCharacterEncoding(jakarta.faces.context.FacesContext)}.
*/
+ @Test
public void testCalculateCharacterEncodingWithNoRequestContentTypeAndNoSession()
{
Map<String, String> emptyMap = Collections.emptyMap();
@@ -92,6 +94,7 @@ public class ViewHandlerTest extends TestCase
* Test method for
* {@link jakarta.faces.application.ViewHandler#calculateCharacterEncoding(jakarta.faces.context.FacesContext)}.
*/
+ @Test
@SuppressWarnings("unchecked")
public void testCalculateCharacterEncodingWithNoRequestContentTypeAndWithSessionButNoSessionValue()
{
@@ -111,6 +114,7 @@ public class ViewHandlerTest extends TestCase
* Test method for
* {@link jakarta.faces.application.ViewHandler#calculateCharacterEncoding(jakarta.faces.context.FacesContext)}.
*/
+ @Test
@SuppressWarnings("unchecked")
public void testCalculateCharacterEncodingWithNoRequestContentTypeAndWithSessionAndNoSessionValue()
{
@@ -131,6 +135,7 @@ public class ViewHandlerTest extends TestCase
*
* @throws Exception
*/
+ @Test
public void testInitView() throws Exception
{
ViewHandler handler = _mocksControl
@@ -152,6 +157,7 @@ public class ViewHandlerTest extends TestCase
*
* @throws Exception
*/
+ @Test
public void testInitViewWithUnsupportedEncodingException() throws Exception
{
final ViewHandler handler = _mocksControl
@@ -167,6 +173,7 @@ public class ViewHandlerTest extends TestCase
_mocksControl.replay();
MyFacesAsserts.assertException(FacesException.class, new TestRunner()
{
+ @Override
public void run() throws Throwable
{
handler.initView(_facesContext);
diff --git a/impl/src/test/java/jakarta/faces/component/InvokeOnComponentTest.java b/impl/src/test/java/jakarta/faces/component/InvokeOnComponentTest.java
index 018616a49..963d85743 100644
--- a/impl/src/test/java/jakarta/faces/component/InvokeOnComponentTest.java
+++ b/impl/src/test/java/jakarta/faces/component/InvokeOnComponentTest.java
@@ -34,6 +34,7 @@ import jakarta.faces.model.ListDataModel;
import org.apache.myfaces.dummy.data.Data;
import org.junit.Assert;
+import org.junit.Test;
import org.mockito.Mockito;
public class InvokeOnComponentTest extends AbstractComponentTest
@@ -56,6 +57,7 @@ public class InvokeOnComponentTest extends AbstractComponentTest
super.tearDown();
}
+ @Test
public void testInvokeOnFormPrependId() throws Exception
{
UIForm form = new UIForm();
@@ -72,6 +74,7 @@ public class InvokeOnComponentTest extends AbstractComponentTest
Assert.assertTrue(val.get());
}
+ @Test
public void testInvokeOnFormPrependIdFalse() throws Exception
{
UIForm form = new UIForm();
@@ -88,6 +91,7 @@ public class InvokeOnComponentTest extends AbstractComponentTest
Assert.assertTrue(val.get());
}
+ @Test
public void testInvokeOnFormPrependIdChild() throws Exception
{
UIForm form = new UIForm();
@@ -109,6 +113,7 @@ public class InvokeOnComponentTest extends AbstractComponentTest
Assert.assertTrue(val.get());
}
+ @Test
public void testInvokeOnFormPrependIdFalseChild() throws Exception
{
UIForm form = new UIForm();
@@ -130,6 +135,7 @@ public class InvokeOnComponentTest extends AbstractComponentTest
Assert.assertTrue(val.get());
}
+ @Test
public void atestInvokeOnComp() throws Exception
{
UIForm form = new UIForm();
@@ -155,6 +161,7 @@ public class InvokeOnComponentTest extends AbstractComponentTest
Mockito.verify(cc, Mockito.never()).invokeContextCallback(facesContext, i4);
}
+ @Test
public void btestInvokeOnCompOnUIData() throws Exception
{
// column1
@@ -204,6 +211,7 @@ public class InvokeOnComponentTest extends AbstractComponentTest
Mockito.verify(cc, Mockito.never()).invokeContextCallback(facesContext, name);
}
+ @Test
public void testInvokeOnCompOnUIDataChildren() throws Exception
{
// column1
diff --git a/impl/src/test/java/jakarta/faces/component/UIComponentAttributesTest.java b/impl/src/test/java/jakarta/faces/component/UIComponentAttributesTest.java
index 0b557c814..527ed0e80 100644
--- a/impl/src/test/java/jakarta/faces/component/UIComponentAttributesTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIComponentAttributesTest.java
@@ -21,6 +21,7 @@ package jakarta.faces.component;
import jakarta.faces.component.html.HtmlInputText;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
+import org.junit.Test;
public class UIComponentAttributesTest extends AbstractJsfTestCase
{
@@ -41,6 +42,7 @@ public class UIComponentAttributesTest extends AbstractJsfTestCase
input = null;
}
+ @Test
public void testSetNullAttributeOnValidProperty()
{
input.getAttributes().put("style", null);
diff --git a/impl/src/test/java/jakarta/faces/component/UIComponentBaseGetChildrenTest.java b/impl/src/test/java/jakarta/faces/component/UIComponentBaseGetChildrenTest.java
index 2e90b64f0..e33cdde52 100644
--- a/impl/src/test/java/jakarta/faces/component/UIComponentBaseGetChildrenTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIComponentBaseGetChildrenTest.java
@@ -18,18 +18,16 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIViewRoot;
-import jakarta.faces.component.UIComponent;
-import jakarta.faces.component.UIPanel;
-import jakarta.faces.component.UIInput;
import java.util.ArrayList;
import java.util.List;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.junit.Assert;
+import org.junit.Test;
public class UIComponentBaseGetChildrenTest extends AbstractJsfTestCase
{
+ @Test
public void testGetChildrenAddAll()
{
UIInput input0 = new UIInput();
@@ -63,6 +61,7 @@ public class UIComponentBaseGetChildrenTest extends AbstractJsfTestCase
Assert.assertEquals(input3.getId(), children.get(1).getId());
}
+ @Test
public void testSimpleAddRemove()
{
UIInput input = new UIInput();
@@ -80,6 +79,7 @@ public class UIComponentBaseGetChildrenTest extends AbstractJsfTestCase
* the child must first be removed from its previous parent
* (where it may have been either a child or a facet).
*/
+ @Test
public void testSetChild1()
{
UIInput input = new UIInput();
@@ -98,6 +98,7 @@ public class UIComponentBaseGetChildrenTest extends AbstractJsfTestCase
Assert.assertNull(input.getParent());
}
+ @Test
public void testSetChild2()
{
UIInput input = new UIInput();
@@ -127,6 +128,7 @@ public class UIComponentBaseGetChildrenTest extends AbstractJsfTestCase
/** Whenever an existing child component is removed, the parent
* property of the child must be set to null.
*/
+ @Test
public void testSetFacetClearChild()
{
UIInput input = new UIInput();
@@ -151,7 +153,7 @@ public class UIComponentBaseGetChildrenTest extends AbstractJsfTestCase
Assert.assertTrue(panel.getChildCount() == 0);
}
-
+ @Test
public void testSetFacetClearFacet()
{
UIInput input = new UIInput();
diff --git a/impl/src/test/java/jakarta/faces/component/UIComponentBaseGetClientIdTest.java b/impl/src/test/java/jakarta/faces/component/UIComponentBaseGetClientIdTest.java
index edac2b267..7e464620f 100644
--- a/impl/src/test/java/jakarta/faces/component/UIComponentBaseGetClientIdTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIComponentBaseGetClientIdTest.java
@@ -29,6 +29,7 @@ import jakarta.faces.FacesException;
import jakarta.faces.context.FacesContext;
import jakarta.faces.render.Renderer;
import org.junit.Assert;
+import org.junit.Test;
/**
* Created by IntelliJ IDEA.
@@ -54,6 +55,7 @@ public class UIComponentBaseGetClientIdTest extends AbstractComponentTest
super.tearDown();
}
+ @Test
public void testNullFacesContext() throws Exception
{
try
@@ -71,6 +73,7 @@ public class UIComponentBaseGetClientIdTest extends AbstractComponentTest
}
}
+ @Test
public void testWithoutParentAndNoRenderer() throws Exception
{
String expectedClientId = "testId";
@@ -80,6 +83,7 @@ public class UIComponentBaseGetClientIdTest extends AbstractComponentTest
Assert.assertEquals(expectedClientId, _testImpl.getClientId(facesContext));
}
+ @Test
public void testWithRenderer() throws Exception
{
String id = "testId";
@@ -102,6 +106,7 @@ public class UIComponentBaseGetClientIdTest extends AbstractComponentTest
Assert.assertEquals(expectedClientId, _testImpl.getClientId(facesContext));
}
+ @Test
public void testWithParentNamingContainer() throws Exception
{
String id = "testId";
@@ -121,6 +126,7 @@ public class UIComponentBaseGetClientIdTest extends AbstractComponentTest
Assert.assertEquals(expectedClientId, _testImpl.getClientId(facesContext));
}
+ @Test
public void testWithParentNamingContainerChanging() throws Exception
{
String id = "testId";
@@ -153,6 +159,7 @@ public class UIComponentBaseGetClientIdTest extends AbstractComponentTest
}
}
+ @Test
public void testWithoutId() throws Exception
{
UIViewRoot viewRoot = facesContext.getViewRoot();
@@ -161,6 +168,7 @@ public class UIComponentBaseGetClientIdTest extends AbstractComponentTest
Assert.assertNotNull(_testImpl.getId());
}
+ @Test
public void testWithoutIdAndNoUIViewRoot() throws Exception
{
facesContext.setViewRoot(null);
diff --git a/impl/src/test/java/jakarta/faces/component/UIComponentEventListenerWrapperTest.java b/impl/src/test/java/jakarta/faces/component/UIComponentEventListenerWrapperTest.java
index 2ea7dee05..c04a03ca9 100644
--- a/impl/src/test/java/jakarta/faces/component/UIComponentEventListenerWrapperTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIComponentEventListenerWrapperTest.java
@@ -18,19 +18,16 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.StateHolder;
-import jakarta.faces.component.PartialStateHolder;
-import jakarta.faces.component.UIOutput;
-import jakarta.faces.component.UIComponent;
-import jakarta.faces.component._EventListenerWrapper;
import jakarta.faces.context.FacesContext;
import jakarta.faces.event.ComponentSystemEvent;
import jakarta.faces.event.ComponentSystemEventListener;
import jakarta.faces.render.Renderer;
import org.junit.Assert;
+import org.junit.Test;
public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
{
+ @Test
public void testUIComponentListenerNormalState()
{
UIComponent component = new UIOutput();
@@ -52,6 +49,7 @@ public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
+ @Test
public void testUIComponentListenerWithPSS()
{
UIComponent component = new UIOutput();
@@ -75,6 +73,7 @@ public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
+ @Test
public void testUIComponentListenerWithPSSFull()
{
UIComponent component = new UIOutput();
@@ -108,6 +107,7 @@ public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
}
}
+ @Test
public void testRendererListenerNormalState()
{
UIComponent component = new UIOutput();
@@ -132,6 +132,7 @@ public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
+ @Test
public void testRendererListenerWithPSS()
{
UIComponent component = new UIOutput();
@@ -158,6 +159,7 @@ public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
+ @Test
public void testRendererListenerWithPSSFull()
{
UIComponent component = new UIOutput();
@@ -202,6 +204,7 @@ public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
}
+ @Test
public void testNonSerializableListenerNormalState()
{
UIComponent component = new UIOutput();
@@ -224,6 +227,7 @@ public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
+ @Test
public void testNonSerializableListenerWithPSS()
{
UIComponent component = new UIOutput();
@@ -248,6 +252,7 @@ public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
+ @Test
public void testNonSerializableListenerWithPSSFull()
{
UIComponent component = new UIOutput();
@@ -290,6 +295,7 @@ public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
}
+ @Test
public void testSerializableListenerNormalState()
{
UIComponent component = new UIOutput();
@@ -312,6 +318,7 @@ public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
+ @Test
public void testSerializableListenerWithPSS()
{
UIComponent component = new UIOutput();
@@ -336,6 +343,7 @@ public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
+ @Test
public void testSerializableListenerWithPSSFull()
{
UIComponent component = new UIOutput();
@@ -371,6 +379,7 @@ public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
i = value;
}
+ @Override
public void processEvent(ComponentSystemEvent event)
{
// TODO Auto-generated method stub
@@ -387,27 +396,32 @@ public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
return false;
}
+ @Override
public Object saveState(FacesContext context)
{
return i;
}
+ @Override
public void restoreState(FacesContext context, Object state)
{
i = (Integer) state;
}
+ @Override
public boolean isTransient()
{
return false;
}
+ @Override
public void setTransient(boolean newTransientValue)
{
}
}
+ @Test
public void testStateHolderListenerNormalState()
{
UIComponent component = new UIOutput();
@@ -431,6 +445,7 @@ public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
+ @Test
public void testStateHolderListenerWithPSS()
{
UIComponent component = new UIOutput();
@@ -457,6 +472,7 @@ public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
+ @Test
public void testStateHolderListenerWithPSSFull()
{
UIComponent component = new UIOutput();
@@ -498,6 +514,7 @@ public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
i = value;
}
+ @Override
public void processEvent(ComponentSystemEvent event)
{
// TODO Auto-generated method stub
@@ -514,6 +531,7 @@ public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
return false;
}
+ @Override
public Object saveState(FacesContext context)
{
if (!initialStateMarked())
@@ -526,6 +544,7 @@ public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
}
}
+ @Override
public void restoreState(FacesContext context, Object state)
{
if (state == null)
@@ -535,25 +554,30 @@ public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
i = (Integer) state;
}
+ @Override
public boolean isTransient()
{
return false;
}
+ @Override
public void setTransient(boolean newTransientValue)
{
}
+ @Override
public void clearInitialState()
{
markInitialState = false;
}
+ @Override
public boolean initialStateMarked()
{
return markInitialState;
}
+ @Override
public void markInitialState()
{
markInitialState = true;
@@ -561,6 +585,7 @@ public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
}
+ @Test
public void testPartialStateHolderListenerNormalState()
{
UIComponent component = new UIOutput();
@@ -583,6 +608,7 @@ public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
+ @Test
public void testPartialStateHolderListenerWithPSS()
{
UIComponent component = new UIOutput();
@@ -607,6 +633,7 @@ public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
+ @Test
public void testPartialStateHolderListenerWithPSS2()
{
UIComponent component = new UIOutput();
@@ -633,6 +660,7 @@ public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
+ @Test
public void testPartialStateHolderListenerWithPSSFull()
{
UIComponent component = new UIOutput();
diff --git a/impl/src/test/java/jakarta/faces/component/UIComponentFindComponentTest.java b/impl/src/test/java/jakarta/faces/component/UIComponentFindComponentTest.java
index 712dbf72b..9147a67b7 100644
--- a/impl/src/test/java/jakarta/faces/component/UIComponentFindComponentTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIComponentFindComponentTest.java
@@ -28,6 +28,7 @@ import jakarta.faces.component.UIData;
import jakarta.faces.component.UINamingContainer;
import jakarta.faces.component.UIPanel;
import org.junit.Assert;
+import org.junit.Test;
/**
@@ -54,6 +55,7 @@ public class UIComponentFindComponentTest extends AbstractComponentTest
super.tearDown();
}
+ @Test
public void testWithNullExperession() throws Exception
{
try
@@ -72,11 +74,13 @@ public class UIComponentFindComponentTest extends AbstractComponentTest
}
}
+ @Test
public void testWithEmptyExperession() throws Exception
{
Assert.assertNull(_testImpl.findComponent(""));
}
+ @Test
public void testRootExpression() throws Exception
{
String expression = ":parent";
@@ -92,6 +96,7 @@ public class UIComponentFindComponentTest extends AbstractComponentTest
Assert.assertEquals(parent, _testImpl.findComponent(expression));
}
+ @Test
public void testRelativeExpression() throws Exception
{
String expression = "testimpl";
@@ -108,6 +113,7 @@ public class UIComponentFindComponentTest extends AbstractComponentTest
Assert.assertEquals(_testImpl, _testImpl.findComponent(expression));
}
+ @Test
public void testComplexRelativeExpression() throws Exception
{
String expression = "child1_1:testimpl";
@@ -124,10 +130,12 @@ public class UIComponentFindComponentTest extends AbstractComponentTest
Assert.assertEquals(_testImpl, namingContainer.findComponent(expression));
}
+ @Test
public void testOverriddenFindComponent() {
UIViewRoot viewRoot = new UIViewRoot();
UIData uiData = new UIData()
{
+ @Override
public UIComponent findComponent(String expr)
{
return super.findComponent(stripRowIndex(expr));
@@ -170,6 +178,7 @@ public class UIComponentFindComponentTest extends AbstractComponentTest
Assert.assertEquals(command, viewRoot.findComponent(":data:1:command"));
}
+ @Test
public void testXXFindComponent() {
UIViewRoot viewRoot = new UIViewRoot();
UIData uiData = new UIData();
@@ -188,7 +197,7 @@ public class UIComponentFindComponentTest extends AbstractComponentTest
Assert.assertNotNull(viewRoot.findComponent(":x:x"));
}
-
+ @Test
public void testWithRelativeExpressionNamingContainer() throws Exception
{
String expression = "testimpl";
diff --git a/impl/src/test/java/jakarta/faces/component/UIComponentInvokeOnComponentTest.java b/impl/src/test/java/jakarta/faces/component/UIComponentInvokeOnComponentTest.java
index a9d7d8160..08a397b61 100644
--- a/impl/src/test/java/jakarta/faces/component/UIComponentInvokeOnComponentTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIComponentInvokeOnComponentTest.java
@@ -89,6 +89,7 @@ public class UIComponentInvokeOnComponentTest extends AbstractJsfTestCase
org.apache.myfaces.test.MyFacesAsserts.assertException(FacesException.class, new TestRunner()
{
+ @Override
public void run() throws Throwable
{
Assert.assertTrue(testimpl.invokeOnComponent(facesContext, "xxxId", _contextCallback));
@@ -133,6 +134,7 @@ public class UIComponentInvokeOnComponentTest extends AbstractJsfTestCase
{
org.apache.myfaces.test.MyFacesAsserts.assertException(NullPointerException.class, new TestRunner()
{
+ @Override
public void run() throws Throwable
{
_testimpl.invokeOnComponent(null, "xxx", _contextCallback);
@@ -140,6 +142,7 @@ public class UIComponentInvokeOnComponentTest extends AbstractJsfTestCase
});
org.apache.myfaces.test.MyFacesAsserts.assertException(NullPointerException.class, new TestRunner()
{
+ @Override
public void run() throws Throwable
{
_testimpl.invokeOnComponent(facesContext, null, _contextCallback);
diff --git a/impl/src/test/java/jakarta/faces/component/UIDataTest.java b/impl/src/test/java/jakarta/faces/component/UIDataTest.java
index 04e8f0857..70d9baf2e 100644
--- a/impl/src/test/java/jakarta/faces/component/UIDataTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIDataTest.java
@@ -59,6 +59,7 @@ import org.apache.myfaces.test.mock.visit.MockVisitContext;
import org.easymock.classextension.EasyMock;
import org.easymock.classextension.IMocksControl;
import org.junit.Assert;
+import org.junit.Test;
public class UIDataTest extends AbstractJsfTestCase
{
@@ -77,6 +78,7 @@ public class UIDataTest extends AbstractJsfTestCase
* Test method for
* {@link jakarta.faces.component.UIData#setValueExpression(java.lang.String, jakarta.el.ValueExpression)}.
*/
+ @Test
public void testValueExpression()
{
assertSetValueExpressionException(IllegalArgumentException.class, "rowIndex");
@@ -97,6 +99,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#getClientId(jakarta.faces.context.FacesContext)}.
*/
+ @Test
public void testGetClientId()
{
_testImpl.setId("xxx");
@@ -115,6 +118,7 @@ public class UIDataTest extends AbstractJsfTestCase
* .
* Tests, if invokeOnComponent also checks the facets of the h:column children (MYFACES-2370)
*/
+ @Test
public void testInvokeOnComponentFacesContextStringContextCallback()
{
/**
@@ -150,6 +154,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#broadcast(jakarta.faces.event.FacesEvent)}.
*/
+ @Test
public void testBroadcastFacesEvent()
{
// create event mock
@@ -215,6 +220,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#encodeBegin(jakarta.faces.context.FacesContext)}.
*/
+ @Test
public void testEncodeBeginFacesContext()
{
// TODO
@@ -223,6 +229,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#encodeEnd(jakarta.faces.context.FacesContext)}.
*/
+ @Test
public void testEncodeEndFacesContext()
{
// TODO
@@ -231,6 +238,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#queueEvent(jakarta.faces.event.FacesEvent)}.
*/
+ @Test
public void testQueueEventFacesEvent()
{
// TODO
@@ -239,6 +247,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#processDecodes(jakarta.faces.context.FacesContext)}.
*/
+ @Test
public void testProcessDecodesFacesContext()
{
// TODO
@@ -247,6 +256,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#processValidators(jakarta.faces.context.FacesContext)}.
*/
+ @Test
public void testProcessValidatorsFacesContext()
{
// TODO
@@ -255,6 +265,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#processUpdates(jakarta.faces.context.FacesContext)}.
*/
+ @Test
public void testProcessUpdatesFacesContext()
{
// TODO
@@ -263,6 +274,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#saveState(jakarta.faces.context.FacesContext)}.
*/
+ @Test
public void testSaveState()
{
// TODO
@@ -272,6 +284,7 @@ public class UIDataTest extends AbstractJsfTestCase
* Test method for
* {@link jakarta.faces.component.UIData#restoreState(jakarta.faces.context.FacesContext, java.lang.Object)}.
*/
+ @Test
public void testRestoreState()
{
// TODO
@@ -280,6 +293,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#UIData()}.
*/
+ @Test
public void testUIData()
{
// TODO
@@ -288,6 +302,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#setFooter(jakarta.faces.component.UIComponent)}.
*/
+ @Test
public void testSetFooter()
{
// TODO
@@ -296,6 +311,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#getFooter()}.
*/
+ @Test
public void testGetFooter()
{
// TODO
@@ -304,6 +320,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#setHeader(jakarta.faces.component.UIComponent)}.
*/
+ @Test
public void testSetHeader()
{
// TODO
@@ -312,6 +329,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#getHeader()}.
*/
+ @Test
public void testGetHeader()
{
// TODO
@@ -320,6 +338,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#isRowAvailable()}.
*/
+ @Test
public void testIsRowAvailable()
{
// TODO
@@ -328,6 +347,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#getRowCount()}.
*/
+ @Test
public void testGetRowCount()
{
// TODO
@@ -336,6 +356,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#getRowData()}.
*/
+ @Test
public void testGetRowData()
{
// TODO
@@ -344,6 +365,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#getRowIndex()}.
*/
+ @Test
public void testGetRowIndex()
{
// TODO
@@ -352,6 +374,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#setRowIndex(int)}.
*/
+ @Test
public void testSetRowIndex()
{
// TODO
@@ -360,6 +383,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#getDataModel()}.
*/
+ @Test
public void testGetDataModel()
{
// TODO
@@ -368,6 +392,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#setDataModel(jakarta.faces.model.DataModel)}.
*/
+ @Test
public void testSetDataModel()
{
// TODO
@@ -376,6 +401,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#setValue(java.lang.Object)}.
*/
+ @Test
public void testSetValue()
{
// TODO
@@ -384,6 +410,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#setRows(int)}.
*/
+ @Test
public void testSetRows()
{
// TODO
@@ -392,6 +419,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#setFirst(int)}.
*/
+ @Test
public void testSetFirst()
{
// TODO
@@ -400,6 +428,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#getValue()}.
*/
+ @Test
public void testGetValue()
{
// TODO
@@ -408,6 +437,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#getVar()}.
*/
+ @Test
public void testGetVar()
{
// TODO
@@ -416,6 +446,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#setVar(java.lang.String)}.
*/
+ @Test
public void testSetVar()
{
// TODO
@@ -424,6 +455,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#getRows()}.
*/
+ @Test
public void testGetRows()
{
// TODO
@@ -432,6 +464,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#getFirst()}.
*/
+ @Test
public void testGetFirst()
{
// TODO
@@ -440,6 +473,7 @@ public class UIDataTest extends AbstractJsfTestCase
/**
* Test method for {@link jakarta.faces.component.UIData#getFamily()}.
*/
+ @Test
public void testGetFamily()
{
// TODO
@@ -449,6 +483,7 @@ public class UIDataTest extends AbstractJsfTestCase
* Test method for
* {@link jakarta.faces.component.UIData#visitTree(jakarta.faces.component.visit.VisitContext, jakarta.faces.component.visit.VisitCallback)}.
*/
+ @Test
public void testVisitTree() {
UIData uidata = new UIData();
// value
@@ -567,6 +602,7 @@ public class UIDataTest extends AbstractJsfTestCase
}
}
+ @Test
public void testPreserveRowComponentState1() throws Exception
{
List<RowData> model = new ArrayList<RowData>();
@@ -632,6 +668,7 @@ public class UIDataTest extends AbstractJsfTestCase
}
+ @Test
public void testCollectionDataModel() throws Exception
{
SimpleCollection<RowData> model = new SimpleCollection<RowData>();
@@ -737,6 +774,7 @@ public class UIDataTest extends AbstractJsfTestCase
}
}
+ @Test
public void testProcessDecodesRenderedFalse() throws Exception {
UIData uiData = new VerifyNoLifecycleMethodComponent();
UIComponent parent = MockRenderedValueExpression.setUpComponentStack(facesContext, uiData, false);
@@ -744,9 +782,9 @@ public class UIDataTest extends AbstractJsfTestCase
uiData.processDecodes(facesContext);
Assert.assertEquals("processDecodes must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
-
}
+ @Test
public void testProcessDecodesRenderedTrue() throws Exception {
UIComponent parent = MockRenderedValueExpression.setUpComponentStack(facesContext, _testImpl, true);
@@ -757,7 +795,7 @@ public class UIDataTest extends AbstractJsfTestCase
Assert.assertEquals("processDecodes must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
}
-
+ @Test
public void testProcessValidatorsRenderedFalse() throws Exception {
UIData uiData = new VerifyNoLifecycleMethodComponent();
UIComponent parent = MockRenderedValueExpression.setUpComponentStack(facesContext, uiData, false);
@@ -768,6 +806,7 @@ public class UIDataTest extends AbstractJsfTestCase
}
+ @Test
public void testProcessValidatorsRenderedTrue() throws Exception {
UIComponent parent = MockRenderedValueExpression.setUpComponentStack(facesContext, _testImpl, true);
@@ -778,6 +817,7 @@ public class UIDataTest extends AbstractJsfTestCase
Assert.assertEquals("processValidators must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
}
+ @Test
public void testProcessUpdatesRenderedFalse() throws Exception {
UIData uiData = new VerifyNoLifecycleMethodComponent();
UIComponent parent = MockRenderedValueExpression.setUpComponentStack(facesContext, uiData, false);
@@ -788,6 +828,7 @@ public class UIDataTest extends AbstractJsfTestCase
}
+ @Test
public void testProcessUpdatesRenderedTrue() throws Exception {
UIComponent parent = MockRenderedValueExpression.setUpComponentStack(facesContext, _testImpl, true);
@@ -810,9 +851,11 @@ public class UIDataTest extends AbstractJsfTestCase
/** Verifies no call to encode* and process* methods */
public class VerifyNoLifecycleMethodComponent extends UIData
{
+ @Override
public void setRowIndex(int rowIndex) {
Assert.fail();
}
+ @Override
public void decode(FacesContext context) {
Assert.fail();
}
@@ -822,12 +865,15 @@ public class UIDataTest extends AbstractJsfTestCase
public void updateModel(FacesContext context) {
Assert.fail();
}
+ @Override
public void encodeBegin(FacesContext context) throws IOException {
Assert.fail();
}
+ @Override
public void encodeChildren(FacesContext context) throws IOException {
Assert.fail();
}
+ @Override
public void encodeEnd(FacesContext context) throws IOException {
Assert.fail();
}
@@ -844,6 +890,7 @@ public class UIDataTest extends AbstractJsfTestCase
*
* @throws Exception
*/
+ @Test
public void testSaveAndRestorePortletLifecycleWithoutPss1() throws Exception
{
List<RowData> model = new ArrayList<RowData>();
@@ -957,6 +1004,7 @@ public class UIDataTest extends AbstractJsfTestCase
*
* @throws Exception
*/
+ @Test
public void testSaveAndRestorePortletLifecycleWithPss1() throws Exception
{
facesContext.getRenderKit().addRenderer("jakarta.faces.Data", "jakarta.faces.Table",new Renderer(){});
@@ -1056,6 +1104,7 @@ public class UIDataTest extends AbstractJsfTestCase
*
* @throws Exception
*/
+ @Test
public void testSaveAndRestorePortletLifecycleWithPss2() throws Exception
{
facesContext.getRenderKit().addRenderer("jakarta.faces.Data", "jakarta.faces.Table",new Renderer(){});
diff --git a/impl/src/test/java/jakarta/faces/component/UIGraphicTest.java b/impl/src/test/java/jakarta/faces/component/UIGraphicTest.java
index 34bec331c..3392e8016 100644
--- a/impl/src/test/java/jakarta/faces/component/UIGraphicTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIGraphicTest.java
@@ -18,7 +18,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIGraphic;
import jakarta.el.ValueExpression;
import org.easymock.classextension.EasyMock;
diff --git a/impl/src/test/java/jakarta/faces/component/UIInputTest.java b/impl/src/test/java/jakarta/faces/component/UIInputTest.java
index ecf0a49c1..88eddbfaa 100644
--- a/impl/src/test/java/jakarta/faces/component/UIInputTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIInputTest.java
@@ -51,6 +51,7 @@ import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.test.el.MockValueExpression;
import org.apache.myfaces.test.mock.visit.MockVisitCallback;
import org.junit.Assert;
+import org.junit.Test;
public class UIInputTest extends AbstractJsfTestCase
{
@@ -95,6 +96,7 @@ public class UIInputTest extends AbstractJsfTestCase
}
}
+ @Test
public void testWhenSpecifiedConverterMessageIsUsedInCaseConverterExceptionOccurs()
{
input.setConverterMessage("Cannot convert");
@@ -116,6 +118,7 @@ public class UIInputTest extends AbstractJsfTestCase
Assert.assertEquals(message.getSummary(), "Cannot convert");
}
+ @Test
public void testWhenSpecifiedValidatorMessageIsUsedInCaseValidatorExceptionOccurs()
{
input.setValidatorMessage("Cannot validate");
@@ -136,6 +139,7 @@ public class UIInputTest extends AbstractJsfTestCase
Assert.assertEquals(message.getSummary(), "Cannot validate");
}
+ @Test
public void testUpdateModelSetsTheLocalValueToModelValue()
{
input.setValue("testValue");
@@ -149,6 +153,7 @@ public class UIInputTest extends AbstractJsfTestCase
Assert.assertEquals("testValue", updatedValue);
}
+ @Test
public void testValidateWithEmptyStringWithEmptyStringAsNullEnabled()
{
try
@@ -184,6 +189,7 @@ public class UIInputTest extends AbstractJsfTestCase
}
}
+ @Test
public void testValidateWithNonStringWithEmptyStringAsNullEnabled()
{
try
@@ -239,6 +245,7 @@ public class UIInputTest extends AbstractJsfTestCase
}
}
+ @Test
public void testValidateWithNonEmptyStringWithEmptyStringAsNullEnabled()
{
try
@@ -260,6 +267,7 @@ public class UIInputTest extends AbstractJsfTestCase
}
}
+ @Test
public void testValidateWithEmptyStringWithEmptyStringAsNullDisabled()
{
try
@@ -280,6 +288,7 @@ public class UIInputTest extends AbstractJsfTestCase
}
}
+ @Test
public void testValidateWithEmptyStringWithEmptyStringAsNullNotSpecified()
{
try
@@ -304,6 +313,7 @@ public class UIInputTest extends AbstractJsfTestCase
* Tests if UIInput.processValidators() correctly calls FacesContext.validationFailed()
* if a validation error occurs.
*/
+ @Test
public void testValidationErrorTriggersFacesContextValidationFailed()
{
LengthValidator validator = new LengthValidator();
@@ -325,19 +335,23 @@ public class UIInputTest extends AbstractJsfTestCase
super(context, request, response);
}
+ @Override
public String encodePartialActionURL(String url) {
return null;
}
+ @Override
public String getInitParameter(String name) {
return (String) initParameters.get(name);
}
+ @Override
public Map getInitParameterMap() {
return initParameters;
}
}
+ @Test
public void testProcessDecodesRenderedFalse() throws Exception {
input = new VerifyNoLifecycleMethodComponent();
UIComponent parent = MockRenderedValueExpression.setUpComponentStack(facesContext, input, false);
@@ -348,6 +362,7 @@ public class UIInputTest extends AbstractJsfTestCase
}
+ @Test
public void testProcessDecodesRenderedTrue() throws Exception {
UIComponent parent = MockRenderedValueExpression.setUpComponentStack(facesContext, input, true);
@@ -358,6 +373,7 @@ public class UIInputTest extends AbstractJsfTestCase
Assert.assertEquals("processDecodes must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
}
+ @Test
public void testProcessValidatorsRenderedFalse() throws Exception {
input = new VerifyNoLifecycleMethodComponent();
UIComponent parent = MockRenderedValueExpression.setUpComponentStack(facesContext, input, false);
@@ -368,6 +384,7 @@ public class UIInputTest extends AbstractJsfTestCase
}
+ @Test
public void testProcessValidatorsRenderedTrue() throws Exception {
UIComponent parent = MockRenderedValueExpression.setUpComponentStack(facesContext, input, true);
@@ -378,7 +395,7 @@ public class UIInputTest extends AbstractJsfTestCase
Assert.assertEquals("processValidators must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
}
-
+ @Test
public void testProcessUpdatesRenderedFalse() throws Exception {
input = new VerifyNoLifecycleMethodComponent();
UIComponent parent = MockRenderedValueExpression.setUpComponentStack(facesContext,input, false);
@@ -389,6 +406,7 @@ public class UIInputTest extends AbstractJsfTestCase
}
+ @Test
public void testProcessUpdatesRenderedTrue() throws Exception {
UIComponent parent = MockRenderedValueExpression.setUpComponentStack(facesContext, input, true);
@@ -399,6 +417,7 @@ public class UIInputTest extends AbstractJsfTestCase
Assert.assertEquals("processValidators must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
}
+ @Test
public void testVisitTree() throws Exception {
UIComponent parent = MockRenderedValueExpression.setUpComponentStack(facesContext, input, true);
@@ -412,21 +431,27 @@ public class UIInputTest extends AbstractJsfTestCase
/** Verifies no call to encode* and process* methods */
public class VerifyNoLifecycleMethodComponent extends UIInput
{
+ @Override
public void decode(FacesContext context) {
Assert.fail();
}
+ @Override
public void validate(FacesContext context) {
Assert.fail();
}
+ @Override
public void updateModel(FacesContext context) {
Assert.fail();
}
+ @Override
public void encodeBegin(FacesContext context) throws IOException {
Assert.fail();
}
+ @Override
public void encodeChildren(FacesContext context) throws IOException {
Assert.fail();
}
+ @Override
public void encodeEnd(FacesContext context) throws IOException {
Assert.fail();
}
diff --git a/impl/src/test/java/jakarta/faces/component/UISelectItemsTest.java b/impl/src/test/java/jakarta/faces/component/UISelectItemsTest.java
index 38ee9d74a..4f10e3636 100644
--- a/impl/src/test/java/jakarta/faces/component/UISelectItemsTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UISelectItemsTest.java
@@ -28,6 +28,7 @@ import jakarta.el.ValueExpression;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.test.el.MockValueExpression;
import org.junit.Assert;
+import org.junit.Test;
/**
* Tests for UISelectItems.
@@ -35,6 +36,7 @@ import org.junit.Assert;
public class UISelectItemsTest extends AbstractJsfTestCase
{
+ @Test
public void testStringListAsValue()
{
List<String> value = new ArrayList<String>();
@@ -61,6 +63,7 @@ public class UISelectItemsTest extends AbstractJsfTestCase
Assert.assertEquals(value, options);
}
+ @Test
public void testPrimitiveArrayAsValue()
{
int[] value = new int[3];
diff --git a/impl/src/test/java/jakarta/faces/component/UIViewParameterTest.java b/impl/src/test/java/jakarta/faces/component/UIViewParameterTest.java
index 70568a1e8..852d4c2cc 100644
--- a/impl/src/test/java/jakarta/faces/component/UIViewParameterTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIViewParameterTest.java
@@ -21,6 +21,7 @@ package jakarta.faces.component;
import jakarta.faces.component.UIViewParameter;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.junit.Assert;
+import org.junit.Test;
/**
* Test class for UIViewParameter.
@@ -54,6 +55,7 @@ public class UIViewParameterTest extends AbstractJsfTestCase
* if the submitted value is null, but required is set to true.
* This is a special validation case only for UIViewParameter, so this has to be tested here.
*/
+ @Test
public void testValidationErrorTriggersFacesContextValidationFailed()
{
viewParameter.setRequired(true);
@@ -67,6 +69,7 @@ public class UIViewParameterTest extends AbstractJsfTestCase
/**
* Tests if UIViewParameter.decode() sets the submitted value only if it is not null.
*/
+ @Test
public void testDecodeSetOnlyNonNullSubmittedValue()
{
String notNull = "not null";
diff --git a/impl/src/test/java/jakarta/faces/component/_Delta2StateHelperTest.java b/impl/src/test/java/jakarta/faces/component/_Delta2StateHelperTest.java
index 87b0ffe6d..7891859b1 100644
--- a/impl/src/test/java/jakarta/faces/component/_Delta2StateHelperTest.java
+++ b/impl/src/test/java/jakarta/faces/component/_Delta2StateHelperTest.java
@@ -29,6 +29,7 @@ import jakarta.faces.event.PhaseEvent;
import jakarta.faces.event.PhaseId;
import jakarta.faces.event.PhaseListener;
import org.junit.Assert;
+import org.junit.Test;
public class _Delta2StateHelperTest extends AbstractComponentTest
@@ -109,18 +110,7 @@ public class _Delta2StateHelperTest extends AbstractComponentTest
}
}
- @Override
- public void setUp() throws Exception
- {
- super.setUp();
- }
-
- @Override
- public void tearDown() throws Exception
- {
- super.tearDown();
- }
-
+ @Test
public void testSimpleGetterSetter() throws Exception
{
UITestComponent a = new UITestComponent();
@@ -131,6 +121,7 @@ public class _Delta2StateHelperTest extends AbstractComponentTest
Assert.assertNull(a.getTestProperty1());
}
+ @Test
public void testEmptySaveRestore() throws Exception
{
UITestComponent a = new UITestComponent();
@@ -146,6 +137,7 @@ public class _Delta2StateHelperTest extends AbstractComponentTest
Assert.assertEquals(a.getTestProperty2(), b.getTestProperty2());
}
+ @Test
public void testSimpleSaveRestore() throws Exception
{
UITestComponent a = new UITestComponent();
@@ -163,6 +155,7 @@ public class _Delta2StateHelperTest extends AbstractComponentTest
Assert.assertEquals(a.getTestProperty2(), b.getTestProperty2());
}
+ @Test
public void testDeltaStateSaveRestore()
{
UITestComponent a = new UITestComponent();
@@ -193,6 +186,7 @@ public class _Delta2StateHelperTest extends AbstractComponentTest
Assert.assertEquals("testProperty2", b.getTestProperty2());
}
+ @Test
public void testPutPropertyStateHelper1()
{
UITestComponent a = new UITestComponent();
@@ -220,6 +214,7 @@ public class _Delta2StateHelperTest extends AbstractComponentTest
Assert.assertEquals("someOtherOtherValue",retValue);
}
+ @Test
public void testPutPropertyStateHelper2()
{
UITestComponent a = new UITestComponent();
@@ -247,6 +242,7 @@ public class _Delta2StateHelperTest extends AbstractComponentTest
Assert.assertEquals("someOtherOtherValue",retValue);
}
+ @Test
public void testRemovePropertyStateHelper1()
{
UITestComponent a = new UITestComponent();
@@ -274,7 +270,7 @@ public class _Delta2StateHelperTest extends AbstractComponentTest
Assert.assertEquals("someOtherOtherValue",retValue);
}
-
+ @Test
public void testAddItemOnList1()
{
UITestComponent a = new UITestComponent();
@@ -306,6 +302,7 @@ public class _Delta2StateHelperTest extends AbstractComponentTest
Assert.assertEquals("someValue3",listB.get(2));
}
+ @Test
public void testAddItemOnList2()
{
UITestComponent a = new UITestComponent();
@@ -344,6 +341,7 @@ public class _Delta2StateHelperTest extends AbstractComponentTest
}
}
+ @Test
public void testAddItemOnList3()
{
UITestComponent a = new UITestComponent();
@@ -378,6 +376,7 @@ public class _Delta2StateHelperTest extends AbstractComponentTest
Assert.assertFalse("The list should not contain [someValue1]", listB.contains("someValue1"));
}
+ @Test
public void testPutItemOnMap1()
{
UITestComponent a = new UITestComponent();
@@ -409,6 +408,7 @@ public class _Delta2StateHelperTest extends AbstractComponentTest
Assert.assertEquals("someValue3",mapB.get("key3"));
}
+ @Test
public void testPutRemoveItemOnMap2()
{
UITestComponent a = new UITestComponent();
@@ -446,6 +446,7 @@ public class _Delta2StateHelperTest extends AbstractComponentTest
}
}
+ @Test
public void testPutRemoveItemOnMap3()
{
UITestComponent a = new UITestComponent();
@@ -488,10 +489,13 @@ public class _Delta2StateHelperTest extends AbstractComponentTest
{
public TestPhaseListener1(){}
+ @Override
public void afterPhase(PhaseEvent event){}
+ @Override
public void beforePhase(PhaseEvent event){}
+ @Override
public PhaseId getPhaseId()
{
return PhaseId.ANY_PHASE;
@@ -512,10 +516,13 @@ public class _Delta2StateHelperTest extends AbstractComponentTest
{
public TestPhaseListener2(){}
+ @Override
public void afterPhase(PhaseEvent event){}
+ @Override
public void beforePhase(PhaseEvent event){}
+ @Override
public PhaseId getPhaseId()
{
return PhaseId.ANY_PHASE;
@@ -532,6 +539,7 @@ public class _Delta2StateHelperTest extends AbstractComponentTest
}
}
+ @Test
public void testUIViewRootPhaseListener1() throws Exception
{
UIViewRoot a = new UIViewRoot();
@@ -547,6 +555,7 @@ public class _Delta2StateHelperTest extends AbstractComponentTest
Assert.assertTrue(b.getPhaseListeners().contains(phaseListener1));
}
+ @Test
public void testUIViewRootPhaseListener2() throws Exception
{
UIViewRoot a = new UIViewRoot();
@@ -565,6 +574,7 @@ public class _Delta2StateHelperTest extends AbstractComponentTest
Assert.assertTrue(b.getPhaseListeners().contains(phaseListener1));
}
+ @Test
public void testUIViewRootPhaseListener3() throws Exception
{
UIViewRoot a = new UIViewRoot();
diff --git a/impl/src/test/java/jakarta/faces/component/_DeltaFacesListenerListTest.java b/impl/src/test/java/jakarta/faces/component/_DeltaFacesListenerListTest.java
index ba6672f90..404e56245 100644
--- a/impl/src/test/java/jakarta/faces/component/_DeltaFacesListenerListTest.java
+++ b/impl/src/test/java/jakarta/faces/component/_DeltaFacesListenerListTest.java
@@ -25,6 +25,7 @@ import java.util.Arrays;
import jakarta.faces.context.FacesContext;
import jakarta.faces.event.FacesListener;
import org.junit.Assert;
+import org.junit.Test;
public class _DeltaFacesListenerListTest extends AbstractComponentTest
{
@@ -161,34 +162,26 @@ public class _DeltaFacesListenerListTest extends AbstractComponentTest
return null;
}
+ @Override
public void clearInitialState()
{
initialStateMarked = false;
}
+ @Override
public boolean initialStateMarked()
{
return initialStateMarked;
}
+ @Override
public void markInitialState()
{
initialStateMarked = true;
}
}
- @Override
- public void setUp() throws Exception
- {
- super.setUp();
- }
-
- @Override
- public void tearDown() throws Exception
- {
- super.tearDown();
- }
-
+ @Test
public void testSimpleAddRemove()
{
UITestComponent a = new UITestComponent();
@@ -199,6 +192,7 @@ public class _DeltaFacesListenerListTest extends AbstractComponentTest
Assert.assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
}
+ @Test
public void testSimpleSaveRestore1()
{
UITestComponent a = new UITestComponent();
@@ -215,6 +209,7 @@ public class _DeltaFacesListenerListTest extends AbstractComponentTest
Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
}
+ @Test
public void testSimpleSaveRestore2()
{
UITestComponent a = new UITestComponent();
@@ -233,6 +228,7 @@ public class _DeltaFacesListenerListTest extends AbstractComponentTest
Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
}
+ @Test
public void testSimpleSaveRestore3()
{
UITestComponent a = new UITestComponent();
@@ -254,6 +250,7 @@ public class _DeltaFacesListenerListTest extends AbstractComponentTest
Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
}
+ @Test
public void testSimpleSaveRestore4()
{
UITestComponent a = new UITestComponent();
@@ -280,6 +277,7 @@ public class _DeltaFacesListenerListTest extends AbstractComponentTest
Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener2));
}
+ @Test
public void testSimpleSaveRestore5()
{
UITestComponent a = new UITestComponent();
@@ -314,6 +312,7 @@ public class _DeltaFacesListenerListTest extends AbstractComponentTest
Assert.assertFalse(Arrays.asList(c.getFacesListeners(FacesListener.class)).contains(listener2));
}
+ @Test
public void testSimpleSaveRestore6()
{
UITestComponent a = new UITestComponent();
@@ -339,6 +338,7 @@ public class _DeltaFacesListenerListTest extends AbstractComponentTest
Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
}
+ @Test
public void testSimpleSaveRestore7()
{
UITestComponent a = new UITestComponent();
@@ -375,6 +375,7 @@ public class _DeltaFacesListenerListTest extends AbstractComponentTest
Assert.assertFalse(Arrays.asList(c.getFacesListeners(FacesListener.class)).contains(listener2));
}
+ @Test
public void testSimpleSaveRestore8()
{
UITestComponent a = new UITestComponent();
@@ -397,6 +398,7 @@ public class _DeltaFacesListenerListTest extends AbstractComponentTest
Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
}
+ @Test
public void testSimpleSaveRestore9()
{
UITestComponent a = new UITestComponent();
@@ -427,6 +429,7 @@ public class _DeltaFacesListenerListTest extends AbstractComponentTest
Assert.assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener2));
}
+ @Test
public void testSimpleSaveRestoreTransient1()
{
UITestComponent a = new UITestComponent();
@@ -440,6 +443,7 @@ public class _DeltaFacesListenerListTest extends AbstractComponentTest
Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
}
+ @Test
public void testSimpleSaveRestoreTransient2()
{
UITestComponent a = new UITestComponent();
@@ -455,6 +459,7 @@ public class _DeltaFacesListenerListTest extends AbstractComponentTest
Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
}
+ @Test
public void testSimpleSaveRestoreTransient3()
{
UITestComponent a = new UITestComponent();
@@ -473,6 +478,7 @@ public class _DeltaFacesListenerListTest extends AbstractComponentTest
Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
}
+ @Test
public void testSimpleSaveRestoreTransient4()
{
UITestComponent a = new UITestComponent();
@@ -491,7 +497,7 @@ public class _DeltaFacesListenerListTest extends AbstractComponentTest
Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
}
-
+ @Test
public void testComplexSaveRestore1()
{
UITestComponent a = new UITestComponent();
diff --git a/impl/src/test/java/jakarta/faces/component/_DeltaListTest.java b/impl/src/test/java/jakarta/faces/component/_DeltaListTest.java
index 2e2ce380c..cdceef3ec 100644
--- a/impl/src/test/java/jakarta/faces/component/_DeltaListTest.java
+++ b/impl/src/test/java/jakarta/faces/component/_DeltaListTest.java
@@ -31,6 +31,7 @@ import java.util.List;
import jakarta.faces.context.FacesContext;
import jakarta.faces.event.FacesListener;
import org.junit.Assert;
+import org.junit.Test;
public class _DeltaListTest extends AbstractComponentTest
{
@@ -371,34 +372,26 @@ public class _DeltaListTest extends AbstractComponentTest
return null;
}
+ @Override
public void clearInitialState()
{
initialStateMarked = false;
}
+ @Override
public boolean initialStateMarked()
{
return initialStateMarked;
}
+ @Override
public void markInitialState()
{
initialStateMarked = true;
}
}
- @Override
- public void setUp() throws Exception
- {
- super.setUp();
- }
-
- @Override
- public void tearDown() throws Exception
- {
- super.tearDown();
- }
-
+ @Test
public void testSimpleAddRemove()
{
UITestComponent a = new UITestComponent();
@@ -409,6 +402,7 @@ public class _DeltaListTest extends AbstractComponentTest
Assert.assertFalse(a._facesListeners.contains(listener1));
}
+ @Test
public void testSimpleSaveRestore1()
{
UITestComponent a = new UITestComponent();
@@ -425,6 +419,7 @@ public class _DeltaListTest extends AbstractComponentTest
Assert.assertFalse(b._facesListeners.contains(listener1));
}
+ @Test
public void testSimpleSaveRestore2()
{
UITestComponent a = new UITestComponent();
@@ -443,6 +438,7 @@ public class _DeltaListTest extends AbstractComponentTest
Assert.assertFalse(b._facesListeners.contains(listener1));
}
+ @Test
public void testSimpleSaveRestore3()
{
UITestComponent a = new UITestComponent();
@@ -463,6 +459,7 @@ public class _DeltaListTest extends AbstractComponentTest
Assert.assertFalse(b._facesListeners.contains(listener1));
}
+ @Test
public void testSimpleSaveRestore4()
{
UITestComponent a = new UITestComponent();
@@ -489,6 +486,7 @@ public class _DeltaListTest extends AbstractComponentTest
Assert.assertFalse(b._facesListeners.contains(listener2));
}
+ @Test
public void testSimpleSaveRestore5()
{
UITestComponent a = new UITestComponent();
@@ -523,6 +521,7 @@ public class _DeltaListTest extends AbstractComponentTest
Assert.assertFalse(c._facesListeners.contains(listener2));
}
+ @Test
public void testSimpleSaveRestore6()
{
UITestComponent a = new UITestComponent();
@@ -548,6 +547,7 @@ public class _DeltaListTest extends AbstractComponentTest
Assert.assertFalse(b._facesListeners.contains(listener1));
}
+ @Test
public void testSimpleSaveRestore7()
{
UITestComponent a = new UITestComponent();
@@ -584,6 +584,7 @@ public class _DeltaListTest extends AbstractComponentTest
Assert.assertFalse(c._facesListeners.contains(listener2));
}
+ @Test
public void testSimpleSaveRestore8()
{
UITestComponent a = new UITestComponent();
@@ -606,6 +607,7 @@ public class _DeltaListTest extends AbstractComponentTest
Assert.assertFalse(b._facesListeners.contains(listener1));
}
+ @Test
public void testSimpleSaveRestore9()
{
UITestComponent a = new UITestComponent();
@@ -636,6 +638,7 @@ public class _DeltaListTest extends AbstractComponentTest
Assert.assertTrue(b._facesListeners.contains(listener2));
}
+ @Test
public void testSimpleSaveRestoreTransient1()
{
UITestComponent a = new UITestComponent();
@@ -650,6 +653,7 @@ public class _DeltaListTest extends AbstractComponentTest
Assert.assertTrue(b._facesListeners.isEmpty());
}
+ @Test
public void testSimpleSaveRestoreTransient2()
{
UITestComponent a = new UITestComponent();
@@ -665,6 +669,7 @@ public class _DeltaListTest extends AbstractComponentTest
Assert.assertFalse(b._facesListeners.contains(listener1));
}
+ @Test
public void testSimpleSaveRestoreTransient3()
{
UITestComponent a = new UITestComponent();
@@ -683,6 +688,7 @@ public class _DeltaListTest extends AbstractComponentTest
Assert.assertFalse(b._facesListeners.contains(listener1));
}
+ @Test
public void testSimpleSaveRestoreTransient4()
{
UITestComponent a = new UITestComponent();
@@ -701,6 +707,7 @@ public class _DeltaListTest extends AbstractComponentTest
Assert.assertFalse(b._facesListeners.contains(listener1));
}
+ @Test
public void testSimpleSaveRestoreTransient5()
{
UITestComponent a = new UITestComponent();
@@ -727,6 +734,7 @@ public class _DeltaListTest extends AbstractComponentTest
Assert.assertEquals("value2", ((StateFacesListener)b._facesListeners.get(b._facesListeners.indexOf(listener2))).getValue());
}
+ @Test
public void testSimpleSaveRestoreTransient6()
{
UITestComponent a = new UITestComponent();
@@ -744,6 +752,7 @@ public class _DeltaListTest extends AbstractComponentTest
Assert.assertFalse(b._facesListeners.contains(listener1));
}
+ @Test
public void testSimpleSaveRestoreTransient7()
{
UITestComponent a = new UITestComponent();
diff --git a/impl/src/test/java/jakarta/faces/component/_SharedRendererUtilsTest.java b/impl/src/test/java/jakarta/faces/component/_SharedRendererUtilsTest.java
index 61acb8c71..a956913ad 100644
--- a/impl/src/test/java/jakarta/faces/component/_SharedRendererUtilsTest.java
+++ b/impl/src/test/java/jakarta/faces/component/_SharedRendererUtilsTest.java
@@ -34,6 +34,7 @@ import jakarta.faces.convert.ConverterException;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.test.el.MockValueExpression;
import org.junit.Assert;
+import org.junit.Test;
public class _SharedRendererUtilsTest extends AbstractJsfTestCase
{
@@ -197,6 +198,7 @@ public class _SharedRendererUtilsTest extends AbstractJsfTestCase
* Test case for the case that UISelectMany has neither a Converter nor a ValueExpression for value.
* In this scenario it stores the values of submittedValue in a new object array.
*/
+ @Test
public void testGetConvertedUISelectManyValueNoConverterNoValueExpression()
{
Object target = SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
@@ -209,6 +211,7 @@ public class _SharedRendererUtilsTest extends AbstractJsfTestCase
* integer array and uses a standard jsf converter.
*/
@SuppressWarnings("unchecked")
+ @Test
public void testGetConvertedUISelectManyValuePrimitiveIntArray()
{
externalContext.getApplicationMap().put("bean", new Bean());
@@ -227,6 +230,7 @@ public class _SharedRendererUtilsTest extends AbstractJsfTestCase
* Float array and uses a standard jsf converter.
*/
@SuppressWarnings("unchecked")
+ @Test
public void testGetConvertedUISelectManyValueNonPrimitiveFloatArray()
{
externalContext.getApplicationMap().put("bean", new Bean());
@@ -244,6 +248,7 @@ public class _SharedRendererUtilsTest extends AbstractJsfTestCase
* POJO array and uses a provided converter.
*/
@SuppressWarnings("unchecked")
+ @Test
public void testGetConvertedUISelectManyValuePOJOArray()
{
externalContext.getApplicationMap().put("bean", new Bean());
@@ -264,6 +269,7 @@ public class _SharedRendererUtilsTest extends AbstractJsfTestCase
* retrieves #{bean.pojoCollectionValue} and clones that Collection.
*/
@SuppressWarnings("unchecked")
+ @Test
public void testGetConvertedUISelectManyValuePOJOCollectionWithoutCollectionType()
{
externalContext.getApplicationMap().put("bean", new Bean());
@@ -285,6 +291,7 @@ public class _SharedRendererUtilsTest extends AbstractJsfTestCase
* create the right Collection.
*/
@SuppressWarnings("unchecked")
+ @Test
public void testGetConvertedUISelectManyValuePOJOCollectionWithCollectionType()
{
externalContext.getApplicationMap().put("bean", new Bean());
@@ -304,6 +311,7 @@ public class _SharedRendererUtilsTest extends AbstractJsfTestCase
* obtain a converter. So it throws a ConverterException.
*/
@SuppressWarnings("unchecked")
+ @Test
public void testGetConvertedUISelectManyValueNoConverter()
{
externalContext.getApplicationMap().put("bean", new Bean());
@@ -325,6 +333,7 @@ public class _SharedRendererUtilsTest extends AbstractJsfTestCase
* (java.util.Collection can not be instantiated). So it throws a FacesException.
*/
@SuppressWarnings("unchecked")
+ @Test
public void testGetConvertedUISelectManyValueWrongCollectionType()
{
externalContext.getApplicationMap().put("bean", new Bean());
diff --git a/impl/src/test/java/jakarta/faces/convert/DateTimeConverterTest.java b/impl/src/test/java/jakarta/faces/convert/DateTimeConverterTest.java
index f640411bd..ea63c75cf 100644
--- a/impl/src/test/java/jakarta/faces/convert/DateTimeConverterTest.java
+++ b/impl/src/test/java/jakarta/faces/convert/DateTimeConverterTest.java
@@ -31,6 +31,7 @@ import jakarta.faces.context.FacesContext;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.junit.Assert;
+import org.junit.Test;
public class DateTimeConverterTest extends AbstractJsfTestCase
{
@@ -59,6 +60,7 @@ public class DateTimeConverterTest extends AbstractJsfTestCase
/*
* Test method for 'jakarta.faces.component.UIComponentBase.getAsObject()'
*/
+ @Test
public void testGetAsObject()
{
diff --git a/impl/src/test/java/jakarta/faces/convert/EnumConverterTest.java b/impl/src/test/java/jakarta/faces/convert/EnumConverterTest.java
index 3d22fd5ee..5e5a884a4 100644
--- a/impl/src/test/java/jakarta/faces/convert/EnumConverterTest.java
+++ b/impl/src/test/java/jakarta/faces/convert/EnumConverterTest.java
@@ -27,6 +27,7 @@ import jakarta.faces.context.FacesContext;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.junit.Assert;
+import org.junit.Test;
/**
* This testcase test <code>jakarta.faces.convert.EnumConverter</code>.
@@ -67,6 +68,7 @@ public class EnumConverterTest extends AbstractJsfTestCase
* Test method for
* {@link jakarta.faces.convert.EnumConverter#getAsObject(FacesContext, jakarta.faces.component.UIComponent, String)}.
*/
+ @Test
public void testGetAsObject()
{
UIInput input = new UIInput();
@@ -78,6 +80,7 @@ public class EnumConverterTest extends AbstractJsfTestCase
* Test method for
* {@link jakarta.faces.convert.EnumConverter#getAsObject(FacesContext, jakarta.faces.component.UIComponent, String)}.
*/
+ @Test
public void testGetAsObjectNull()
{
UIInput input = new UIInput();
@@ -89,6 +92,7 @@ public class EnumConverterTest extends AbstractJsfTestCase
* Test method for
* {@link jakarta.faces.convert.EnumConverter#getAsObject(FacesContext, jakarta.faces.component.UIComponent, String)}.
*/
+ @Test
public void testGetAsObjectNoEnum()
{
UIInput input = new UIInput();
@@ -107,6 +111,7 @@ public class EnumConverterTest extends AbstractJsfTestCase
* Test method for
* {@link jakarta.faces.convert.EnumConverter#getAsObject(FacesContext, jakarta.faces.component.UIComponent, String)}.
*/
+ @Test
public void testGetAsObjectNoClassSet()
{
Converter testConverter = new EnumConverter();
@@ -126,6 +131,7 @@ public class EnumConverterTest extends AbstractJsfTestCase
* Test method for
* {@link jakarta.faces.convert.EnumConverter#getAsString(FacesContext, jakarta.faces.component.UIComponent, Object)}.
*/
+ @Test
public void testGetAsString()
{
UIInput input = new UIInput();
@@ -137,6 +143,7 @@ public class EnumConverterTest extends AbstractJsfTestCase
* Test method for
* {@link jakarta.faces.convert.EnumConverter#getAsString(FacesContext, jakarta.faces.component.UIComponent, Object)}.
*/
+ @Test
public void testGetAsStringNull()
{
UIInput input = new UIInput();
@@ -148,6 +155,7 @@ public class EnumConverterTest extends AbstractJsfTestCase
* Test method for
* {@link jakarta.faces.convert.EnumConverter#getAsString(FacesContext, jakarta.faces.component.UIComponent, Object)}.
*/
+ @Test
public void testGetAsStringNoEnum()
{
UIInput input = new UIInput();
@@ -166,6 +174,7 @@ public class EnumConverterTest extends AbstractJsfTestCase
* Test method for
* {@link jakarta.faces.convert.EnumConverter#getAsString(FacesContext, jakarta.faces.component.UIComponent, Object)}.
*/
+ @Test
public void testGetAsStringNoClassSet()
{
Converter testConverter = new EnumConverter();
diff --git a/impl/src/test/java/jakarta/faces/convert/MessageUtilsTest.java b/impl/src/test/java/jakarta/faces/convert/MessageUtilsTest.java
index fd624afe3..0b66125e4 100644
--- a/impl/src/test/java/jakarta/faces/convert/MessageUtilsTest.java
+++ b/impl/src/test/java/jakarta/faces/convert/MessageUtilsTest.java
@@ -25,6 +25,7 @@ import org.apache.myfaces.core.api.shared.MessageUtils;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.test.el.MockValueExpression;
import org.junit.Assert;
+import org.junit.Test;
public class MessageUtilsTest extends AbstractJsfTestCase
{
@@ -41,6 +42,7 @@ public class MessageUtilsTest extends AbstractJsfTestCase
super.tearDown();
}
+ @Test
public void testGetLabelFromAttributesMap()
{
HtmlInputText inputText = new HtmlInputText();
@@ -49,6 +51,7 @@ public class MessageUtilsTest extends AbstractJsfTestCase
Assert.assertEquals("testLabel", label);
}
+ @Test
public void testGetLabelFromValueExpression()
{
facesContext.getExternalContext().getRequestMap().put("lbl", "testLabel");
@@ -60,6 +63,7 @@ public class MessageUtilsTest extends AbstractJsfTestCase
Assert.assertEquals("testLabel", label);
}
+ @Test
public void testGetLabelReturnsClientIdWhenLabelIsNotSpecified()
{
HtmlInputText inputText = new HtmlInputText();
diff --git a/impl/src/test/java/jakarta/faces/event/MethodExpressionActionListenerTest.java b/impl/src/test/java/jakarta/faces/event/MethodExpressionActionListenerTest.java
index 61b89cf24..791b11fe0 100644
--- a/impl/src/test/java/jakarta/faces/event/MethodExpressionActionListenerTest.java
+++ b/impl/src/test/java/jakarta/faces/event/MethodExpressionActionListenerTest.java
@@ -30,6 +30,7 @@ import jakarta.faces.component.UICommand;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.easymock.classextension.EasyMock;
import org.junit.Assert;
+import org.junit.Test;
/**
* Tests for {@link MethodExpressionActionListener}
@@ -70,17 +71,20 @@ public class MethodExpressionActionListenerTest extends AbstractJsfTestCase
super.tearDown();
}
+ @Test
public void testMethodExpressionActionListener()
{
methodExpressionActionListener = new MethodExpressionActionListener();
}
+ @Test
public void testMethodExpressionActionListenerMethodExpression()
{
EasyMock.replay(methodExpressionOneArg);
methodExpressionActionListener = new MethodExpressionActionListener(methodExpressionOneArg);
}
+ @Test
public void testMethodExpressionActionListenerMethodExpressionMethodExpression()
{
EasyMock.replay(methodExpressionOneArg);
@@ -92,6 +96,7 @@ public class MethodExpressionActionListenerTest extends AbstractJsfTestCase
/**
* Test for case: method with ActionEvent param exists (pre-Faces 2.0 case)
*/
+ @Test
public void testProcessAction()
{
// First, try to invoke the MethodExpression passed to the constructor of this instance,
@@ -109,6 +114,7 @@ public class MethodExpressionActionListenerTest extends AbstractJsfTestCase
/**
* Test for case: method exists but has no ActionEvent param (new possibility in Faces 2.0)
*/
+ @Test
public void testProcessAction2() throws Exception
{
// First, try to invoke the MethodExpression passed to the constructor of this instance,
@@ -131,6 +137,7 @@ public class MethodExpressionActionListenerTest extends AbstractJsfTestCase
EasyMock.verify(methodExpressionZeroArg);
}
+ @Test
public void testSaveState()
{
methodExpressionActionListener = new MethodExpressionActionListener(methodExpressionOneArg, methodExpressionZeroArg);
@@ -139,6 +146,7 @@ public class MethodExpressionActionListenerTest extends AbstractJsfTestCase
Arrays.deepEquals(expectedState, (Object[]) methodExpressionActionListener.saveState(facesContext)));
}
+ @Test
public void testRestoreState() throws IllegalAccessException, NoSuchFieldException
{
// State saving always call JavaBean constructor:
diff --git a/impl/src/test/java/jakarta/faces/event/MethodExpressionValueChangeListenerTest.java b/impl/src/test/java/jakarta/faces/event/MethodExpressionValueChangeListenerTest.java
index d5e372c3a..25bc06e7d 100644
--- a/impl/src/test/java/jakarta/faces/event/MethodExpressionValueChangeListenerTest.java
+++ b/impl/src/test/java/jakarta/faces/event/MethodExpressionValueChangeListenerTest.java
@@ -30,6 +30,7 @@ import jakarta.faces.component.UICommand;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.easymock.classextension.EasyMock;
import org.junit.Assert;
+import org.junit.Test;
/**
* Tests for {@link MethodExpressionValueChangeListener}
@@ -44,6 +45,7 @@ public class MethodExpressionValueChangeListenerTest extends AbstractJsfTestCase
private ValueChangeEvent valueChangeEvent;
private Object[] paramsWithValueChangeEvent;
+ @Override
public void setUp() throws Exception
{
super.setUp();
@@ -58,6 +60,7 @@ public class MethodExpressionValueChangeListenerTest extends AbstractJsfTestCase
methodExpressionZeroArg = EasyMock.createNiceMock(MethodExpression.class);
}
+ @Override
public void tearDown() throws Exception
{
uiComponent = null;
@@ -68,17 +71,20 @@ public class MethodExpressionValueChangeListenerTest extends AbstractJsfTestCase
super.tearDown();
}
+ @Test
public void testMethodExpressionValueChangeListener()
{
methodExpressionValueChangeListener = new MethodExpressionValueChangeListener();
}
+ @Test
public void testMethodExpressionValueChangeListenerMethodExpression()
{
EasyMock.replay(methodExpressionOneArg);
methodExpressionValueChangeListener = new MethodExpressionValueChangeListener(methodExpressionOneArg);
}
+ @Test
public void testMethodExpressionValueChangeListenerMethodExpressionMethodExpression()
{
EasyMock.replay(methodExpressionOneArg);
@@ -90,6 +96,7 @@ public class MethodExpressionValueChangeListenerTest extends AbstractJsfTestCase
/**
* Test for case: method with ValueChangeEvent param exists (pre-Faces 2.0 case)
*/
+ @Test
public void testProcessValueChange()
{
// First, try to invoke the MethodExpression passed to the constructor of this instance,
@@ -107,6 +114,7 @@ public class MethodExpressionValueChangeListenerTest extends AbstractJsfTestCase
/**
* Test for case: method exists but has no ValueChangeEvent param (new possibility in Faces 2.0)
*/
+ @Test
public void testProcessValueChange2() throws Exception
{
// First, try to invoke the MethodExpression passed to the constructor of this instance,
@@ -129,6 +137,7 @@ public class MethodExpressionValueChangeListenerTest extends AbstractJsfTestCase
EasyMock.verify(methodExpressionZeroArg);
}
+ @Test
public void testSaveState()
{
methodExpressionValueChangeListener = new MethodExpressionValueChangeListener(methodExpressionOneArg, methodExpressionZeroArg);
@@ -137,6 +146,7 @@ public class MethodExpressionValueChangeListenerTest extends AbstractJsfTestCase
Arrays.deepEquals(expectedState, (Object[]) methodExpressionValueChangeListener.saveState(facesContext)));
}
+ @Test
public void testRestoreState() throws IllegalAccessException, NoSuchFieldException
{
// State saving always call JavaBean constructor:
diff --git a/impl/src/test/java/jakarta/faces/validator/_MessageUtilsTest.java b/impl/src/test/java/jakarta/faces/validator/_MessageUtilsTest.java
index 6abe6fdf1..2a84b699f 100644
--- a/impl/src/test/java/jakarta/faces/validator/_MessageUtilsTest.java
+++ b/impl/src/test/java/jakarta/faces/validator/_MessageUtilsTest.java
@@ -32,8 +32,6 @@ import jakarta.faces.application.ViewHandler;
import jakarta.faces.component.UIViewRoot;
import jakarta.faces.context.ExternalContext;
import org.apache.myfaces.test.mock.MockFacesContext;
-
-import org.apache.myfaces.test.mock.MockFacesContext12;
import org.easymock.classextension.EasyMock;
import org.easymock.classextension.IMocksControl;
import org.junit.Assert;
diff --git a/impl/src/test/java/org/apache/myfaces/application/ApplicationImplJsfTest.java b/impl/src/test/java/org/apache/myfaces/application/ApplicationImplJsfTest.java
index cd7043975..024d3334a 100644
--- a/impl/src/test/java/org/apache/myfaces/application/ApplicationImplJsfTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/ApplicationImplJsfTest.java
@@ -36,6 +36,7 @@ import org.apache.myfaces.view.facelets.mock.MockViewDeclarationLanguageFactory;
import org.easymock.classextension.EasyMock;
import org.easymock.classextension.IMocksControl;
import org.junit.Assert;
+import org.junit.Test;
/**
* Test class for ApplicationImpl that extends AbstractJsfTestCase
@@ -141,6 +142,7 @@ public class ApplicationImplJsfTest extends AbstractJsfTestCase
* Tests the creation of a composite component via
* Application.createComponent(FacesContext context, Resource componentResource)
*/
+ @Test
public void testCreateComponentFromResource()
{
/* TODO: Make it work again
diff --git a/impl/src/test/java/org/apache/myfaces/application/ClientBehaviorTestCase.java b/impl/src/test/java/org/apache/myfaces/application/ClientBehaviorTestCase.java
index 22425fc06..1c1d37bf5 100644
--- a/impl/src/test/java/org/apache/myfaces/application/ClientBehaviorTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/application/ClientBehaviorTestCase.java
@@ -117,6 +117,7 @@ public class ClientBehaviorTestCase extends AbstractJsfConfigurableMockTestCase
return COMPONENT_FAMILY;
}
+ @Override
public java.util.Collection<String> getEventNames()
{
return CLIENT_EVENTS_LIST;
diff --git a/impl/src/test/java/org/apache/myfaces/application/ViewIdSupportMockTest.java b/impl/src/test/java/org/apache/myfaces/application/ViewIdSupportMockTest.java
index 70346ee3c..cd61da75f 100644
--- a/impl/src/test/java/org/apache/myfaces/application/ViewIdSupportMockTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/ViewIdSupportMockTest.java
@@ -58,6 +58,7 @@ public class ViewIdSupportMockTest extends FacesTestCase
Assert.assertEquals(expectedValue, viewIdSupport.calculateViewId(_facesContext));
}
+ @Test
public void testCalculateViewIdFromRequestPathInfo()
{
Mockito.when(_externalContext.getRequestMap()).thenReturn(Collections.emptyMap());
@@ -67,7 +68,8 @@ public class ViewIdSupportMockTest extends FacesTestCase
Assert.assertEquals(expectedValue, viewIdSupport.calculateViewId(_facesContext));
}
-
+
+ @Test
public void testCalculateViewIdFromRequestAttributeIncludeServletPath()
{
Map<String, Object> map = new HashMap<String, Object>();
@@ -80,6 +82,7 @@ public class ViewIdSupportMockTest extends FacesTestCase
Assert.assertEquals(expectedValue, viewIdSupport.calculateViewId(_facesContext));
}
+ @Test
public void testCalculateViewIdFromRequestServletPath()
{
Mockito.when(_externalContext.getRequestMap()).thenReturn(Collections.emptyMap());
@@ -90,6 +93,7 @@ public class ViewIdSupportMockTest extends FacesTestCase
Assert.assertEquals(expectedValue, viewIdSupport.calculateViewId(_facesContext));
}
+ @Test
public void testCalculateViewIdFacesException()
{
Mockito.when(_externalContext.getRequestMap()).thenReturn(Collections.emptyMap());
@@ -98,6 +102,7 @@ public class ViewIdSupportMockTest extends FacesTestCase
MyFacesAsserts.assertException(FacesException.class, new TestRunner()
{
+ @Override
public void run() throws Throwable
{
viewIdSupport.calculateViewId(_facesContext);
diff --git a/impl/src/test/java/org/apache/myfaces/application/viewstate/AbstractStateUtilsTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/AbstractStateUtilsTest.java
index 5c1ff62bb..4f0cb34d6 100644
--- a/impl/src/test/java/org/apache/myfaces/application/viewstate/AbstractStateUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/AbstractStateUtilsTest.java
@@ -27,6 +27,7 @@ import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import java.io.Serializable;
import java.util.Arrays;
import org.junit.Assert;
+import org.junit.Test;
public abstract class AbstractStateUtilsTest extends AbstractJsfTestCase implements Serializable
{
@@ -40,6 +41,7 @@ public abstract class AbstractStateUtilsTest extends AbstractJsfTestCase impleme
public static final String BASE64_KEY_SIZE_24 = "MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIz";
+ @Override
public void setUp() throws Exception
{
super.setUp();
@@ -47,6 +49,7 @@ public abstract class AbstractStateUtilsTest extends AbstractJsfTestCase impleme
externalContext.getApplicationMap().put(StateUtils.SERIAL_FACTORY, new DefaultSerialFactory());
}
+ @Override
public void tearDown() throws Exception
{
super.tearDown();
@@ -56,7 +59,7 @@ public abstract class AbstractStateUtilsTest extends AbstractJsfTestCase impleme
/**
* Test for Restore View phase.
*/
-
+ @Test
public void testConstructionString()
{
String constructed = StateUtils.construct(sensitiveString, externalContext);
@@ -70,7 +73,7 @@ public abstract class AbstractStateUtilsTest extends AbstractJsfTestCase impleme
* Test for Restore View phase. This method actually runs an instance of
* StateUtilsTestCase through the construct/reconstruct process.
*/
-
+ @Test
public void testConstruction()
{
String constructed = StateUtils.construct(TEST_DATA, externalContext);
@@ -78,6 +81,7 @@ public abstract class AbstractStateUtilsTest extends AbstractJsfTestCase impleme
Assert.assertTrue(TEST_DATA.equals(object));
}
+ @Test
public void testSerialization()
{
byte[] bytes = StateUtils.getAsByteArray(TEST_DATA, externalContext);
@@ -85,6 +89,7 @@ public abstract class AbstractStateUtilsTest extends AbstractJsfTestCase impleme
Assert.assertTrue(TEST_DATA.equals(object));
}
+ @Test
public void testCryptography()
{
byte[] sensitiveBytes = sensitiveString.getBytes();
@@ -95,6 +100,7 @@ public abstract class AbstractStateUtilsTest extends AbstractJsfTestCase impleme
Assert.assertTrue(Arrays.equals(insecure, sensitiveBytes));
}
+ @Test
public void testCompression()
{
int size = 2049;
@@ -106,6 +112,7 @@ public abstract class AbstractStateUtilsTest extends AbstractJsfTestCase impleme
Assert.assertTrue(Arrays.equals(moreBytes, orginalBytes));
}
+ @Test
public void testEncoding()
{
byte[] orginalBytes = sensitiveString.getBytes();
@@ -117,7 +124,7 @@ public abstract class AbstractStateUtilsTest extends AbstractJsfTestCase impleme
/**
* Simulates testConstruction w/ corrupt data.
*/
-
+ @Test
public void testConstructionNegative()
{
String constructed = StateUtils.construct(TEST_DATA, externalContext);
@@ -136,7 +143,7 @@ public abstract class AbstractStateUtilsTest extends AbstractJsfTestCase impleme
/**
* Simulates testSerialization w/ corrput data.
*/
-
+ @Test
public void testSerializationNegative()
{
byte[] bytes = StateUtils.getAsByteArray(TEST_DATA, externalContext);
@@ -156,7 +163,7 @@ public abstract class AbstractStateUtilsTest extends AbstractJsfTestCase impleme
/**
* Simulates testCryptography w/ corrupt data.
*/
-
+ @Test
public void testCryptographyNegative()
{
byte[] sensitiveBytes = sensitiveString.getBytes();
@@ -177,7 +184,7 @@ public abstract class AbstractStateUtilsTest extends AbstractJsfTestCase impleme
/**
* Simulates testCompression w/ corrupt data.
*/
-
+ @Test
public void testCompressionNegative()
{
int size = 2049;
@@ -198,7 +205,7 @@ public abstract class AbstractStateUtilsTest extends AbstractJsfTestCase impleme
/**
* Simulates testEncoding w/ corrupt data.
*/
-
+ @Test
public void testEncodingNegative()
{
byte[] orginalBytes = sensitiveString.getBytes();
diff --git a/impl/src/test/java/org/apache/myfaces/application/viewstate/InitVector_CBCTestCase.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/InitVector_CBCTestCase.java
index b31e0e319..0f6c71fe7 100644
--- a/impl/src/test/java/org/apache/myfaces/application/viewstate/InitVector_CBCTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/InitVector_CBCTestCase.java
@@ -21,9 +21,11 @@ import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import jakarta.faces.FacesException;
import org.junit.Assert;
+import org.junit.Test;
public class InitVector_CBCTestCase extends AbstractJsfTestCase
{
+ @Override
public void setUp() throws Exception
{
super.setUp();
@@ -38,6 +40,7 @@ public class InitVector_CBCTestCase extends AbstractJsfTestCase
}
+ @Test
public void testDecryption()
{
byte[] sensitiveBytes = "bound to fail".getBytes();
@@ -55,6 +58,7 @@ public class InitVector_CBCTestCase extends AbstractJsfTestCase
}
+ @Test
public void testEncryption() {
byte[] sensitiveBytes = "bound to fail".getBytes();
diff --git a/impl/src/test/java/org/apache/myfaces/application/viewstate/SecretKeyCacheTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/SecretKeyCacheTest.java
index 23264c42f..8bf736235 100644
--- a/impl/src/test/java/org/apache/myfaces/application/viewstate/SecretKeyCacheTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/SecretKeyCacheTest.java
@@ -22,10 +22,12 @@ import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import javax.crypto.SecretKey;
import org.junit.Assert;
+import org.junit.Test;
public class SecretKeyCacheTest extends AbstractJsfTestCase
{
+ @Override
public void setUp() throws Exception
{
super.setUp();
@@ -35,6 +37,7 @@ public class SecretKeyCacheTest extends AbstractJsfTestCase
servletContext.addInitParameter(StateUtils.INIT_MAC_SECRET, AbstractStateUtilsTest.BASE64_KEY_SIZE_8);
}
+ @Test
public void testDefaultAlgorithmUse(){
StateUtils.initSecret(servletContext);
@@ -47,6 +50,7 @@ public class SecretKeyCacheTest extends AbstractJsfTestCase
}
+ @Test
public void testInitFacesWithoutCache(){
servletContext.addInitParameter(StateUtils.INIT_SECRET_KEY_CACHE, "false");
@@ -59,6 +63,7 @@ public class SecretKeyCacheTest extends AbstractJsfTestCase
}
+ @Test
public void testInitFacesWithCache(){
StateUtils.initSecret(servletContext);
diff --git a/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java b/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java
index d92251bec..746db70d3 100644
--- a/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java
@@ -27,6 +27,7 @@ import org.apache.myfaces.config.impl.FacesConfigUnmarshallerImpl;
import org.apache.myfaces.config.impl.element.FacesConfigImpl;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.junit.Assert;
+import org.junit.Test;
public class FacesConfigValidatorTestCase extends AbstractJsfTestCase
{
@@ -52,6 +53,7 @@ public class FacesConfigValidatorTestCase extends AbstractJsfTestCase
}
+ @Test
public void testVerifyExistence(){
Collection<NavigationRule> navRules = dispenser.getNavigationRules();
diff --git a/impl/src/test/java/org/apache/myfaces/config/LogMetaInfUtilsTestCase.java b/impl/src/test/java/org/apache/myfaces/config/LogMetaInfUtilsTestCase.java
index a39b2d6b7..f4befdff5 100644
--- a/impl/src/test/java/org/apache/myfaces/config/LogMetaInfUtilsTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/config/LogMetaInfUtilsTestCase.java
@@ -26,9 +26,11 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.junit.Assert;
+import org.junit.Test;
public class LogMetaInfUtilsTestCase extends AbstractJsfTestCase
{
+ @Test
public void testVersionNumber() throws Exception
{
diff --git a/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java b/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java
index b6829ca74..16bf899c8 100644
--- a/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java
+++ b/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java
@@ -31,6 +31,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.myfaces.config.impl.FacesConfigUnmarshallerImpl;
import org.junit.Assert;
+import org.junit.Test;
public class OrderingFacesConfigTest extends AbstractJsfTestCase
{
@@ -75,6 +76,7 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
*
* @throws Exception
*/
+ @Test
public void testSimpleOrdering() throws Exception
{
FacesConfig cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
@@ -118,6 +120,7 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
*
* @throws Exception
*/
+ @Test
public void testMiddleOrdering() throws Exception
{
FacesConfig cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
@@ -194,6 +197,7 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
*
* @throws Exception
*/
+ @Test
public void testMaxConditionsOrdering() throws Exception
{
org.apache.myfaces.config.impl.element.FacesConfigImpl cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
@@ -243,6 +247,7 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
}
}
+ @Test
public void testEx1()
{
org.apache.myfaces.config.impl.element.FacesConfigImpl cfgA = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
@@ -294,6 +299,7 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
}
}
+ @Test
public void testEx2()
{
org.apache.myfaces.config.impl.element.FacesConfigImpl cfg = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
@@ -340,6 +346,7 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
}
}
+ @Test
public void testEx3()
{
org.apache.myfaces.config.impl.element.FacesConfigImpl cfgA = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
@@ -375,6 +382,7 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
}
}
+ @Test
public void testEx4() throws Exception
{
FacesConfig cfgA = _impl.getFacesConfig(getClass().getResourceAsStream(
@@ -414,6 +422,7 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
//printFacesConfigList("Sorted List", sortedList);
}
+ @Test
public void testBeforeOthers1() throws Exception
{
FacesConfig cfgA = _impl.getFacesConfig(getClass().getResourceAsStream(
@@ -444,6 +453,7 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
}
}
+ @Test
public void testAfterOthers1() throws Exception
{
FacesConfig cfgA = _impl.getFacesConfig(getClass().getResourceAsStream(
@@ -474,6 +484,7 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
}
}
+ @Test
public void testBeforeOthers2() throws Exception
{
FacesConfig cfg1 = _impl.getFacesConfig(getClass().getResourceAsStream(
@@ -851,6 +862,7 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
System.out.println("]");
}
+ @Test
public void testAbsoluteOrdering1() throws Exception
{
org.apache.myfaces.config.impl.element.FacesConfigImpl cfgAbs = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
diff --git a/impl/src/test/java/org/apache/myfaces/context/ExecutePhaseClientIdsTest.java b/impl/src/test/java/org/apache/myfaces/context/ExecutePhaseClientIdsTest.java
index 7ea7bc4a5..0f0d74bbf 100644
--- a/impl/src/test/java/org/apache/myfaces/context/ExecutePhaseClientIdsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/context/ExecutePhaseClientIdsTest.java
@@ -26,6 +26,7 @@ import jakarta.faces.context.PartialViewContext;
import org.apache.myfaces.context.servlet.FacesContextImpl;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.junit.Assert;
+import org.junit.Test;
/**
*
@@ -47,6 +48,7 @@ public class ExecutePhaseClientIdsTest extends AbstractJsfTestCase {
* Empty String as request param
* has to result in an empty list
*/
+ @Test
public void testRequestParams1() {
String empty = " \n \t ";
Map<String, String> requestParamMap = new HashMap<String, String>();
@@ -63,6 +65,7 @@ public class ExecutePhaseClientIdsTest extends AbstractJsfTestCase {
/**
* no request param, has to result in an empty list
*/
+ @Test
public void testRequestParams2() {
Map<String, String> requestParamMap = new HashMap<String, String>();
ContextTestRequestWrapper wrapper = new ContextTestRequestWrapper(request, requestParamMap);
@@ -94,6 +97,7 @@ public class ExecutePhaseClientIdsTest extends AbstractJsfTestCase {
/**
* list with one element has to result in a list with one element
*/
+ @Test
public void testRequestParams5() {
String params = " view1:panel1:_component1 ";
Map<String, String> requestParamMap = new HashMap<String, String>();
@@ -112,6 +116,7 @@ public class ExecutePhaseClientIdsTest extends AbstractJsfTestCase {
* test on a full blown list containing various
* blank chars
*/
+ @Test
public void testRequestParams6() {
String params = " view1:panel1:_component1 view1:panel1:_component2 \n component3 component4 ";
Map<String, String> requestParamMap = new HashMap<String, String>();
diff --git a/impl/src/test/java/org/apache/myfaces/context/IsRenderedTest.java b/impl/src/test/java/org/apache/myfaces/context/IsRenderedTest.java
index de8c81bb7..329267f6a 100644
--- a/impl/src/test/java/org/apache/myfaces/context/IsRenderedTest.java
+++ b/impl/src/test/java/org/apache/myfaces/context/IsRenderedTest.java
@@ -22,6 +22,7 @@ import jakarta.faces.context.PartialViewContext;
import org.apache.myfaces.context.servlet.FacesContextImpl;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.junit.Assert;
+import org.junit.Test;
/**
* Various tests for the faces context is rendered
@@ -46,6 +47,7 @@ public class IsRenderedTest extends AbstractJsfTestCase {
* no render all due to defaults
* or a renderAll which
*/
+ @Test
public void testRenderAll1() {
FacesContext context = new FacesContextImpl(servletContext, request, response);
diff --git a/impl/src/test/java/org/apache/myfaces/context/PartialResponseWriterImplTest.java b/impl/src/test/java/org/apache/myfaces/context/PartialResponseWriterImplTest.java
index 7557744b9..740757df5 100644
--- a/impl/src/test/java/org/apache/myfaces/context/PartialResponseWriterImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/context/PartialResponseWriterImplTest.java
@@ -120,6 +120,7 @@ public class PartialResponseWriterImplTest extends AbstractJsfTestCase {
+ "/";
}
+ @Test
public void testNestedScriptCDATA() throws Exception {
_writer = createTestProbe();
try {
@@ -140,6 +141,7 @@ public class PartialResponseWriterImplTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testBasicWriteTest() {
_writer = createTestProbe();
try {
@@ -156,6 +158,7 @@ public class PartialResponseWriterImplTest extends AbstractJsfTestCase {
}
}
+ @Test
public void teststandardNestingTest() {
_writer = createTestProbe();
try {
@@ -172,6 +175,7 @@ public class PartialResponseWriterImplTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testIllegalNestingResolvementTest() {
_writer = createTestProbe();
try {
@@ -188,6 +192,7 @@ public class PartialResponseWriterImplTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testIllegalNestingResolvementTest2() {
_writer = createTestProbe();
try {
@@ -203,7 +208,7 @@ public class PartialResponseWriterImplTest extends AbstractJsfTestCase {
}
-
+ @Test
public void testStandardUpdate() {
_writer = createTestProbe();
try {
@@ -216,6 +221,7 @@ public class PartialResponseWriterImplTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testStandardUpdateNestedCDATA() {
_writer = createTestProbe();
try {
@@ -230,7 +236,7 @@ public class PartialResponseWriterImplTest extends AbstractJsfTestCase {
}
}
-
+ @Test
public void testComponentAuthorNestingFailureTest() {
_writer = createTestProbe();
try {
@@ -245,6 +251,7 @@ public class PartialResponseWriterImplTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testStandardInsertAfter() {
_writer = createTestProbe();
try {
@@ -257,6 +264,7 @@ public class PartialResponseWriterImplTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testStandardInsertBefore() {
_writer = createTestProbe();
try {
@@ -269,6 +277,7 @@ public class PartialResponseWriterImplTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testBrokenUserInput() {
_writer = createTestProbe();
try {
@@ -285,7 +294,7 @@ public class PartialResponseWriterImplTest extends AbstractJsfTestCase {
}
-
+ @Test
public void testDelete() {
_writer = createTestProbe();
try {
@@ -296,6 +305,7 @@ public class PartialResponseWriterImplTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testWriteIllegalXmlUnicodeCharacters() {
_writer = createTestProbe();
try {
@@ -309,6 +319,7 @@ public class PartialResponseWriterImplTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testWriteTextIllegalXmlUnicodeCharacters() {
_writer = createTestProbe();
try {
@@ -322,6 +333,7 @@ public class PartialResponseWriterImplTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testWriteAttributeIllegalXmlUnicodeCharacters() {
_writer = createTestProbe();
try {
@@ -338,6 +350,7 @@ public class PartialResponseWriterImplTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testWriteSkipEmoji() {
_writer = createTestProbe();
try {
@@ -353,6 +366,7 @@ public class PartialResponseWriterImplTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testWriteSkipPictographs() {
_writer = createTestProbe();
try {
diff --git a/impl/src/test/java/org/apache/myfaces/context/RenderPhaseClientIdsTest.java b/impl/src/test/java/org/apache/myfaces/context/RenderPhaseClientIdsTest.java
index f9a28c7bd..cbbfe0b70 100644
--- a/impl/src/test/java/org/apache/myfaces/context/RenderPhaseClientIdsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/context/RenderPhaseClientIdsTest.java
@@ -25,6 +25,7 @@ import jakarta.faces.context.PartialViewContext;
import org.apache.myfaces.context.servlet.FacesContextImpl;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.junit.Assert;
+import org.junit.Test;
/**
* Testcases for the request parameter handling
@@ -49,6 +50,7 @@ public class RenderPhaseClientIdsTest extends AbstractJsfTestCase {
* Empty String as request param
* has to result in an empty list
*/
+ @Test
public void testRequestParams1() {
String empty = " \n \t ";
Map<String, String> requestParamMap = new HashMap<String, String>();
@@ -65,6 +67,7 @@ public class RenderPhaseClientIdsTest extends AbstractJsfTestCase {
/**
* no request param, has to result in an empty list
*/
+ @Test
public void testRequestParams2() {
Map<String, String> requestParamMap = new HashMap<String, String>();
ContextTestRequestWrapper wrapper = new ContextTestRequestWrapper(request, requestParamMap);
@@ -96,6 +99,7 @@ public class RenderPhaseClientIdsTest extends AbstractJsfTestCase {
/**
* list with one element has to result in a list with one element
*/
+ @Test
public void testRequestParams5() {
String params = " view1:panel1:_component1 ";
Map<String, String> requestParamMap = new HashMap<String, String>();
@@ -114,6 +118,7 @@ public class RenderPhaseClientIdsTest extends AbstractJsfTestCase {
* test on a full blown list containing various
* blank chars
*/
+ @Test
public void testRequestParams6() {
String params = " view1:panel1:_component1 view1:panel1:_component2 \n component3 component4 ";
Map<String, String> requestParamMap = new HashMap<String, String>();
diff --git a/impl/src/test/java/org/apache/myfaces/context/ResponseWrapperSwitchTest.java b/impl/src/test/java/org/apache/myfaces/context/ResponseWrapperSwitchTest.java
index a13ebc75e..45134e2dd 100644
--- a/impl/src/test/java/org/apache/myfaces/context/ResponseWrapperSwitchTest.java
+++ b/impl/src/test/java/org/apache/myfaces/context/ResponseWrapperSwitchTest.java
@@ -32,6 +32,7 @@ import org.apache.myfaces.context.servlet.FacesContextImpl;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockResponseWriter;
import org.junit.Assert;
+import org.junit.Test;
/**
* Testcase for the response switching
@@ -149,6 +150,7 @@ public class ResponseWrapperSwitchTest extends AbstractJsfTestCase {
* testing the off switch for the
* response
*/
+ @Test
public void testSwitchOnWriter() {
ByteArrayOutputStream ostr = new ByteArrayOutputStream();
diff --git a/impl/src/test/java/org/apache/myfaces/context/TestIsAjaxRequest.java b/impl/src/test/java/org/apache/myfaces/context/TestIsAjaxRequest.java
index d0dd645f3..8e43495a3 100644
--- a/impl/src/test/java/org/apache/myfaces/context/TestIsAjaxRequest.java
+++ b/impl/src/test/java/org/apache/myfaces/context/TestIsAjaxRequest.java
@@ -23,6 +23,7 @@ import jakarta.faces.context.FacesContext;
import org.apache.myfaces.context.servlet.FacesContextImpl;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.junit.Assert;
+import org.junit.Test;
/**
* Tests the facesContext isAjaxRequest
@@ -35,6 +36,7 @@ public class TestIsAjaxRequest extends AbstractJsfTestCase {
Map<String, String> requestParameterMap = null;
FacesContext context = null;
+ @Override
public void setUp() throws Exception {
super.setUp();
@@ -47,11 +49,7 @@ public class TestIsAjaxRequest extends AbstractJsfTestCase {
context = new FacesContextImpl(servletContext, request, response);
}
- public void tearDown() throws Exception {
- super.tearDown();
- //requestParameterMap.clear();
- }
-
+ @Test
public void testNoEntry() {
Assert.assertFalse("no ajax request found", context.getPartialViewContext().isAjaxRequest());
diff --git a/impl/src/test/java/org/apache/myfaces/lifecycle/RestoreViewExecutorTest.java b/impl/src/test/java/org/apache/myfaces/lifecycle/RestoreViewExecutorTest.java
index de517945a..c64d8087b 100644
--- a/impl/src/test/java/org/apache/myfaces/lifecycle/RestoreViewExecutorTest.java
+++ b/impl/src/test/java/org/apache/myfaces/lifecycle/RestoreViewExecutorTest.java
@@ -27,6 +27,7 @@ import org.apache.myfaces.application.ViewIdSupport;
import org.apache.myfaces.test.FacesTestCase;
import org.junit.Assert;
+import org.junit.Test;
import org.mockito.Mockito;
/**
@@ -56,6 +57,7 @@ public class RestoreViewExecutorTest extends FacesTestCase
* Test method for
* {@link org.apache.myfaces.lifecycle.RestoreViewExecutor#execute(jakarta.faces.context.FacesContext)}.
*/
+ @Test
public void testExecuteWithExistingViewRoot()
{
Mockito.when(_facesContext.getApplication()).thenReturn(_application);
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/ErrorPageWriterTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/ErrorPageWriterTest.java
index e2d88277c..4ad97084a 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/ErrorPageWriterTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/ErrorPageWriterTest.java
@@ -45,6 +45,7 @@ public class ErrorPageWriterTest extends AbstractJsfTestCase
private MockResponseWriter writer ;
private HtmlOutputText outputText;
+ @Override
public void setUp() throws Exception
{
super.setUp();
@@ -64,6 +65,7 @@ public class ErrorPageWriterTest extends AbstractJsfTestCase
facesContext.getAttributes().put("org.apache.myfaces.RENDERED_FACES_JS", Boolean.TRUE);
}
+ @Override
public void tearDown() throws Exception
{
super.tearDown();
@@ -71,6 +73,7 @@ public class ErrorPageWriterTest extends AbstractJsfTestCase
writer = null;
}
+ @org.junit.Test
public void testValueExpressionGetExpressionStringReturnsNull() throws IOException
{
//See MYFACES-3413 for details
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/RendererUtilsTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/RendererUtilsTest.java
index 05603f22b..2284e9bf3 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/RendererUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/RendererUtilsTest.java
@@ -107,6 +107,7 @@ public class RendererUtilsTest extends AbstractJsfTestCase {
/**
*
*/
+ @Test
public void testGetIconSrc() {
// Training a mock:
@@ -127,6 +128,7 @@ public class RendererUtilsTest extends AbstractJsfTestCase {
}
+ @Test
public void testGetIconSrcResourceNotFound() throws Exception {
// Training a mock:
EasyMock.reset(resourceHandlerMock);
@@ -144,6 +146,7 @@ public class RendererUtilsTest extends AbstractJsfTestCase {
}
+ @Test
public void testGetStringValue()
{
// Test for situation where submittedValue IS NOT String:
@@ -156,6 +159,7 @@ public class RendererUtilsTest extends AbstractJsfTestCase {
Assert.assertEquals("If submittedvalue is not String, toString() must be used", submittedValue.toString(), stringValue);
}
+ @Test
public void testGetConvertedUIOutputValue()
{
UIInput uiInput = new UIInput();
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/ClientBehaviorRendererUtilsTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/ClientBehaviorRendererUtilsTest.java
index df5ccc9b0..888973c1e 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/ClientBehaviorRendererUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/ClientBehaviorRendererUtilsTest.java
@@ -35,10 +35,12 @@ import java.util.*;
import org.apache.myfaces.renderkit.html.util.ClientBehaviorRendererUtils;
import org.apache.myfaces.test.mock.MockFacesContext;
+import org.junit.Test;
public class ClientBehaviorRendererUtilsTest extends AbstractJsfTestCase
{
+ @Override
public void setUp() throws Exception
{
super.setUp();
@@ -46,6 +48,7 @@ public class ClientBehaviorRendererUtilsTest extends AbstractJsfTestCase
servletContext.addInitParameter(MyfacesConfig.RENDER_CLIENTBEHAVIOR_SCRIPTS_AS_STRING, "true");
}
+ @Test
public void testBuildBehaviorChain()
{
Map<String, List<ClientBehavior>> behaviors = new HashMap<String, List<ClientBehavior>>();
@@ -90,6 +93,7 @@ public class ClientBehaviorRendererUtilsTest extends AbstractJsfTestCase
}
+ @Test
public void testBuildBehaviorChain2()
{
Map<String, List<ClientBehavior>> behaviors = new HashMap<String, List<ClientBehavior>>();
@@ -132,6 +136,7 @@ public class ClientBehaviorRendererUtilsTest extends AbstractJsfTestCase
}
+ @Test
public void testEscapeJavaScriptForChain()
{
MockFacesContext facesContext = new MockFacesContext();
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlBodyRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlBodyRendererTest.java
index 6ccdd7cb1..831d59ca4 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlBodyRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlBodyRendererTest.java
@@ -41,6 +41,7 @@ public class HtmlBodyRendererTest extends AbstractJsfTestCase
private MockResponseWriter writer ;
private HtmlBody body;
+ @Override
public void setUp() throws Exception
{
super.setUp();
@@ -59,12 +60,14 @@ public class HtmlBodyRendererTest extends AbstractJsfTestCase
facesContext.getAttributes().put("org.apache.myfaces.RENDERED_FACES_JS", Boolean.TRUE);
}
+ @Override
public void tearDown()throws Exception
{
super.tearDown();
writer = null;
}
+ @org.junit.Test
public void testHtmlPropertyPassTru2() throws Exception
{
HtmlRenderedAttr[] attrs = {
@@ -78,6 +81,7 @@ public class HtmlBodyRendererTest extends AbstractJsfTestCase
}
}
+ @org.junit.Test
public void testHtmlPropertyPassTru() throws Exception
{
HtmlRenderedAttr[] attrs = HtmlCheckAttributesUtil.generateBasicReadOnlyAttrs();
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java
index 296cf449a..8f03f83d0 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java
@@ -25,9 +25,6 @@ import jakarta.faces.component.behavior.AjaxBehavior;
import jakarta.faces.component.html.HtmlCommandButton;
import jakarta.faces.component.html.HtmlForm;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.config.webparameters.MyfacesConfig;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockExternalContext;
@@ -39,6 +36,7 @@ import org.apache.myfaces.test.mock.MockServletContext;
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
import org.junit.Assert;
+import org.junit.Test;
public class HtmlButtonRendererTest extends AbstractJsfTestCase {
@@ -46,6 +44,7 @@ public class HtmlButtonRendererTest extends AbstractJsfTestCase {
private HtmlCommandButton commandButton;
private HtmlForm form;
+ @Override
public void setUp() throws Exception {
super.setUp();
writer = new MockResponseWriter(new StringWriter(), null, null);
@@ -71,11 +70,13 @@ public class HtmlButtonRendererTest extends AbstractJsfTestCase {
facesContext.getAttributes().put("org.apache.myfaces.RENDERED_FACES_JS", Boolean.TRUE);
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
writer = null;
}
+ @Test
public void testJSNotAllowedHtmlPropertyPassTru() throws Exception {
HtmlRenderedAttr[] attrs = {
//_AccesskeyProperty
@@ -126,6 +127,7 @@ public class HtmlButtonRendererTest extends AbstractJsfTestCase {
}
}
+ @Test
public void testAllowedHtmlPropertyPassTru() throws Exception {
HtmlRenderedAttr[] attrs = {
//_AccesskeyProperty
@@ -177,6 +179,7 @@ public class HtmlButtonRendererTest extends AbstractJsfTestCase {
/**
* Components that render client behaviors should always render "id" and "name" attribute
*/
+ @Test
public void testClientBehaviorHolderRendersIdAndName()
{
commandButton.addClientBehavior("focus", new AjaxBehavior());
@@ -202,6 +205,7 @@ public class HtmlButtonRendererTest extends AbstractJsfTestCase {
* he should be ignored.
* @throws Exception
*/
+ @Test
public void testCommandButtonRendersNotDisabledUIParameters() throws Exception
{
UIParameter param1 = new UIParameter();
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRendererTest.java
index 85fcdcc15..bd953f461 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRendererTest.java
@@ -25,15 +25,13 @@ import jakarta.faces.component.behavior.AjaxBehavior;
import jakarta.faces.component.html.HtmlSelectBooleanCheckbox;
import jakarta.faces.component.html.HtmlSelectManyCheckbox;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
import org.junit.Assert;
+import org.junit.Test;
/**
* @author Bruno Aranda (latest modification by $Author$)
@@ -45,6 +43,7 @@ public class HtmlCheckboxRendererTest extends AbstractJsfTestCase
private HtmlSelectManyCheckbox selectManyCheckbox;
private HtmlSelectBooleanCheckbox selectBooleanCheckbox;
+ @Override
public void setUp() throws Exception
{
super.setUp();
@@ -68,6 +67,7 @@ public class HtmlCheckboxRendererTest extends AbstractJsfTestCase
facesContext.getAttributes().put("org.apache.myfaces.RENDERED_FACES_JS", Boolean.TRUE);
}
+ @Override
public void tearDown() throws Exception
{
super.tearDown();
@@ -76,6 +76,7 @@ public class HtmlCheckboxRendererTest extends AbstractJsfTestCase
writer = null;
}
+ @Test
public void testSelectManyHtmlPropertyPassTru() throws Exception
{
HtmlRenderedAttr[] attrs = {
@@ -122,6 +123,7 @@ public class HtmlCheckboxRendererTest extends AbstractJsfTestCase
}
}
+ @Test
public void testSelectBooleanHtmlPropertyPasstru() throws Exception
{
HtmlRenderedAttr[] attrs = HtmlCheckAttributesUtil.generateBasicAttrs();
@@ -139,6 +141,7 @@ public class HtmlCheckboxRendererTest extends AbstractJsfTestCase
/**
* Components that render client behaviors should always render "id" and "name" attribute
*/
+ @Test
public void testClientBehaviorHolderRendersIdAndNameSelectBooleanCheckbox()
{
selectBooleanCheckbox.addClientBehavior("focus", new AjaxBehavior());
@@ -159,6 +162,7 @@ public class HtmlCheckboxRendererTest extends AbstractJsfTestCase
/**
* Components that render client behaviors should always render "id" and "name" attribute
*/
+ @Test
public void testClientBehaviorHolderRendersIdAndNameSelectManyCheckbox()
{
UISelectItem item1 = new UISelectItem();
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlDoctypeRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlDoctypeRendererTest.java
index b3e77576e..4c6d7015e 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlDoctypeRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlDoctypeRendererTest.java
@@ -41,6 +41,7 @@ public class HtmlDoctypeRendererTest extends AbstractJsfTestCase
private MockResponseWriter writer ;
private HtmlDoctype doctype;
+ @Override
public void setUp() throws Exception
{
super.setUp();
@@ -59,12 +60,14 @@ public class HtmlDoctypeRendererTest extends AbstractJsfTestCase
facesContext.getAttributes().put("org.apache.myfaces.RENDERED_FACES_JS", Boolean.TRUE);
}
+ @Override
public void tearDown()throws Exception
{
super.tearDown();
writer = null;
}
+ @org.junit.Test
public void testHtmlPropertyPassTru() throws Exception
{
HtmlRenderedAttr[] attrs = {
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlEscapeRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlEscapeRendererTest.java
index 520d0c3b2..553745da9 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlEscapeRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlEscapeRendererTest.java
@@ -32,12 +32,10 @@ import jakarta.faces.component.html.HtmlSelectOneMenu;
import jakarta.faces.component.html.HtmlSelectOneRadio;
import jakarta.faces.model.SelectItem;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.junit.Assert;
+import org.junit.Test;
public class HtmlEscapeRendererTest extends AbstractJsfTestCase
{
@@ -64,6 +62,7 @@ public class HtmlEscapeRendererTest extends AbstractJsfTestCase
private HtmlSelectManyListbox selectManyListbox;
private HtmlSelectManyMenu selectManyMenu;
+ @Override
public void setUp() throws Exception
{
super.setUp();
@@ -115,12 +114,14 @@ public class HtmlEscapeRendererTest extends AbstractJsfTestCase
facesContext.getAttributes().put("org.apache.myfaces.RENDERED_FACES_JS", Boolean.TRUE);
}
+ @Override
public void tearDown() throws Exception
{
super.tearDown();
outputText = null;
}
+ @Test
public void testOutputTextEscapeValue() throws Exception
{
for (String contentType: CONTENT_TYPES)
@@ -143,6 +144,7 @@ public class HtmlEscapeRendererTest extends AbstractJsfTestCase
}
}
+ @Test
public void testOutputTextNoEscapeValue() throws Exception
{
@@ -163,6 +165,7 @@ public class HtmlEscapeRendererTest extends AbstractJsfTestCase
}
}
+ @Test
public void testOutputLabelEscapeValue() throws Exception
{
for (String contentType: CONTENT_TYPES)
@@ -185,6 +188,7 @@ public class HtmlEscapeRendererTest extends AbstractJsfTestCase
}
}
+ @Test
public void testOutputLabelNoEscapeValue() throws Exception
{
@@ -205,6 +209,7 @@ public class HtmlEscapeRendererTest extends AbstractJsfTestCase
}
}
+ @Test
public void testUISelectOneEscapeValue() throws Exception
{
for (String contentType: CONTENT_TYPES)
@@ -236,6 +241,7 @@ public class HtmlEscapeRendererTest extends AbstractJsfTestCase
Assert.assertTrue(output.contains(TEST_STRING_ESCAPED));
}
+ @Test
public void testUISelectNoEscapeValue() throws Exception
{
for (String contentType: CONTENT_TYPES)
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlFormRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlFormRendererTest.java
index df19f6a44..b8d62ff76 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlFormRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlFormRendererTest.java
@@ -24,9 +24,6 @@ import java.io.StringWriter;
import jakarta.faces.component.behavior.AjaxBehavior;
import jakarta.faces.component.html.HtmlForm;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.renderkit.html.util.HTML;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
@@ -34,12 +31,14 @@ import org.apache.myfaces.test.mock.MockResponseWriter;
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
import org.junit.Assert;
+import org.junit.Test;
public class HtmlFormRendererTest extends AbstractJsfTestCase
{
private MockResponseWriter writer ;
private HtmlForm form;
+ @Override
public void setUp() throws Exception
{
super.setUp();
@@ -59,6 +58,7 @@ public class HtmlFormRendererTest extends AbstractJsfTestCase
facesContext.getAttributes().put("org.apache.myfaces.RENDERED_FACES_JS", Boolean.TRUE);
}
+ @Override
public void tearDown() throws Exception
{
super.tearDown();
@@ -66,6 +66,7 @@ public class HtmlFormRendererTest extends AbstractJsfTestCase
writer = null;
}
+ @Test
public void testHtmlPropertyPassTru() throws Exception
{
HtmlRenderedAttr[] attrs = HtmlCheckAttributesUtil.generateBasicReadOnlyAttrs();
@@ -83,6 +84,7 @@ public class HtmlFormRendererTest extends AbstractJsfTestCase
}
}
+ @Test
public void testHtmlPropertyPassTruNotRendered() throws Exception
{
HtmlRenderedAttr[] attrs = HtmlCheckAttributesUtil.generateAttrsNotRenderedForReadOnly();
@@ -114,6 +116,7 @@ public class HtmlFormRendererTest extends AbstractJsfTestCase
/**
* Components that render client behaviors should always render "id" and "name" attribute
*/
+ @Test
public void testClientBehaviorHolderRendersIdAndName()
{
form.addClientBehavior("focus", new AjaxBehavior());
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlFormatRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlFormatRendererTest.java
index 34d5186ff..0c201cf00 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlFormatRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlFormatRendererTest.java
@@ -23,21 +23,20 @@ import java.io.StringWriter;
import jakarta.faces.component.UIParameter;
import jakarta.faces.component.html.HtmlOutputFormat;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
import org.junit.Assert;
+import org.junit.Test;
public class HtmlFormatRendererTest extends AbstractJsfTestCase
{
private MockResponseWriter writer;
private HtmlOutputFormat outputFormat;
+ @Override
public void setUp() throws Exception {
super.setUp();
outputFormat = new HtmlOutputFormat();
@@ -52,11 +51,8 @@ public class HtmlFormatRendererTest extends AbstractJsfTestCase
facesContext.getAttributes().put("org.apache.myfaces.RENDERED_FACES_JS", Boolean.TRUE);
}
-
- public void tearDown() throws Exception {
- super.tearDown();
- }
-
+
+ @org.junit.Test
public void testHtmlPropertyPassTru() throws Exception
{
HtmlRenderedAttr[] attrs = {
@@ -78,6 +74,7 @@ public class HtmlFormatRendererTest extends AbstractJsfTestCase
}
}
+ @Test
public void testHtmlPropertyPassTruNotRendered() throws Exception
{
HtmlRenderedAttr[] attrs = HtmlCheckAttributesUtil.generateAttrsNotRenderedForReadOnly();
@@ -95,6 +92,7 @@ public class HtmlFormatRendererTest extends AbstractJsfTestCase
* he should be ignored.
* @throws Exception
*/
+ @Test
public void testDisabledUIParameterNotRendered() throws Exception
{
UIParameter param1 = new UIParameter();
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlGridRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlGridRendererTest.java
index 5559a9377..712447574 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlGridRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlGridRendererTest.java
@@ -25,15 +25,13 @@ import jakarta.faces.component.behavior.AjaxBehavior;
import jakarta.faces.component.html.HtmlOutputText;
import jakarta.faces.component.html.HtmlPanelGrid;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
import org.junit.Assert;
+import org.junit.Test;
/**
* @author Bruno Aranda (latest modification by $Author$)
@@ -48,6 +46,7 @@ public class HtmlGridRendererTest extends AbstractJsfTestCase
private HtmlPanelGrid panelGrid;
private HtmlOutputText colText;
+ @Override
public void setUp() throws Exception
{
super.setUp();
@@ -71,6 +70,7 @@ public class HtmlGridRendererTest extends AbstractJsfTestCase
facesContext.getAttributes().put("org.apache.myfaces.RENDERED_FACES_JS", Boolean.TRUE);
}
+ @Override
public void tearDown() throws Exception
{
super.tearDown();
@@ -78,6 +78,7 @@ public class HtmlGridRendererTest extends AbstractJsfTestCase
writer = null;
}
+ @Test
public void testRenderTable() throws Exception
{
UIColumn col1 = new UIColumn();
@@ -105,6 +106,7 @@ public class HtmlGridRendererTest extends AbstractJsfTestCase
"</tbody>"+"</table>", output);
}
+ @Test
public void testHtmlPropertyPassTru() throws Exception
{
HtmlRenderedAttr[] attrs = HtmlCheckAttributesUtil.generateBasicReadOnlyAttrs();
@@ -116,6 +118,7 @@ public class HtmlGridRendererTest extends AbstractJsfTestCase
}
}
+ @Test
public void testHtmlPropertyPassTruNotRendered() throws Exception
{
HtmlRenderedAttr[] attrs = HtmlCheckAttributesUtil.generateAttrsNotRenderedForReadOnly();
@@ -130,6 +133,7 @@ public class HtmlGridRendererTest extends AbstractJsfTestCase
/**
* Components that render client behaviors should always render "id" and "name" attribute
*/
+ @Test
public void testClientBehaviorHolderRendersIdAndName()
{
panelGrid.addClientBehavior("click", new AjaxBehavior());
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlGroupRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlGroupRendererTest.java
index df4954470..41100fd54 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlGroupRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlGroupRendererTest.java
@@ -24,11 +24,6 @@ import jakarta.faces.component.behavior.AjaxBehavior;
import jakarta.faces.component.html.HtmlOutputText;
import jakarta.faces.component.html.HtmlPanelGroup;
-import junit.framework.Test;
-import static junit.framework.TestCase.assertTrue;
-import static junit.framework.TestCase.fail;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
import org.apache.myfaces.config.webparameters.MyfacesConfig;
@@ -36,6 +31,7 @@ import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
import org.junit.Assert;
+import org.junit.Test;
/**
* @author Bruno Aranda (latest modification by $Author$)
@@ -48,6 +44,7 @@ public class HtmlGroupRendererTest extends AbstractJsfTestCase
private MockResponseWriter writer ;
private HtmlPanelGroup panelGroup;
+ @Override
public void setUp() throws Exception
{
super.setUp();
@@ -78,12 +75,14 @@ public class HtmlGroupRendererTest extends AbstractJsfTestCase
facesContext.getAttributes().put("org.apache.myfaces.RENDERED_FACES_JS", Boolean.TRUE);
}
+ @Override
public void tearDown()throws Exception
{
super.tearDown();
writer = null;
}
+ @Test
public void testHtmlPropertyPassTru() throws Exception
{
HtmlRenderedAttr[] attrs = {
@@ -111,6 +110,7 @@ public class HtmlGroupRendererTest extends AbstractJsfTestCase
}
}
+ @Test
public void testHtmlPropertyPassTruNotRendered() throws Exception
{
HtmlRenderedAttr[] attrs = HtmlCheckAttributesUtil.generateAttrsNotRenderedForReadOnly();
@@ -122,6 +122,7 @@ public class HtmlGroupRendererTest extends AbstractJsfTestCase
}
}
+ @Test
public void testClientBehaviorHolderRendersIdAndNameOutputLink()
{
panelGroup.addClientBehavior("keypress", new AjaxBehavior());
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlHeadRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlHeadRendererTest.java
index 8887f85d3..49d52e430 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlHeadRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlHeadRendererTest.java
@@ -22,15 +22,13 @@ import java.io.StringWriter;
import jakarta.faces.component.html.HtmlHead;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
import org.junit.Assert;
+import org.junit.Test;
/**
* @author Leonardo Uribe
@@ -41,6 +39,7 @@ public class HtmlHeadRendererTest extends AbstractJsfTestCase
private MockResponseWriter writer ;
private HtmlHead head;
+ @Override
public void setUp() throws Exception
{
super.setUp();
@@ -59,12 +58,14 @@ public class HtmlHeadRendererTest extends AbstractJsfTestCase
facesContext.getAttributes().put("org.apache.myfaces.RENDERED_FACES_JS", Boolean.TRUE);
}
+ @Override
public void tearDown()throws Exception
{
super.tearDown();
writer = null;
}
+ @Test
public void testHtmlPropertyPassTru() throws Exception
{
HtmlRenderedAttr[] attrs = {
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlImageRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlImageRendererTest.java
index 4b5c4a307..3f80abbf2 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlImageRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlImageRendererTest.java
@@ -23,15 +23,13 @@ import java.io.StringWriter;
import jakarta.faces.component.behavior.AjaxBehavior;
import jakarta.faces.component.html.HtmlGraphicImage;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
import org.junit.Assert;
+import org.junit.Test;
/**
* @author Bruno Aranda (latest modification by $Author$)
@@ -42,6 +40,7 @@ public class HtmlImageRendererTest extends AbstractJsfTestCase
private MockResponseWriter writer ;
private HtmlGraphicImage graphicImage;
+ @Override
public void setUp() throws Exception
{
super.setUp();
@@ -59,6 +58,7 @@ public class HtmlImageRendererTest extends AbstractJsfTestCase
facesContext.getAttributes().put("org.apache.myfaces.RENDERED_FACES_JS", Boolean.TRUE);
}
+ @Override
public void tearDown() throws Exception
{
super.tearDown();
@@ -66,6 +66,7 @@ public class HtmlImageRendererTest extends AbstractJsfTestCase
writer = null;
}
+ @Test
public void testRenderDefault() throws Exception
{
String imgUrl = "http://www.apache.org/images/feather.gif";
@@ -82,6 +83,7 @@ public class HtmlImageRendererTest extends AbstractJsfTestCase
Assert.assertEquals("<img id=\"img1\" src=\"" + src + "\"/>", output);
}
+ @Test
public void testHtmlPropertyPassTru() throws Exception
{
HtmlRenderedAttr[] attrs = HtmlCheckAttributesUtil.generateBasicReadOnlyAttrs();
@@ -96,6 +98,7 @@ public class HtmlImageRendererTest extends AbstractJsfTestCase
}
}
+ @Test
public void testHtmlPropertyPassTruNotRendered() throws Exception
{
HtmlRenderedAttr[] attrs = HtmlCheckAttributesUtil.generateAttrsNotRenderedForReadOnly();
@@ -113,6 +116,7 @@ public class HtmlImageRendererTest extends AbstractJsfTestCase
/**
* Components that render client behaviors should always render "id" and "name" attribute
*/
+ @Test
public void testClientBehaviorHolderRendersIdAndName()
{
graphicImage.addClientBehavior("keypress", new AjaxBehavior());
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLabelRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLabelRendererTest.java
index 85b3155b2..7f5b447c3 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLabelRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLabelRendererTest.java
@@ -61,6 +61,7 @@ public class HtmlLabelRendererTest extends AbstractJsfConfigurableMockTestCase
"org.apache.myfaces.application.ApplicationFactoryImpl");
}
+ @Override
public void setUp() throws Exception {
super.setUp();
@@ -81,6 +82,7 @@ public class HtmlLabelRendererTest extends AbstractJsfConfigurableMockTestCase
//facesContext.getApplication().setSearchExpressionHandler(new SearchExpressionHandlerImpl());
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
writer = null;
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java
index d17095456..fce4c8aaf 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java
@@ -27,9 +27,6 @@ import jakarta.faces.component.html.HtmlCommandLink;
import jakarta.faces.component.html.HtmlOutcomeTargetLink;
import jakarta.faces.component.html.HtmlOutputLink;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.application.NavigationHandlerImpl;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
@@ -37,6 +34,7 @@ import org.apache.myfaces.test.mock.MockResponseWriter;
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
import org.junit.Assert;
+import org.junit.Test;
/**
* @author Bruno Aranda (latest modification by $Author$)
@@ -95,7 +93,8 @@ public class HtmlLinkRendererTest extends AbstractJsfTestCase
super.tearDown();
writer = null;
}
-
+
+ @Test
public void testHtmlPropertyPassTru() throws Exception
{
HtmlRenderedAttr[] attrs = {
@@ -134,6 +133,7 @@ public class HtmlLinkRendererTest extends AbstractJsfTestCase
}
}
+ @Test
public void testOutputLink() throws Exception
{
HtmlRenderedAttr[] attrs = {
@@ -174,6 +174,7 @@ public class HtmlLinkRendererTest extends AbstractJsfTestCase
/**
* Components that render client behaviors should always render "id" and "name" attribute
*/
+ @Test
public void testClientBehaviorHolderRendersIdAndNameOutputLink()
{
outputLink.addClientBehavior("keypress", new AjaxBehavior());
@@ -194,6 +195,7 @@ public class HtmlLinkRendererTest extends AbstractJsfTestCase
/**
* Components that render client behaviors should always render "id" and "name" attribute
*/
+ @Test
public void testClientBehaviorHolderRendersIdAndNameCommandLink()
{
commandLink.addClientBehavior("keypress", new AjaxBehavior());
@@ -215,6 +217,7 @@ public class HtmlLinkRendererTest extends AbstractJsfTestCase
/**
* Components that render client behaviors should always render "id" and "name" attribute
*/
+ @Test
public void testClientBehaviorHolderRendersIdAndNameOutcomeTargetLink()
{
outcomeTargetLink.addClientBehavior("keypress", new AjaxBehavior());
@@ -238,6 +241,7 @@ public class HtmlLinkRendererTest extends AbstractJsfTestCase
*
* @throws Exception
*/
+ @Test
public void testOutcomeTargetRendersNavigationCaseParameters() throws Exception
{
// configure the link
@@ -258,6 +262,7 @@ public class HtmlLinkRendererTest extends AbstractJsfTestCase
* Tests if the fragment attribute is correctly rendered.
* @throws Exception
*/
+ @Test
public void testOutcomeTargetLinkFragment() throws Exception
{
// configure the link
@@ -279,6 +284,7 @@ public class HtmlLinkRendererTest extends AbstractJsfTestCase
* The value of the fragment attribute is appended to the end of target URL following a hash (#) mark.
* @throws Exception
*/
+ @Test
public void testOutputLinkFragment() throws Exception
{
outputLink.setFragment("fragment");
@@ -293,6 +299,7 @@ public class HtmlLinkRendererTest extends AbstractJsfTestCase
* he should be ignored.
* @throws Exception
*/
+ @Test
public void testDisabledUIParameterNotRenderedCommandLink() throws Exception
{
UIParameter param1 = new UIParameter();
@@ -318,6 +325,7 @@ public class HtmlLinkRendererTest extends AbstractJsfTestCase
* he should be ignored.
* @throws Exception
*/
+ @Test
public void testDisabledUIParameterNotRenderedOutputLink() throws Exception
{
UIParameter param1 = new UIParameter();
@@ -342,6 +350,7 @@ public class HtmlLinkRendererTest extends AbstractJsfTestCase
* Tests if the h:link correctly includes an UIParameter
* with a non-null-name when creating the URL.
*/
+ @Test
public void testOutcomeTargetLinkIncludesUIParameterInURL()
{
// create the UIParameter and attach it
@@ -366,6 +375,7 @@ public class HtmlLinkRendererTest extends AbstractJsfTestCase
* Tests if the h:link correctly skips an UIParameter
* with a null-name when creating the URL.
*/
+ @Test
public void testOutcomeTargetLinkSkipsNullValueOfUIParameterInURL()
{
// create the UIParameter with value = null and attach it
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlListboxRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlListboxRendererTest.java
index 9f7a71f3f..261a911ef 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlListboxRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlListboxRendererTest.java
@@ -29,15 +29,13 @@ import jakarta.faces.component.html.HtmlSelectManyListbox;
import jakarta.faces.component.html.HtmlSelectOneListbox;
import jakarta.faces.model.SelectItem;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
import org.junit.Assert;
+import org.junit.Test;
/**
* @author Bruno Aranda (latest modification by $Author$)
@@ -78,6 +76,7 @@ public class HtmlListboxRendererTest extends AbstractJsfTestCase
writer = null;
}
+ @Test
public void testSelectOneHtmlPropertyPassTru() throws Exception
{
HtmlRenderedAttr[] attrs = HtmlCheckAttributesUtil.generateBasicAttrs(false);
@@ -97,6 +96,7 @@ public class HtmlListboxRendererTest extends AbstractJsfTestCase
}
}
+ @Test
public void testSelectManyHtmlPropertyPassTru() throws Exception
{
HtmlRenderedAttr[] attrs = HtmlCheckAttributesUtil.generateBasicAttrs(false);
@@ -119,6 +119,7 @@ public class HtmlListboxRendererTest extends AbstractJsfTestCase
/**
* Components that render client behaviors should always render "id" and "name" attribute
*/
+ @Test
public void testClientBehaviorHolderRendersIdAndNameSelectOneListbox()
{
UISelectItem item1 = new UISelectItem();
@@ -149,6 +150,7 @@ public class HtmlListboxRendererTest extends AbstractJsfTestCase
/**
* Components that render client behaviors should always render "id" and "name" attribute
*/
+ @Test
public void testClientBehaviorHolderRendersIdAndNameSelectManyListbox()
{
UISelectItem item1 = new UISelectItem();
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlMenuRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlMenuRendererTest.java
index 35cc98fc3..df7d359cd 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlMenuRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlMenuRendererTest.java
@@ -29,15 +29,13 @@ import jakarta.faces.component.html.HtmlSelectManyMenu;
import jakarta.faces.component.html.HtmlSelectOneMenu;
import jakarta.faces.model.SelectItem;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
import org.junit.Assert;
+import org.junit.Test;
/**
* @author Bruno Aranda (latest modification by $Author$)
@@ -79,6 +77,7 @@ public class HtmlMenuRendererTest extends AbstractJsfTestCase
writer = null;
}
+ @Test
public void testSelectOneHtmlPropertyPassTru() throws Exception
{
HtmlRenderedAttr[] attrs = HtmlCheckAttributesUtil.generateBasicAttrs(false);
@@ -98,6 +97,7 @@ public class HtmlMenuRendererTest extends AbstractJsfTestCase
}
}
+ @Test
public void testSelectManyHtmlPropertyPassTru() throws Exception
{
HtmlRenderedAttr[] attrs = HtmlCheckAttributesUtil.generateBasicAttrs(false);
@@ -120,6 +120,7 @@ public class HtmlMenuRendererTest extends AbstractJsfTestCase
/**
* Components that render client behaviors should always render "id" and "name" attribute
*/
+ @Test
public void testClientBehaviorHolderRendersIdAndNameSelectOneMenu()
{
UISelectItem item1 = new UISelectItem();
@@ -150,6 +151,7 @@ public class HtmlMenuRendererTest extends AbstractJsfTestCase
/**
* Components that render client behaviors should always render "id" and "name" attribute
*/
+ @Test
public void testClientBehaviorHolderRendersIdAndNameSelectManyMenu()
{
UISelectItem item1 = new UISelectItem();
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlMessageRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlMessageRendererTest.java
index 6e563c710..82229a50f 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlMessageRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlMessageRendererTest.java
@@ -66,6 +66,7 @@ public class HtmlMessageRendererTest extends AbstractJsfConfigurableMockTestCas
"org.apache.myfaces.application.ApplicationFactoryImpl");
}
+ @Override
public void setUp() throws Exception
{
super.setUp();
@@ -102,11 +103,6 @@ public class HtmlMessageRendererTest extends AbstractJsfConfigurableMockTestCas
facesContext.getAttributes().put("org.apache.myfaces.RENDERED_FACES_JS", Boolean.TRUE);
}
- public void tearDown() throws Exception
- {
- super.tearDown();
- }
-
@Test
public void testHtmlPropertyPassTru() throws Exception
{
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRendererTest.java
index 8c72976b2..8c7b6ee2a 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRendererTest.java
@@ -25,9 +25,6 @@ import jakarta.faces.component.behavior.AjaxBehavior;
import jakarta.faces.component.html.HtmlForm;
import jakarta.faces.component.html.HtmlOutcomeTargetButton;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.application.NavigationHandlerImpl;
import org.apache.myfaces.renderkit.html.util.HTML;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
@@ -35,6 +32,7 @@ import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
import org.junit.Assert;
import org.apache.myfaces.renderkit.html.util.ComponentAttrs;
+import org.junit.Test;
/**
* Tests for HtmlOutcomeTargetButtonRenderer.
@@ -83,6 +81,7 @@ public class HtmlOutcomeTargetButtonRendererTest extends AbstractJsfTestCase
/**
* Components that render client behaviors should always render "id" and "name" attribute
*/
+ @Test
public void testClientBehaviorHolderRendersIdAndName()
{
outcomeTargetButton.addClientBehavior("keypress", new AjaxBehavior());
@@ -106,6 +105,7 @@ public class HtmlOutcomeTargetButtonRendererTest extends AbstractJsfTestCase
*
* @throws Exception
*/
+ @Test
public void testOutcomeTargetRendersNavigationCaseParameters() throws Exception
{
// configure the button
@@ -126,6 +126,7 @@ public class HtmlOutcomeTargetButtonRendererTest extends AbstractJsfTestCase
* Tests if the fragment attribute is correctly rendered.
* @throws Exception
*/
+ @Test
public void testFragment() throws Exception
{
// configure the button
@@ -146,6 +147,7 @@ public class HtmlOutcomeTargetButtonRendererTest extends AbstractJsfTestCase
* Tests if the h:button correctly includes an UIParameter
* with a non-null-name when creating the URL.
*/
+ @Test
public void testIncludesUIParameterInURL()
{
// create the UIParameter and attach it
@@ -170,6 +172,7 @@ public class HtmlOutcomeTargetButtonRendererTest extends AbstractJsfTestCase
* Tests if the h:button correctly skips an UIParameter
* with a null-name when creating the URL.
*/
+ @Test
public void testSkipsNullValueOfUIParameterInURL()
{
// create the UIParameter with value = null and attach it
@@ -193,6 +196,7 @@ public class HtmlOutcomeTargetButtonRendererTest extends AbstractJsfTestCase
/**
* Tests if the h:button is rendered accordingly if disabled is true.
*/
+ @Test
public void testDisabledAttribute()
{
outcomeTargetButton.getAttributes().put(ComponentAttrs.DISABLED_ATTR, Boolean.TRUE);
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlRadioRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlRadioRendererTest.java
index 12e2da962..2c5d84e0c 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlRadioRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlRadioRendererTest.java
@@ -28,15 +28,13 @@ import jakarta.faces.component.behavior.AjaxBehavior;
import jakarta.faces.component.html.HtmlSelectOneRadio;
import jakarta.faces.model.SelectItem;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
import org.junit.Assert;
+import org.junit.Test;
/**
* @author Bruno Aranda (latest modification by $Author$)
@@ -72,6 +70,7 @@ public class HtmlRadioRendererTest extends AbstractJsfTestCase
writer = null;
}
+ @Test
public void testHtmlPropertyPassTru() throws Exception
{
HtmlRenderedAttr[] attrs = {
@@ -125,6 +124,7 @@ public class HtmlRadioRendererTest extends AbstractJsfTestCase
/**
* Components that render client behaviors should always render "id" and "name" attribute
*/
+ @Test
public void testClientBehaviorHolderRendersIdAndName()
{
UISelectItem item1 = new UISelectItem();
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManagerTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManagerTest.java
index b4b2de864..18989935e 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManagerTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManagerTest.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import jakarta.faces.render.ResponseStateManager;
-import static junit.framework.TestCase.assertEquals;
import org.apache.myfaces.test.FacesTestCase;
import org.junit.Assert;
import org.junit.Test;
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImplTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImplTest.java
index 8ef0b3693..5f8ae9d2e 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImplTest.java
@@ -27,6 +27,7 @@ import org.apache.myfaces.util.CommentUtils;
import org.apache.myfaces.renderkit.html.util.HTML;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.junit.Assert;
+import org.junit.Test;
/**
* Test class for HtmlResponseWriterImpl.
@@ -69,6 +70,7 @@ public class HtmlResponseWriterImplTest extends AbstractJsfTestCase
* @throws IllegalAccessException
* @throws IllegalArgumentException
*/
+ @Test
public void testHtmlElementsInsideScript() throws IOException, SecurityException,
NoSuchFieldException, IllegalArgumentException, IllegalAccessException
{
@@ -139,6 +141,7 @@ public class HtmlResponseWriterImplTest extends AbstractJsfTestCase
return b == null ? defaultValue : b;
}
+ @Test
public void testScriptOnHtmlIsoEncodingAndScriptXhmlComments() throws IOException
{
_writer = new HtmlResponseWriterImpl(_stringWriter, "text/html", "ISO-8859-1", true);
@@ -156,6 +159,7 @@ public class HtmlResponseWriterImplTest extends AbstractJsfTestCase
Assert.assertTrue("script does not have end comment --> ", output.contains("//"+CommentUtils.COMMENT_SIMPLE_END));
}
+ @Test
public void testScriptOnHtmlIsoEncodingAndNoScriptXhmlComments() throws IOException
{
_writer = new HtmlResponseWriterImpl(_stringWriter, "text/html", "ISO-8859-1", false);
@@ -173,6 +177,7 @@ public class HtmlResponseWriterImplTest extends AbstractJsfTestCase
Assert.assertFalse("script have end comment --> ", output.contains("//"+CommentUtils.COMMENT_SIMPLE_END));
}
+ @Test
public void testScriptOnHtmlUTF8AndScriptXhmlComments() throws IOException
{
_writer = new HtmlResponseWriterImpl(_stringWriter, "text/html", "UTF-8", true);
@@ -190,6 +195,7 @@ public class HtmlResponseWriterImplTest extends AbstractJsfTestCase
Assert.assertTrue("script does not have end comment --> ", output.contains("//"+CommentUtils.COMMENT_SIMPLE_END));
}
+ @Test
public void testScriptOnHtmlUTF8AndNoScriptXhmlComments() throws IOException
{
_writer = new HtmlResponseWriterImpl(_stringWriter, "text/html", "UTF-8", false);
@@ -207,6 +213,7 @@ public class HtmlResponseWriterImplTest extends AbstractJsfTestCase
Assert.assertFalse("script have end comment --> ", output.contains("//"+CommentUtils.COMMENT_SIMPLE_END));
}
+ @Test
public void testScriptOnXhtmlIsoEncoding() throws IOException
{
_writer = new HtmlResponseWriterImpl(_stringWriter, "application/xhtml+xml", "ISO-8859-1", true);
@@ -224,6 +231,7 @@ public class HtmlResponseWriterImplTest extends AbstractJsfTestCase
Assert.assertTrue("script does not have end ]]> ", output.contains(CommentUtils.INLINE_SCRIPT_COMMENT+CommentUtils.CDATA_SIMPLE_END));
}
+ @Test
public void testScriptOnXhtmlUTF8Encoding() throws IOException
{
_writer = new HtmlResponseWriterImpl(_stringWriter, "application/xhtml+xml", "UTF-8", false);
@@ -241,6 +249,7 @@ public class HtmlResponseWriterImplTest extends AbstractJsfTestCase
Assert.assertTrue("script does not have end ]]> ", output.contains(CommentUtils.INLINE_SCRIPT_COMMENT+CommentUtils.CDATA_SIMPLE_END));
}
+ @Test
public void testStyleOnXhtmlIsoEncoding() throws IOException
{
_writer = new HtmlResponseWriterImpl(_stringWriter, "application/xhtml+xml", "ISO-8859-1", true);
@@ -258,6 +267,7 @@ public class HtmlResponseWriterImplTest extends AbstractJsfTestCase
Assert.assertTrue("script does not have end ]]> ", output.contains(CommentUtils.CDATA_SIMPLE_END));
}
+ @Test
public void testStyleOnXhtmlUTF8Encoding() throws IOException
{
_writer = new HtmlResponseWriterImpl(_stringWriter, "application/xhtml+xml", "UTF-8", false);
@@ -280,6 +290,7 @@ public class HtmlResponseWriterImplTest extends AbstractJsfTestCase
*
* @throws IOException
*/
+ @Test
public void testEmptyTagNotRenderEnd() throws IOException
{
_writer.startDocument();
@@ -302,6 +313,7 @@ public class HtmlResponseWriterImplTest extends AbstractJsfTestCase
*
* @throws IOException
*/
+ @Test
public void testEmptyTagNotRenderEndOnXml() throws IOException
{
_writer = new HtmlResponseWriterImpl(_stringWriter, "application/xml", "UTF-8", false);
@@ -326,6 +338,7 @@ public class HtmlResponseWriterImplTest extends AbstractJsfTestCase
*
* @throws IOException
*/
+ @Test
public void testEmptyTagNotRenderEndUppercase() throws IOException
{
_writer.startDocument();
@@ -348,6 +361,7 @@ public class HtmlResponseWriterImplTest extends AbstractJsfTestCase
*
* @throws IOException
*/
+ @Test
public void testEmptyTagNotRenderEndOnXhtmlUppercase() throws IOException
{
_writer = new HtmlResponseWriterImpl(_stringWriter, "application/xml", "UTF-8", false);
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlSecretRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlSecretRendererTest.java
index 280ae7c66..2ba16e0c0 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlSecretRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlSecretRendererTest.java
@@ -23,15 +23,13 @@ import java.io.StringWriter;
import jakarta.faces.component.behavior.AjaxBehavior;
import jakarta.faces.component.html.HtmlInputSecret;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
import org.junit.Assert;
+import org.junit.Test;
/**
* @author Bruno Aranda (latest modification by $Author$)
@@ -67,6 +65,7 @@ public class HtmlSecretRendererTest extends AbstractJsfTestCase
writer = null;
}
+ @Test
public void testInputTextDefault() throws Exception
{
inputText.encodeBegin(facesContext);
@@ -77,6 +76,7 @@ public class HtmlSecretRendererTest extends AbstractJsfTestCase
Assert.assertEquals("<input type=\"password\" name=\"j_id__v_0\"/>", output);
}
+ @Test
public void testHtmlPropertyPassTru() throws Exception
{
HtmlRenderedAttr[] attrs = HtmlCheckAttributesUtil.generateBasicAttrs();
@@ -91,6 +91,7 @@ public class HtmlSecretRendererTest extends AbstractJsfTestCase
/**
* Components that render client behaviors should always render "id" and "name" attribute
*/
+ @Test
public void testClientBehaviorHolderRendersIdAndName()
{
inputText.addClientBehavior("keypress", new AjaxBehavior());
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTableRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTableRendererTest.java
index f0d1a1172..52f5edaa3 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTableRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTableRendererTest.java
@@ -28,15 +28,13 @@ import jakarta.faces.component.html.HtmlDataTable;
import jakarta.faces.component.html.HtmlOutputText;
import jakarta.faces.model.ListDataModel;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
import org.junit.Assert;
+import org.junit.Test;
/**
* @author Bruno Aranda (latest modification by $Author$)
@@ -78,6 +76,7 @@ public class HtmlTableRendererTest extends AbstractJsfTestCase
writer = null;
}
+ @Test
public void testHtmlPropertyPassTru() throws Exception
{
HtmlRenderedAttr[] attrs = HtmlCheckAttributesUtil.generateBasicReadOnlyAttrs();
@@ -89,6 +88,7 @@ public class HtmlTableRendererTest extends AbstractJsfTestCase
}
}
+ @Test
public void testHtmlPropertyPassTruNotRendered() throws Exception
{
HtmlRenderedAttr[] attrs = HtmlCheckAttributesUtil.generateAttrsNotRenderedForReadOnly();
@@ -103,6 +103,7 @@ public class HtmlTableRendererTest extends AbstractJsfTestCase
/**
* Components that render client behaviors should always render "id" and "name" attribute
*/
+ @Test
public void testClientBehaviorHolderRendersIdAndName()
{
dataTable.addClientBehavior("keypress", new AjaxBehavior());
@@ -125,6 +126,7 @@ public class HtmlTableRendererTest extends AbstractJsfTestCase
* render the same as if that value is provided. Note t:dataTable newspaper mode requires
* row count to calculate newspaperRows and newspaperColumns.
*/
+ @Test
public void testNoRowCountRender()
{
List<Person> list = new ArrayList<Person>();
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextRendererTest.java
index d1553f495..ca9c54174 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextRendererTest.java
@@ -32,9 +32,6 @@ import jakarta.faces.context.FacesContext;
import jakarta.faces.convert.Converter;
import jakarta.faces.convert.ConverterException;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
import org.apache.myfaces.config.webparameters.MyfacesConfig;
@@ -43,6 +40,7 @@ import org.apache.myfaces.test.el.MockValueExpression;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
import org.junit.Assert;
+import org.junit.Test;
/**
* @author Bruno Aranda (latest modification by $Author$)
@@ -88,6 +86,7 @@ public class HtmlTextRendererTest extends AbstractJsfTestCase
writer = null;
}
+ @Test
public void testStyleClassAttr() throws IOException
{
outputText.setValue("Output");
@@ -103,6 +102,7 @@ public class HtmlTextRendererTest extends AbstractJsfTestCase
Assert.assertNotSame("Output", output);
}
+ @Test
public void testInputDefaultTypeAttr() throws IOException
{
inputText.encodeBegin(facesContext);
@@ -114,6 +114,7 @@ public class HtmlTextRendererTest extends AbstractJsfTestCase
Assert.assertNotSame("Output", output);
}
+ @Test
public void testInputTypeAttr() throws IOException
{
inputText.setType("tel");
@@ -132,6 +133,7 @@ public class HtmlTextRendererTest extends AbstractJsfTestCase
* Don't add span over escape
* @throws IOException
*/
+ @Test
public void testEscapeNoSpan() throws IOException
{
outputText.setValue("Output");
@@ -146,6 +148,7 @@ public class HtmlTextRendererTest extends AbstractJsfTestCase
Assert.assertEquals("Output", output);
}
+ @Test
public void testHtmlPropertyPassThru() throws Exception
{
HtmlRenderedAttr[] attrs = HtmlCheckAttributesUtil.generateBasicAttrs();
@@ -158,6 +161,7 @@ public class HtmlTextRendererTest extends AbstractJsfTestCase
}
}
+ @Test
public void testWhenSubmittedValueIsNullDefaultShouldDissapearFromRendering() {
//See MYFACES-2161 and MYFACES-1549 for details
UIViewRoot root = new UIViewRoot();
@@ -229,6 +233,7 @@ public class HtmlTextRendererTest extends AbstractJsfTestCase
/**
* Components that render client behaviors should always render "id" and "name" attribute
*/
+ @Test
public void testClientBehaviorHolderRendersIdAndName()
{
inputText.addClientBehavior("keypress", new AjaxBehavior());
@@ -250,6 +255,7 @@ public class HtmlTextRendererTest extends AbstractJsfTestCase
* Tests if a JavaScript user code is correctly escaped.
* e.g. alert('test') has to become alert(\'test\')
*/
+ @Test
public void testClientBehaviorUserCodeJavaScriptEscaping()
{
inputText.getAttributes().put("onchange", "alert('test')");
@@ -272,6 +278,7 @@ public class HtmlTextRendererTest extends AbstractJsfTestCase
* Tests if a JavaScript user code that already contains ' is correctly escaped.
* e.g. test = 'a\'b'; has to become test = \'a\\\'b\';
*/
+ @Test
public void testClientBehaviorUserCodeJavaScriptDoubleEscaping()
{
inputText.getAttributes().put("onchange", "var test = \'a\\\'b\'; alert(test);");
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextareaRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextareaRendererTest.java
index f35e59079..87fa119c8 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextareaRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextareaRendererTest.java
@@ -23,15 +23,13 @@ import java.io.StringWriter;
import jakarta.faces.component.behavior.AjaxBehavior;
import jakarta.faces.component.html.HtmlInputTextarea;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
import org.junit.Assert;
+import org.junit.Test;
/**
* @author Bruno Aranda (latest modification by $Author$)
@@ -66,6 +64,7 @@ public class HtmlTextareaRendererTest extends AbstractJsfTestCase
writer = null;
}
+ @Test
public void testRenderDefault() throws Exception
{
inputTextarea.encodeBegin(facesContext);
@@ -76,6 +75,7 @@ public class HtmlTextareaRendererTest extends AbstractJsfTestCase
Assert.assertEquals("<textarea name=\"j_id__v_0\"></textarea>", output);
}
+ @Test
public void testRenderColsRows() throws Exception
{
inputTextarea.setCols(5);
@@ -88,6 +88,7 @@ public class HtmlTextareaRendererTest extends AbstractJsfTestCase
Assert.assertEquals("<textarea name=\"j_id__v_0\" cols=\"5\" rows=\"10\"></textarea>", output);
}
+ @Test
public void testHtmlPropertyPassTru() throws Exception
{
HtmlRenderedAttr[] attrs = HtmlCheckAttributesUtil.generateBasicAttrs();
@@ -102,6 +103,7 @@ public class HtmlTextareaRendererTest extends AbstractJsfTestCase
/**
* Components that render client behaviors should always render "id" and "name" attribute
*/
+ @Test
public void testClientBehaviorHolderRendersIdAndName()
{
inputTextarea.addClientBehavior("keypress", new AjaxBehavior());
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlBodyClientBehaviorRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlBodyClientBehaviorRendererTest.java
index bb7183b2f..efeab4f81 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlBodyClientBehaviorRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlBodyClientBehaviorRendererTest.java
@@ -26,6 +26,7 @@ import jakarta.faces.component.html.HtmlBody;
import org.apache.myfaces.renderkit.ClientBehaviorEvents;
import org.apache.myfaces.renderkit.html.util.HTML;
import org.junit.Assert;
+import org.junit.Test;
/**
* @author Leonardo Uribe (latest modification by $Author$)
@@ -71,6 +72,7 @@ public class HtmlBodyClientBehaviorRendererTest extends AbstractClientBehaviorTe
* Components that render client behaviors should always render "id" and "name" attribute
* <body> does not have "name", so we just need to check "id"
*/
+ @Test
public void testClientBehaviorHolderRendersIdAndName()
{
HtmlRenderedClientEventAttr[] attrs = getClientBehaviorHtmlRenderedAttributes();
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlSelectManyCheckboxClientBehaviorRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlSelectManyCheckboxClientBehaviorRendererTest.java
index b0bba047e..b97e064ab 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlSelectManyCheckboxClientBehaviorRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlSelectManyCheckboxClientBehaviorRendererTest.java
@@ -25,6 +25,7 @@ import jakarta.faces.component.behavior.ClientBehaviorHolder;
import jakarta.faces.component.html.HtmlSelectManyCheckbox;
import org.junit.Assert;
+import org.junit.Test;
/**
* @author Leonardo Uribe (latest modification by $Author$)
@@ -65,6 +66,7 @@ public class HtmlSelectManyCheckboxClientBehaviorRendererTest extends AbstractCl
return attrs;
}
+ @Test
public void testClientBehaviorHolderRendersIdAndName()
{
HtmlRenderedClientEventAttr[] attrs = getClientBehaviorHtmlRenderedAttributes();
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlSelectOneRadioClientBehaviorRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlSelectOneRadioClientBehaviorRendererTest.java
index 2720dfdff..33f58843e 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlSelectOneRadioClientBehaviorRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlSelectOneRadioClientBehaviorRendererTest.java
@@ -25,6 +25,7 @@ import jakarta.faces.component.behavior.ClientBehaviorHolder;
import jakarta.faces.component.html.HtmlSelectOneRadio;
import org.junit.Assert;
+import org.junit.Test;
/**
* @author Leonardo Uribe (latest modification by $Author$)
@@ -65,6 +66,7 @@ public class HtmlSelectOneRadioClientBehaviorRendererTest extends AbstractClient
return attrs;
}
+ @Test
public void testClientBehaviorHolderRendersIdAndName()
{
HtmlRenderedClientEventAttr[] attrs = getClientBehaviorHtmlRenderedAttributes();
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/util/UnicodeEncoderTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/util/UnicodeEncoderTest.java
index b47ffd2cf..df1fc7f13 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/util/UnicodeEncoderTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/util/UnicodeEncoderTest.java
@@ -15,7 +15,6 @@
*/
package org.apache.myfaces.renderkit.html.util;
-import org.apache.myfaces.renderkit.html.util.UnicodeEncoder;
import java.io.StringWriter;
import org.junit.Assert;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
diff --git a/impl/src/test/java/org/apache/myfaces/renderkits/OwnRenderkitTest.java b/impl/src/test/java/org/apache/myfaces/renderkits/OwnRenderkitTest.java
index fb54d0db7..5ffcf5dde 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkits/OwnRenderkitTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkits/OwnRenderkitTest.java
@@ -31,6 +31,7 @@ import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockFacesContext12;
import org.apache.myfaces.test.mock.MockResponseWriter;
import org.junit.Assert;
+import org.junit.Test;
/**
* @author martin.haimberger
@@ -69,6 +70,7 @@ public class OwnRenderkitTest extends AbstractJsfTestCase {
isOwnRenderKit = false;
}
+ @Test
public void testOwnRenderKit() throws Exception {
inputText.encodeEnd(facesContext);
diff --git a/impl/src/test/java/org/apache/myfaces/test/FacesTestCase.java b/impl/src/test/java/org/apache/myfaces/test/FacesTestCase.java
index e2927d825..1a488106b 100644
--- a/impl/src/test/java/org/apache/myfaces/test/FacesTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/test/FacesTestCase.java
@@ -26,19 +26,22 @@ import jakarta.faces.context.FacesContext;
import junit.framework.TestCase;
import org.apache.myfaces.test.mock.MockFacesContext12;
+import org.junit.After;
+import org.junit.Before;
import org.mockito.Mockito;
/**
* @author Mathias Broekelmann (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public abstract class FacesTestCase extends TestCase
+public abstract class FacesTestCase
{
protected FacesContext _facesContext;
protected ExternalContext _externalContext;
protected Application _application;
protected ELContext _elContext;
+ @Before
public void setUp() throws Exception
{
_externalContext = Mockito.mock(ExternalContext.class);
@@ -48,7 +51,7 @@ public abstract class FacesTestCase extends TestCase
_elContext = Mockito.mock(ELContext.class);
}
- @Override
+ @After
public void tearDown() throws Exception
{
MockFacesContext12.setCurrentInstance(null);
diff --git a/impl/src/test/java/org/apache/myfaces/util/CommentUtilsTest.java b/impl/src/test/java/org/apache/myfaces/util/CommentUtilsTest.java
index f8d6636f8..ae82bf147 100644
--- a/impl/src/test/java/org/apache/myfaces/util/CommentUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/util/CommentUtilsTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.util;
-import org.apache.myfaces.util.CommentUtils;
import java.io.IOException;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
diff --git a/impl/src/test/java/org/apache/myfaces/util/MessageUtilsTest.java b/impl/src/test/java/org/apache/myfaces/util/MessageUtilsTest.java
index 21760d6e3..6d1ce6211 100644
--- a/impl/src/test/java/org/apache/myfaces/util/MessageUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/util/MessageUtilsTest.java
@@ -23,6 +23,7 @@ import jakarta.faces.application.FacesMessage;
import org.apache.myfaces.util.MessageUtils;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.junit.Assert;
+import org.junit.Test;
/**
* TestCase for MessageUtils
@@ -34,6 +35,7 @@ public class MessageUtilsTest extends AbstractJsfTestCase
/**
* Test method for 'org.apache.myfaces.shared.util.MessageUtils.getMessage(Severity, String, Object)'
*/
+ @Test
public void testGetMessageSeverityStringObject()
{
facesContext.getViewRoot().setLocale(Locale.ENGLISH);
@@ -53,6 +55,7 @@ public class MessageUtilsTest extends AbstractJsfTestCase
/**
* Test method for 'org.apache.myfaces.shared.util.MessageUtils.getMessage(Severity, String, Object[])'
*/
+ @Test
public void testGetMessageSeverityStringObjectArray()
{
facesContext.getViewRoot().setLocale(Locale.ENGLISH);
@@ -71,6 +74,7 @@ public class MessageUtilsTest extends AbstractJsfTestCase
/**
* Test method for 'org.apache.myfaces.shared.util.MessageUtils.getMessage(Severity, String, Object[], FacesContext)'
*/
+ @Test
public void testGetMessageSeverityStringObjectArrayFacesContext()
{
facesContext.getViewRoot().setLocale(Locale.ENGLISH);
@@ -90,6 +94,7 @@ public class MessageUtilsTest extends AbstractJsfTestCase
/**
* Test method for 'org.apache.myfaces.shared.util.MessageUtils.getMessage(Locale, String, Object[])'
*/
+ @Test
public void testGetMessageLocaleStringObjectArray()
{
facesContext.getViewRoot().setLocale(Locale.ENGLISH);
@@ -107,6 +112,7 @@ public class MessageUtilsTest extends AbstractJsfTestCase
/**
* Test method for 'org.apache.myfaces.shared.util.MessageUtils.getMessage(FacesContext, String)'
*/
+ @Test
public void testGetMessageFacesContextString()
{
facesContext.getViewRoot().setLocale(Locale.ENGLISH);
@@ -125,6 +131,7 @@ public class MessageUtilsTest extends AbstractJsfTestCase
/**
* Test method for 'org.apache.myfaces.shared.util.MessageUtils.getMessage(FacesContext, String, Object[])'
*/
+ @Test
public void testGetMessageFacesContextStringObjectArray()
{
facesContext.getViewRoot().setLocale(Locale.ENGLISH);
@@ -143,6 +150,7 @@ public class MessageUtilsTest extends AbstractJsfTestCase
/**
* testGetMessageWithBundle
*/
+ @Test
public void testGetMessageWithBundle()
{
facesContext.getViewRoot().setLocale(Locale.ENGLISH);
@@ -158,6 +166,7 @@ public class MessageUtilsTest extends AbstractJsfTestCase
/**
* testGetMessageWithBundleName
*/
+ @Test
public void testGetMessageWithBundleName()
{
facesContext.getViewRoot().setLocale(Locale.ENGLISH);
@@ -171,6 +180,7 @@ public class MessageUtilsTest extends AbstractJsfTestCase
/**
* testGetMessageWithBundleNameLocale
*/
+ @Test
public void testGetMessageWithBundleNameLocale()
{
FacesMessage msg = MessageUtils.getMessage(DEFAULT_BUNDLE,
@@ -182,6 +192,7 @@ public class MessageUtilsTest extends AbstractJsfTestCase
/**
* testSubstituteParamsWithDELocale(
*/
+ @Test
public void testSubstituteParamsWithDELocale() {
String paramString = MessageUtils.substituteParams(Locale.GERMANY, "currency {0,number,currency}", new Object[]{100});
@@ -191,6 +202,7 @@ public class MessageUtilsTest extends AbstractJsfTestCase
/**
* testSubstituteParamsWithGBLocale(
*/
+ @Test
public void testSubstituteParamsWithGBLocale() {
String paramString = MessageUtils.substituteParams(Locale.UK, "currency {0,number,currency}", new Object[]{100});
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/component/UIRepeatTest.java b/impl/src/test/java/org/apache/myfaces/view/facelets/component/UIRepeatTest.java
index 6aef3febf..9f97c26ab 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/component/UIRepeatTest.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/component/UIRepeatTest.java
@@ -62,6 +62,7 @@ public class UIRepeatTest extends AbstractJsfTestCase
* Test method for
* {@link jakarta.faces.component.UIData#setValueExpression(java.lang.String, jakarta.el.ValueExpression)}.
*/
+ @Test
public void testValueExpression()
{
assertSetValueExpressionException(IllegalArgumentException.class, "rowIndex");
diff --git a/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractJsfConfigurableMockTestCase.java b/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractJsfConfigurableMockTestCase.java
index f3f878bc7..fe978bc4c 100644
--- a/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractJsfConfigurableMockTestCase.java
+++ b/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractJsfConfigurableMockTestCase.java
@@ -33,7 +33,6 @@ import jakarta.faces.lifecycle.Lifecycle;
import jakarta.faces.lifecycle.LifecycleFactory;
import jakarta.faces.render.RenderKit;
import jakarta.faces.render.RenderKitFactory;
-import junit.framework.TestCase;
import org.apache.myfaces.test.config.ResourceBundleVarNames;
import org.apache.myfaces.test.mock.MockExternalContext;
@@ -79,7 +78,7 @@ import org.junit.Before;
* @since 1.0.0
*/
-public abstract class AbstractJsfConfigurableMockTestCase extends TestCase
+public abstract class AbstractJsfConfigurableMockTestCase
{
// ------------------------------------------------------------ Constructors
diff --git a/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractJsfConfigurableMultipleRequestsTestCase.java b/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractJsfConfigurableMultipleRequestsTestCase.java
index c6a0eda49..9d73ab1de 100644
--- a/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractJsfConfigurableMultipleRequestsTestCase.java
+++ b/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractJsfConfigurableMultipleRequestsTestCase.java
@@ -33,7 +33,6 @@ import jakarta.faces.lifecycle.Lifecycle;
import jakarta.faces.lifecycle.LifecycleFactory;
import jakarta.faces.render.RenderKit;
import jakarta.faces.render.RenderKitFactory;
-import junit.framework.TestCase;
import org.apache.myfaces.test.config.ResourceBundleVarNames;
import org.apache.myfaces.test.mock.MockExternalContext;
@@ -83,7 +82,7 @@ import org.junit.Before;
* @since 1.0.3
*/
-public abstract class AbstractJsfConfigurableMultipleRequestsTestCase extends TestCase
+public abstract class AbstractJsfConfigurableMultipleRequestsTestCase
{
// ------------------------------------------------------------ Constructors
diff --git a/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractJsfTestCase.java b/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractJsfTestCase.java
index 85eefe79c..351915f5a 100644
--- a/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractJsfTestCase.java
+++ b/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractJsfTestCase.java
@@ -27,7 +27,6 @@ import jakarta.faces.application.ApplicationFactory;
import jakarta.faces.component.UIViewRoot;
import jakarta.faces.lifecycle.LifecycleFactory;
import jakarta.faces.render.RenderKitFactory;
-import junit.framework.TestCase;
import org.apache.myfaces.test.config.ResourceBundleVarNames;
import org.apache.myfaces.test.mock.MockApplication;
@@ -77,7 +76,7 @@ import org.junit.Before;
* @since 1.0.0
*/
-public abstract class AbstractJsfTestCase extends TestCase
+public abstract class AbstractJsfTestCase
{
// ------------------------------------------------------------ Constructors