cleaneup/unify junit usage
diff --git a/impl/src/test/java/javax/faces/application/ApplicationTest.java b/impl/src/test/java/javax/faces/application/ApplicationTest.java
deleted file mode 100644
index c82dac7..0000000
--- a/impl/src/test/java/javax/faces/application/ApplicationTest.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.faces.application;
-
-
-import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
-
-/**
- * Tests for {@link Application}
- */
-public class ApplicationTest extends AbstractJsfTestCase
-{
- public ApplicationTest()
- {
- }
-
- private Application app;
-
- public void setUp() throws Exception
- {
- super.setUp();
- app = new MockApplication();
- }
-
- public void tearDown() throws Exception
- {
- app = null;
- super.tearDown();
- }
-
- /**
- * Test method for {@link javax.faces.application.Application#addELResolver(javax.el.ELResolver)}.
- */
-/*
- @Test(expected=UnsupportedOperationException.class)
- public void testAddELResolver()
- {
- app.addELResolver(null);
- }*/
-
- /**
- * Test method for {@link javax.faces.application.Application#getELResolver()}.
- */
-/*
- @Test(expected=UnsupportedOperationException.class)
- public void testGetELResolver()
- {
- app.getELResolver();
- }*/
-
- /**
- * Test method for
- * {@link javax.faces.application.Application#getResourceBundle(javax.faces.context.FacesContext, java.lang.String)}.
- */
-/*
- @Test(expected=UnsupportedOperationException.class)
- public void testGetResourceBundle()
- {
- app.getResourceBundle(null, null);
- }*/
-
- /**
- * Test method for
- * {@link javax.faces.application.Application#createComponent(javax.el.ValueExpression, javax.faces.context.FacesContext, java.lang.String)}.
- */
-/*
- @Test(expected=UnsupportedOperationException.class)
- public void testCreateComponentValueExpressionFacesContextString()
- {
- app.createComponent((ValueExpression) null, null, null);
- }*/
-
- /**
- * Test method for {@link javax.faces.application.Application#getExpressionFactory()}.
- */
-/*
- @Test(expected=UnsupportedOperationException.class)
- public void testGetExpressionFactory()
- {
- app.getExpressionFactory();
- }*/
-
- /**
- * Test method for {@link javax.faces.application.Application#addELContextListener(javax.el.ELContextListener)}.
- */
-/*
- @Test(expected=UnsupportedOperationException.class)
- public void testAddELContextListener()
- {
- app.addELContextListener(null);
- }*/
-
- /**
- * Test method for {@link javax.faces.application.Application#removeELContextListener(javax.el.ELContextListener)}.
- */
-/*
- @Test(expected=UnsupportedOperationException.class)
- public void testRemoveELContextListener()
- {
- app.removeELContextListener(null);
- }*/
-
- /**
- * Test method for {@link javax.faces.application.Application#getELContextListeners()}.
- */
-/*
- @Test(expected=UnsupportedOperationException.class)
- public void testGetELContextListeners()
- {
- app.getELContextListeners();
- }*/
-
- /**
- * Test method for
- * {@link javax.faces.application.Application#evaluateExpressionGet(javax.faces.context.FacesContext, java.lang.String, java.lang.Class)}.
- */
-/*
- @Test(expected=UnsupportedOperationException.class)
- public void testEvaluateExpressionGet()
- {
- app.evaluateExpressionGet(null, null, null);
- }*/
-}
diff --git a/impl/src/test/java/javax/faces/application/FacesMessageTest.java b/impl/src/test/java/javax/faces/application/FacesMessageTest.java
index 6f85f8d..bffeeba 100644
--- a/impl/src/test/java/javax/faces/application/FacesMessageTest.java
+++ b/impl/src/test/java/javax/faces/application/FacesMessageTest.java
@@ -27,28 +27,18 @@
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.Map;
+import org.junit.Assert;
public class FacesMessageTest extends TestCase
{
-
- public static void main(String[] args)
- {
- junit.textui.TestRunner.run(FacesMessageTest.class);
- }
-
- public FacesMessageTest(String name)
- {
- super(name);
- }
-
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
super.tearDown();
}
@@ -59,9 +49,9 @@
public void testFacesMessage()
{
FacesMessage msg = new FacesMessage();
- assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
- assertNull(msg.getSummary());
- assertNull(msg.getDetail());
+ Assert.assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
+ Assert.assertNull(msg.getSummary());
+ Assert.assertNull(msg.getDetail());
}
/*
@@ -71,9 +61,9 @@
{
String summary = "summary";
FacesMessage msg = new FacesMessage(summary);
- assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
- assertEquals(msg.getSummary(), summary);
- assertEquals(msg.getDetail(), summary);
+ Assert.assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
+ Assert.assertEquals(msg.getSummary(), summary);
+ Assert.assertEquals(msg.getDetail(), summary);
}
/*
@@ -84,9 +74,9 @@
String summary = "summary";
String detail = "detail";
FacesMessage msg = new FacesMessage(summary, detail);
- assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
- assertEquals(msg.getSummary(), summary);
- assertEquals(msg.getDetail(), detail);
+ Assert.assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
+ Assert.assertEquals(msg.getSummary(), summary);
+ Assert.assertEquals(msg.getDetail(), detail);
}
/*
@@ -97,9 +87,9 @@
String summary = "summary";
String detail = "detail";
FacesMessage msg = new FacesMessage(FacesMessage.SEVERITY_ERROR, summary, detail);
- assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_ERROR);
- assertEquals(msg.getSummary(), summary);
- assertEquals(msg.getDetail(), detail);
+ Assert.assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_ERROR);
+ Assert.assertEquals(msg.getSummary(), summary);
+ Assert.assertEquals(msg.getDetail(), detail);
}
/*
@@ -112,7 +102,7 @@
try
{
new FacesMessage(null, summary, detail);
- fail("Should have thrown an exception");
+ Assert.fail("Should have thrown an exception");
}
catch (NullPointerException e)
{
@@ -125,9 +115,9 @@
public void testSetSeverity()
{
FacesMessage msg = new FacesMessage();
- assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
+ Assert.assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
msg.setSeverity(FacesMessage.SEVERITY_FATAL);
- assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_FATAL);
+ Assert.assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_FATAL);
}
/*
@@ -139,7 +129,7 @@
try
{
msg.setSeverity(null);
- fail("Should have thrown an exception");
+ Assert.fail("Should have thrown an exception");
}
catch (NullPointerException e)
{
@@ -154,8 +144,8 @@
FacesMessage msg = new FacesMessage();
String summary = "summary";
msg.setSummary(summary);
- assertEquals(msg.getSummary(), summary);
- assertEquals(msg.getDetail(), summary);
+ Assert.assertEquals(msg.getSummary(), summary);
+ Assert.assertEquals(msg.getDetail(), summary);
}
/*
@@ -166,29 +156,29 @@
FacesMessage msg = new FacesMessage();
String detail = "detail";
msg.setDetail(detail);
- assertEquals(msg.getSummary(), null);
- assertEquals(msg.getDetail(), detail);
+ Assert.assertEquals(msg.getSummary(), null);
+ Assert.assertEquals(msg.getDetail(), detail);
}
public void testSeverityOrdering()
{
// make sure they are ordered correctly from least to worst
- assertTrue(0 > FacesMessage.SEVERITY_INFO.compareTo(FacesMessage.SEVERITY_WARN));
- assertTrue(0 > FacesMessage.SEVERITY_WARN.compareTo(FacesMessage.SEVERITY_ERROR));
- assertTrue(0 > FacesMessage.SEVERITY_ERROR.compareTo(FacesMessage.SEVERITY_FATAL));
+ Assert.assertTrue(0 > FacesMessage.SEVERITY_INFO.compareTo(FacesMessage.SEVERITY_WARN));
+ Assert.assertTrue(0 > FacesMessage.SEVERITY_WARN.compareTo(FacesMessage.SEVERITY_ERROR));
+ Assert.assertTrue(0 > FacesMessage.SEVERITY_ERROR.compareTo(FacesMessage.SEVERITY_FATAL));
// make sure they are ordered correctly from worts to least
- assertTrue(0 < FacesMessage.SEVERITY_FATAL.compareTo(FacesMessage.SEVERITY_ERROR));
- assertTrue(0 < FacesMessage.SEVERITY_ERROR.compareTo(FacesMessage.SEVERITY_WARN));
- assertTrue(0 < FacesMessage.SEVERITY_WARN.compareTo(FacesMessage.SEVERITY_INFO));
+ Assert.assertTrue(0 < FacesMessage.SEVERITY_FATAL.compareTo(FacesMessage.SEVERITY_ERROR));
+ Assert.assertTrue(0 < FacesMessage.SEVERITY_ERROR.compareTo(FacesMessage.SEVERITY_WARN));
+ Assert.assertTrue(0 < FacesMessage.SEVERITY_WARN.compareTo(FacesMessage.SEVERITY_INFO));
}
public void testSeverityEquality()
{
// make sure they all respond as equals when they should
- assertEquals(0, FacesMessage.SEVERITY_INFO.compareTo(FacesMessage.SEVERITY_INFO));
- assertEquals(0, FacesMessage.SEVERITY_WARN.compareTo(FacesMessage.SEVERITY_WARN));
- assertEquals(0, FacesMessage.SEVERITY_ERROR.compareTo(FacesMessage.SEVERITY_ERROR));
- assertEquals(0, FacesMessage.SEVERITY_FATAL.compareTo(FacesMessage.SEVERITY_FATAL));
+ Assert.assertEquals(0, FacesMessage.SEVERITY_INFO.compareTo(FacesMessage.SEVERITY_INFO));
+ Assert.assertEquals(0, FacesMessage.SEVERITY_WARN.compareTo(FacesMessage.SEVERITY_WARN));
+ Assert.assertEquals(0, FacesMessage.SEVERITY_ERROR.compareTo(FacesMessage.SEVERITY_ERROR));
+ Assert.assertEquals(0, FacesMessage.SEVERITY_FATAL.compareTo(FacesMessage.SEVERITY_FATAL));
}
public void testSeverityValues()
@@ -197,7 +187,7 @@
for (int i = 0, sz = FacesMessage.VALUES.size(); i < sz; i++)
{
FacesMessage.Severity severity = (Severity) FacesMessage.VALUES.get(i);
- assertEquals(i, severity.getOrdinal());
+ Assert.assertEquals(i, severity.getOrdinal());
}
}
@@ -208,7 +198,7 @@
for (Map.Entry<String, FacesMessage.Severity> e : severityMap.entrySet())
{
- assertEquals(e.getKey(), e.getValue().toString());
+ Assert.assertEquals(e.getKey(), e.getValue().toString());
}
}
@@ -219,10 +209,10 @@
FacesMessage msg = new FacesMessage(summary, detail);
// check if properties are set correctly
- assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
- assertEquals(msg.getSummary(), summary);
- assertEquals(msg.getDetail(), detail);
- assertEquals(msg.isRendered(), false);
+ Assert.assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
+ Assert.assertEquals(msg.getSummary(), summary);
+ Assert.assertEquals(msg.getDetail(), detail);
+ Assert.assertEquals(msg.isRendered(), false);
// serialize instance
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -236,9 +226,9 @@
// FacesMessage properties must equal!
assertSame(msg.getSeverity(), deserialized.getSeverity());
- assertEquals(msg.getSummary(), deserialized.getSummary());
- assertEquals(msg.getDetail(), deserialized.getDetail());
- assertEquals(msg.isRendered(), deserialized.isRendered());
+ 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/javax/faces/application/StateManagerTest.java b/impl/src/test/java/javax/faces/application/StateManagerTest.java
index 109b149..38270c7 100644
--- a/impl/src/test/java/javax/faces/application/StateManagerTest.java
+++ b/impl/src/test/java/javax/faces/application/StateManagerTest.java
@@ -27,28 +27,18 @@
import org.apache.myfaces.test.mock.MockStateManager;
import org.easymock.MockControl;
import org.easymock.classextension.MockClassControl;
+import org.junit.Assert;
public class StateManagerTest extends TestCase
{
-
- public static void main(String[] args)
- {
- junit.textui.TestRunner.run(StateManagerTest.class);
- }
-
- public StateManagerTest(String name)
- {
- super(name);
- }
-
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
super.tearDown();
}
@@ -62,7 +52,7 @@
try
{
subject.isSavingStateInClient(null);
- fail("should have thrown an exception");
+ Assert.fail("should have thrown an exception");
}
catch (RuntimeException e)
{
@@ -86,7 +76,7 @@
externalControl.replay();
MockStateManager subject = new MockStateManager();
- assertEquals(true, subject.isSavingStateInClient(context));
+ Assert.assertEquals(true, subject.isSavingStateInClient(context));
}
/*
@@ -106,9 +96,9 @@
externalControl.replay();
MockStateManager subject = new MockStateManager();
- assertEquals(false, subject.isSavingStateInClient(context));
+ Assert.assertEquals(false, subject.isSavingStateInClient(context));
// calling a second time asserts that the code is caching the value correctly
- assertEquals(false, subject.isSavingStateInClient(context));
+ Assert.assertEquals(false, subject.isSavingStateInClient(context));
}
/*
@@ -132,7 +122,7 @@
externalControl.replay();
MockStateManager subject = new MockStateManager();
- assertEquals(false, subject.isSavingStateInClient(context));
+ Assert.assertEquals(false, subject.isSavingStateInClient(context));
}
/*
@@ -156,7 +146,7 @@
externalControl.replay();
MockStateManager subject = new MockStateManager();
- assertEquals(false, subject.isSavingStateInClient(context));
+ Assert.assertEquals(false, subject.isSavingStateInClient(context));
}
}
diff --git a/impl/src/test/java/javax/faces/application/ViewHandlerTest.java b/impl/src/test/java/javax/faces/application/ViewHandlerTest.java
index b77fe50..376316e 100644
--- a/impl/src/test/java/javax/faces/application/ViewHandlerTest.java
+++ b/impl/src/test/java/javax/faces/application/ViewHandlerTest.java
@@ -37,9 +37,9 @@
import org.apache.myfaces.test.MyFacesAsserts;
import org.apache.myfaces.test.TestRunner;
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;
public class ViewHandlerTest extends TestCase
{
@@ -49,7 +49,7 @@
private TestViewHandler _testimpl;
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
_mocksControl = EasyMock.createControl();
_externalContext = _mocksControl.createMock(ExternalContext.class);
@@ -68,7 +68,7 @@
expect(_externalContext.getRequestHeaderMap()).andReturn(map);
expect(map.get(eq("Content-Type"))).andReturn("text/html;charset=UTF-8");
_mocksControl.replay();
- assertEquals("UTF-8", _testimpl.calculateCharacterEncoding(_facesContext));
+ Assert.assertEquals("UTF-8", _testimpl.calculateCharacterEncoding(_facesContext));
_mocksControl.verify();
}
@@ -83,7 +83,7 @@
expect(_externalContext.getRequestHeaderMap()).andReturn(emptyMap);
expect(_externalContext.getSession(eq(false))).andReturn(null);
_mocksControl.replay();
- assertNull(_testimpl.calculateCharacterEncoding(_facesContext));
+ Assert.assertNull(_testimpl.calculateCharacterEncoding(_facesContext));
_mocksControl.verify();
}
@@ -102,7 +102,7 @@
expect(_externalContext.getSessionMap()).andReturn(map);
expect(map.get(eq(ViewHandler.CHARACTER_ENCODING_KEY))).andReturn(null);
_mocksControl.replay();
- assertNull(_testimpl.calculateCharacterEncoding(_facesContext));
+ Assert.assertNull(_testimpl.calculateCharacterEncoding(_facesContext));
_mocksControl.verify();
}
@@ -121,7 +121,7 @@
expect(_externalContext.getSessionMap()).andReturn(map);
expect(map.get(eq(ViewHandler.CHARACTER_ENCODING_KEY))).andReturn("UTF-8");
_mocksControl.replay();
- assertEquals("UTF-8", _testimpl.calculateCharacterEncoding(_facesContext));
+ Assert.assertEquals("UTF-8", _testimpl.calculateCharacterEncoding(_facesContext));
_mocksControl.verify();
}
diff --git a/impl/src/test/java/javax/faces/component/AbstractComponentTest.java b/impl/src/test/java/javax/faces/component/AbstractComponentTest.java
index 4c05f51..4b54783 100644
--- a/impl/src/test/java/javax/faces/component/AbstractComponentTest.java
+++ b/impl/src/test/java/javax/faces/component/AbstractComponentTest.java
@@ -25,26 +25,5 @@
*/
public abstract class AbstractComponentTest extends AbstractJmockJsfTestCase
{
- public AbstractComponentTest(String arg0)
- {
- super(arg0);
- }
- /**
- * TODO
- */
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
- }
-
- /**
- * TODO
- */
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
}
\ No newline at end of file
diff --git a/impl/src/test/java/javax/faces/component/InvokeOnComponentTest.java b/impl/src/test/java/javax/faces/component/InvokeOnComponentTest.java
index 16d0430..3260313 100644
--- a/impl/src/test/java/javax/faces/component/InvokeOnComponentTest.java
+++ b/impl/src/test/java/javax/faces/component/InvokeOnComponentTest.java
@@ -21,13 +21,13 @@
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
-import javax.faces.context.FacesContext;
import javax.faces.model.DataModel;
import javax.faces.model.ListDataModel;
import org.apache.myfaces.dummy.data.Data;
import org.jmock.Mock;
+import org.junit.Assert;
public class InvokeOnComponentTest extends AbstractComponentTest
{
@@ -35,13 +35,8 @@
Mock mock = null;
ContextCallback cc = null;
- public InvokeOnComponentTest(String arg0)
- {
- super(arg0);
- }
-
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
mock = mock(ContextCallback.class);
@@ -49,7 +44,7 @@
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
// mock.verify();
cc = null;
@@ -70,7 +65,7 @@
val.set(true);
});
- assertTrue(val.get());
+ Assert.assertTrue(val.get());
}
public void testInvokeOnFormPrependIdFalse() throws Exception
@@ -86,7 +81,7 @@
val.set(true);
});
- assertTrue(val.get());
+ Assert.assertTrue(val.get());
}
public void testInvokeOnFormPrependIdChild() throws Exception
@@ -107,7 +102,7 @@
val.set(true);
});
- assertTrue(val.get());
+ Assert.assertTrue(val.get());
}
public void testInvokeOnFormPrependIdFalseChild() throws Exception
@@ -128,7 +123,7 @@
val.set(true);
});
- assertTrue(val.get());
+ Assert.assertTrue(val.get());
}
public void atestInvokeOnComp() throws Exception
diff --git a/impl/src/test/java/javax/faces/component/UIComponentAttributesTest.java b/impl/src/test/java/javax/faces/component/UIComponentAttributesTest.java
index df6ad89..fd8f8dc 100644
--- a/impl/src/test/java/javax/faces/component/UIComponentAttributesTest.java
+++ b/impl/src/test/java/javax/faces/component/UIComponentAttributesTest.java
@@ -20,20 +20,14 @@
import javax.faces.component.html.HtmlInputText;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
public class UIComponentAttributesTest extends AbstractJsfTestCase
{
-
- public UIComponentAttributesTest(String arg0)
- {
- super(arg0);
- }
-
private HtmlInputText input;
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
input = new HtmlInputText();
@@ -41,7 +35,7 @@
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
super.tearDown();
input = null;
@@ -57,7 +51,7 @@
try
{
input.getAttributes().put("someBogus", null);
- fail("Should have thrown NullPointerException");
+ Assert.fail("Should have thrown NullPointerException");
}
catch (NullPointerException npe)
{
diff --git a/impl/src/test/java/javax/faces/component/UIComponentBaseGetChildrenTest.java b/impl/src/test/java/javax/faces/component/UIComponentBaseGetChildrenTest.java
index d4b3e1c..09784b7 100644
--- a/impl/src/test/java/javax/faces/component/UIComponentBaseGetChildrenTest.java
+++ b/impl/src/test/java/javax/faces/component/UIComponentBaseGetChildrenTest.java
@@ -21,28 +21,11 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
+import org.junit.Assert;
public class UIComponentBaseGetChildrenTest extends AbstractJsfTestCase
{
-
- public UIComponentBaseGetChildrenTest(String name)
- {
- super(name);
- }
-
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
public void testGetChildrenAddAll()
{
UIInput input0 = new UIInput();
@@ -71,9 +54,9 @@
// inserted to the first ones
children.addAll(0, list);
- assertEquals(4, children.size());
- assertEquals(input2.getId(), children.get(0).getId());
- assertEquals(input3.getId(), children.get(1).getId());
+ Assert.assertEquals(4, children.size());
+ Assert.assertEquals(input2.getId(), children.get(0).getId());
+ Assert.assertEquals(input3.getId(), children.get(1).getId());
}
public void testSimpleAddRemove()
@@ -82,9 +65,9 @@
input.setId("input0");
UIPanel panel = new UIPanel();
panel.getChildren().add(input);
- assertEquals(panel, input.getParent());
+ Assert.assertEquals(panel, input.getParent());
panel.getChildren().remove(input);
- assertNull(input.getParent());
+ Assert.assertNull(input.getParent());
}
/** Whenever a new child component is added, the parent property
@@ -103,12 +86,12 @@
UIPanel panel = new UIPanel();
panel.getChildren().add(input);
- assertEquals(panel, input.getParent());
+ Assert.assertEquals(panel, input.getParent());
panel.getChildren().set(0, input1);
- assertEquals(panel, input1.getParent());
- assertNull(input.getParent());
+ Assert.assertEquals(panel, input1.getParent());
+ Assert.assertNull(input.getParent());
}
public void testSetChild2()
@@ -121,7 +104,7 @@
UIPanel panel = new UIPanel();
panel.getChildren().add(input);
- assertEquals(panel, input.getParent());
+ Assert.assertEquals(panel, input.getParent());
UIViewRoot root = new UIViewRoot();
root.getChildren().add(panel);
@@ -129,10 +112,10 @@
panel.getChildren().set(0, input1);
- assertEquals(panel, input1.getParent());
- assertNull(input.getParent());
+ Assert.assertEquals(panel, input1.getParent());
+ Assert.assertNull(input.getParent());
- assertTrue(root.getFacets().isEmpty());
+ Assert.assertTrue(root.getFacets().isEmpty());
}
@@ -150,18 +133,18 @@
UIPanel panel = new UIPanel();
panel.getChildren().add(input);
- assertEquals(panel, input.getParent());
+ Assert.assertEquals(panel, input.getParent());
UIViewRoot root = new UIViewRoot();
root.getChildren().add(panel);
root.getFacets().put("customFacet", input1);
root.getFacets().put("customFacet", input);
- assertEquals(root, input.getParent());
- assertNull(input1.getParent());
+ Assert.assertEquals(root, input.getParent());
+ Assert.assertNull(input1.getParent());
- assertFalse(root.getFacets().isEmpty());
- assertTrue(panel.getChildCount() == 0);
+ Assert.assertFalse(root.getFacets().isEmpty());
+ Assert.assertTrue(panel.getChildCount() == 0);
}
@@ -175,17 +158,17 @@
UIPanel panel = new UIPanel();
panel.getFacets().put("header", input);
- assertEquals(panel, input.getParent());
+ Assert.assertEquals(panel, input.getParent());
UIViewRoot root = new UIViewRoot();
root.getChildren().add(panel);
root.getFacets().put("customFacet", input1);
root.getFacets().put("customFacet", input);
- assertEquals(root, input.getParent());
- assertNull(input1.getParent());
+ Assert.assertEquals(root, input.getParent());
+ Assert.assertNull(input1.getParent());
- assertFalse(root.getFacets().isEmpty());
- assertTrue(panel.getChildCount() == 0);
+ Assert.assertFalse(root.getFacets().isEmpty());
+ Assert.assertTrue(panel.getChildCount() == 0);
}
}
diff --git a/impl/src/test/java/javax/faces/component/UIComponentBaseGetClientIdTest.java b/impl/src/test/java/javax/faces/component/UIComponentBaseGetClientIdTest.java
index dbc7815..8b6b1d7 100644
--- a/impl/src/test/java/javax/faces/component/UIComponentBaseGetClientIdTest.java
+++ b/impl/src/test/java/javax/faces/component/UIComponentBaseGetClientIdTest.java
@@ -21,6 +21,7 @@
import javax.faces.FacesException;
import javax.faces.context.FacesContext;
import javax.faces.render.Renderer;
+import org.junit.Assert;
/**
* Created by IntelliJ IDEA.
@@ -31,32 +32,27 @@
*/
public class UIComponentBaseGetClientIdTest extends AbstractComponentTest
{
- public UIComponentBaseGetClientIdTest(String arg0)
- {
- super(arg0);
- }
-
protected UIComponentBase _testImpl;
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
_testImpl = new UIOutput();
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
super.tearDown();
}
- public void testNullFacesContext() throws Exception
+ public void testNullFacesContext() throws Exception
{
try
{
_testImpl.getClientId(null);
- fail();
+ Assert.fail();
}
catch(NullPointerException e)
{
@@ -64,7 +60,7 @@
}
catch(Exception e)
{
- fail();
+ Assert.fail();
}
}
@@ -73,8 +69,8 @@
String expectedClientId = "testId";
_testImpl.setId(expectedClientId);
- assertEquals(expectedClientId, _testImpl.getClientId(facesContext));
- assertEquals(expectedClientId, _testImpl.getClientId(facesContext));
+ Assert.assertEquals(expectedClientId, _testImpl.getClientId(facesContext));
+ Assert.assertEquals(expectedClientId, _testImpl.getClientId(facesContext));
}
public void testWithRenderer() throws Exception
@@ -95,8 +91,8 @@
}
};
_testImpl.setId(id);
- assertEquals(expectedClientId, _testImpl.getClientId(facesContext));
- assertEquals(expectedClientId, _testImpl.getClientId(facesContext));
+ Assert.assertEquals(expectedClientId, _testImpl.getClientId(facesContext));
+ Assert.assertEquals(expectedClientId, _testImpl.getClientId(facesContext));
}
public void testWithParentNamingContainer() throws Exception
@@ -114,8 +110,8 @@
parent.getChildren().add(_testImpl);
_testImpl.setId(id);
- assertEquals(expectedClientId, _testImpl.getClientId(facesContext));
- assertEquals(expectedClientId, _testImpl.getClientId(facesContext));
+ Assert.assertEquals(expectedClientId, _testImpl.getClientId(facesContext));
+ Assert.assertEquals(expectedClientId, _testImpl.getClientId(facesContext));
}
public void testWithParentNamingContainerChanging() throws Exception
@@ -144,8 +140,8 @@
parent.setId("parent");
parent.getChildren().add(_testImpl);
- assertEquals(expectedClientId, _testImpl.getClientId(facesContext));
- assertEquals(expectedClientId, _testImpl.getClientId(facesContext));
+ Assert.assertEquals(expectedClientId, _testImpl.getClientId(facesContext));
+ Assert.assertEquals(expectedClientId, _testImpl.getClientId(facesContext));
parent.getChildren().remove(_testImpl);
}
}
@@ -153,9 +149,9 @@
public void testWithoutId() throws Exception
{
UIViewRoot viewRoot = facesContext.getViewRoot();
- assertNotNull(viewRoot.createUniqueId());
- assertNotNull(_testImpl.getClientId());
- assertNotNull(_testImpl.getId());
+ Assert.assertNotNull(viewRoot.createUniqueId());
+ Assert.assertNotNull(_testImpl.getClientId());
+ Assert.assertNotNull(_testImpl.getId());
}
public void testWithoutIdAndNoUIViewRoot() throws Exception
@@ -164,7 +160,7 @@
try
{
_testImpl.getClientId(facesContext);
- fail();
+ Assert.fail();
}
catch(FacesException e)
{
@@ -172,7 +168,7 @@
}
catch(Exception e)
{
- fail();
+ Assert.fail();
}
}
}
diff --git a/impl/src/test/java/javax/faces/component/UIComponentBaseProcessSaveRestoreStateTest.java b/impl/src/test/java/javax/faces/component/UIComponentBaseProcessSaveRestoreStateTest.java
index 3819461..b6b348b 100644
--- a/impl/src/test/java/javax/faces/component/UIComponentBaseProcessSaveRestoreStateTest.java
+++ b/impl/src/test/java/javax/faces/component/UIComponentBaseProcessSaveRestoreStateTest.java
@@ -94,13 +94,13 @@
// public void testSaveRestoreStateWithTransientChilds() throws Exception
// {
// _testImpl.setTransient(true);
-// assertNull(_testImpl.processSaveState(_facesContext));
+// Assert.assertNull(_testImpl.processSaveState(_facesContext));
//
// _testImpl.setTransient(false);
// setUpChilds(true, true, true);
// _mocksControl.replay();
// Object state = _testImpl.processSaveState(_facesContext);
-// assertNotNull(state);
+// Assert.assertNotNull(state);
// _mocksControl.verify();
//
// _mocksControl.reset();
@@ -114,13 +114,13 @@
// public void testSaveRestoreState() throws Exception
// {
// _testImpl.setTransient(true);
-// assertNull(_testImpl.processSaveState(_facesContext));
+// Assert.assertNull(_testImpl.processSaveState(_facesContext));
//
// _testImpl.setTransient(false);
// setUpChilds(true, false, false);
// _mocksControl.replay();
// Object state = _testImpl.processSaveState(_facesContext);
-// assertNotNull(state);
+// Assert.assertNotNull(state);
// _mocksControl.verify();
//
// _mocksControl.reset();
diff --git a/impl/src/test/java/javax/faces/component/UIComponentBaseTest.java b/impl/src/test/java/javax/faces/component/UIComponentBaseTest.java
index f92db36..054c3f4 100644
--- a/impl/src/test/java/javax/faces/component/UIComponentBaseTest.java
+++ b/impl/src/test/java/javax/faces/component/UIComponentBaseTest.java
@@ -133,19 +133,19 @@
// @Test
// public void testGetChildCount() throws Exception
// {
-// assertEquals(0, _testImpl.getChildCount());
+// Assert.assertEquals(0, _testImpl.getChildCount());
// UIComponent child = _mocksControl.createMock(UIComponent.class);
// List<UIComponent> children = _testImpl.getChildren();
// expect(child.getParent()).andReturn(null);
// child.setParent(same(_testImpl));
// _mocksControl.replay();
// children.add(child);
-// assertEquals(1, _testImpl.getChildCount());
+// Assert.assertEquals(1, _testImpl.getChildCount());
// _mocksControl.reset();
// child.setParent((UIComponent) isNull());
// _mocksControl.replay();
// children.remove(child);
-// assertEquals(0, _testImpl.getChildCount());
+// Assert.assertEquals(0, _testImpl.getChildCount());
// }
@Test(expected = NullPointerException.class )
diff --git a/impl/src/test/java/javax/faces/component/UIComponentEventListenerWrapperTest.java b/impl/src/test/java/javax/faces/component/UIComponentEventListenerWrapperTest.java
index 5dd5408..9a57bf0 100644
--- a/impl/src/test/java/javax/faces/component/UIComponentEventListenerWrapperTest.java
+++ b/impl/src/test/java/javax/faces/component/UIComponentEventListenerWrapperTest.java
@@ -23,15 +23,10 @@
import javax.faces.event.ComponentSystemEvent;
import javax.faces.event.ComponentSystemEventListener;
import javax.faces.render.Renderer;
+import org.junit.Assert;
public class UIComponentEventListenerWrapperTest extends AbstractComponentTest
{
-
- public UIComponentEventListenerWrapperTest(String arg0)
- {
- super(arg0);
- }
-
public void testUIComponentListenerNormalState()
{
UIComponent component = new UIOutput();
@@ -41,7 +36,7 @@
Object state = wrapper.saveState(facesContext);
//In this case state should not be null, because state should be saved fully
- assertNotNull(state);
+ Assert.assertNotNull(state);
EventListenerWrapper wrapper2 = new EventListenerWrapper();
//For restore we need to setup the context first
@@ -49,8 +44,8 @@
wrapper2.restoreState(facesContext, state);
component.popComponentFromEL(facesContext);
- assertNotNull(wrapper2.getComponentSystemEventListener());
- assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
+ Assert.assertNotNull(wrapper2.getComponentSystemEventListener());
+ Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
public void testUIComponentListenerWithPSS()
@@ -63,7 +58,7 @@
Object state = wrapper.saveState(facesContext);
//In this case state should be null
- assertNull(state);
+ Assert.assertNull(state);
EventListenerWrapper wrapper2 = new EventListenerWrapper(component, component);
wrapper.markInitialState();
@@ -72,8 +67,8 @@
wrapper2.restoreState(facesContext, state);
component.popComponentFromEL(facesContext);
- assertNotNull(wrapper2.getComponentSystemEventListener());
- assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
+ Assert.assertNotNull(wrapper2.getComponentSystemEventListener());
+ Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
public void testUIComponentListenerWithPSSFull()
@@ -88,7 +83,7 @@
Object state = wrapper.saveState(facesContext);
//In this case state should not be null, because state should be saved fully
- assertNotNull(state);
+ Assert.assertNotNull(state);
EventListenerWrapper wrapper2 = new EventListenerWrapper(component, component);
wrapper.markInitialState();
@@ -97,8 +92,8 @@
wrapper2.restoreState(facesContext, state);
component.popComponentFromEL(facesContext);
- assertNotNull(wrapper2.getComponentSystemEventListener());
- assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
+ Assert.assertNotNull(wrapper2.getComponentSystemEventListener());
+ Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
public static class MyCustomRenderer extends Renderer implements ComponentSystemEventListener {
@@ -121,7 +116,7 @@
Object state = wrapper.saveState(facesContext);
//In this case state should not be null, because state should be saved fully
- assertNotNull(state);
+ Assert.assertNotNull(state);
EventListenerWrapper wrapper2 = new EventListenerWrapper();
//For restore we need to setup the context first
@@ -129,8 +124,8 @@
wrapper2.restoreState(facesContext, state);
component.popComponentFromEL(facesContext);
- assertNotNull(wrapper2.getComponentSystemEventListener());
- assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
+ Assert.assertNotNull(wrapper2.getComponentSystemEventListener());
+ Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
public void testRendererListenerWithPSS()
@@ -146,7 +141,7 @@
Object state = wrapper.saveState(facesContext);
//In this case state should be null
- assertNull(state);
+ Assert.assertNull(state);
EventListenerWrapper wrapper2 = new EventListenerWrapper(component, renderer);
wrapper.markInitialState();
@@ -155,8 +150,8 @@
wrapper2.restoreState(facesContext, state);
component.popComponentFromEL(facesContext);
- assertNotNull(wrapper2.getComponentSystemEventListener());
- assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
+ Assert.assertNotNull(wrapper2.getComponentSystemEventListener());
+ Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
public void testRendererListenerWithPSSFull()
@@ -174,7 +169,7 @@
Object state = wrapper.saveState(facesContext);
//In this case state should not be null, because state should be saved fully
- assertNotNull(state);
+ Assert.assertNotNull(state);
EventListenerWrapper wrapper2 = new EventListenerWrapper(component, renderer);
wrapper.markInitialState();
@@ -183,8 +178,8 @@
wrapper2.restoreState(facesContext, state);
component.popComponentFromEL(facesContext);
- assertNotNull(wrapper2.getComponentSystemEventListener());
- assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
+ Assert.assertNotNull(wrapper2.getComponentSystemEventListener());
+ Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
public static class MyNonSerializableListener implements ComponentSystemEventListener {
@@ -213,7 +208,7 @@
Object state = wrapper.saveState(facesContext);
//In this case state should not be null, because state should be saved fully
- assertNotNull(state);
+ Assert.assertNotNull(state);
EventListenerWrapper wrapper2 = new EventListenerWrapper();
//For restore we need to setup the context first
@@ -221,8 +216,8 @@
wrapper2.restoreState(facesContext, state);
component.popComponentFromEL(facesContext);
- assertNotNull(wrapper2.getComponentSystemEventListener());
- assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
+ Assert.assertNotNull(wrapper2.getComponentSystemEventListener());
+ Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
public void testNonSerializableListenerWithPSS()
@@ -236,7 +231,7 @@
Object state = wrapper.saveState(facesContext);
//In this case state should be null
- assertNull(state);
+ Assert.assertNull(state);
EventListenerWrapper wrapper2 = new EventListenerWrapper(component, listener);
wrapper.markInitialState();
@@ -245,8 +240,8 @@
wrapper2.restoreState(facesContext, state);
component.popComponentFromEL(facesContext);
- assertNotNull(wrapper2.getComponentSystemEventListener());
- assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
+ Assert.assertNotNull(wrapper2.getComponentSystemEventListener());
+ Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
public void testNonSerializableListenerWithPSSFull()
@@ -262,7 +257,7 @@
Object state = wrapper.saveState(facesContext);
//In this case state should not be null, because state should be saved fully
- assertNotNull(state);
+ Assert.assertNotNull(state);
EventListenerWrapper wrapper2 = new EventListenerWrapper(component, listener);
wrapper.markInitialState();
@@ -271,8 +266,8 @@
wrapper2.restoreState(facesContext, state);
component.popComponentFromEL(facesContext);
- assertNotNull(wrapper2.getComponentSystemEventListener());
- assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
+ Assert.assertNotNull(wrapper2.getComponentSystemEventListener());
+ Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
public static class MySerializableListener implements ComponentSystemEventListener {
@@ -301,7 +296,7 @@
Object state = wrapper.saveState(facesContext);
//In this case state should not be null, because state should be saved fully
- assertNotNull(state);
+ Assert.assertNotNull(state);
EventListenerWrapper wrapper2 = new EventListenerWrapper();
//For restore we need to setup the context first
@@ -309,8 +304,8 @@
wrapper2.restoreState(facesContext, state);
component.popComponentFromEL(facesContext);
- assertNotNull(wrapper2.getComponentSystemEventListener());
- assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
+ Assert.assertNotNull(wrapper2.getComponentSystemEventListener());
+ Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
public void testSerializableListenerWithPSS()
@@ -324,7 +319,7 @@
Object state = wrapper.saveState(facesContext);
//In this case state should be null
- assertNull(state);
+ Assert.assertNull(state);
EventListenerWrapper wrapper2 = new EventListenerWrapper(component, listener);
wrapper.markInitialState();
@@ -333,8 +328,8 @@
wrapper2.restoreState(facesContext, state);
component.popComponentFromEL(facesContext);
- assertNotNull(wrapper2.getComponentSystemEventListener());
- assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
+ Assert.assertNotNull(wrapper2.getComponentSystemEventListener());
+ Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
public void testSerializableListenerWithPSSFull()
@@ -350,7 +345,7 @@
Object state = wrapper.saveState(facesContext);
//In this case state should not be null, because state should be saved fully
- assertNotNull(state);
+ Assert.assertNotNull(state);
EventListenerWrapper wrapper2 = new EventListenerWrapper(component, listener);
wrapper.markInitialState();
@@ -359,8 +354,8 @@
wrapper2.restoreState(facesContext, state);
component.popComponentFromEL(facesContext);
- assertNotNull(wrapper2.getComponentSystemEventListener());
- assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
+ Assert.assertNotNull(wrapper2.getComponentSystemEventListener());
+ Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
public static class MyStateHolderListener implements ComponentSystemEventListener, StateHolder {
@@ -420,7 +415,7 @@
Object state = wrapper.saveState(facesContext);
//In this case state should not be null, because state should be saved fully
- assertNotNull(state);
+ Assert.assertNotNull(state);
EventListenerWrapper wrapper2 = new EventListenerWrapper();
//For restore we need to setup the context first
@@ -428,8 +423,8 @@
wrapper2.restoreState(facesContext, state);
component.popComponentFromEL(facesContext);
- assertNotNull(wrapper2.getComponentSystemEventListener());
- assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
+ Assert.assertNotNull(wrapper2.getComponentSystemEventListener());
+ Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
public void testStateHolderListenerWithPSS()
@@ -443,7 +438,7 @@
Object state = wrapper.saveState(facesContext);
//In this case state should be not null, because it implements StateHolder
- assertNotNull(state);
+ Assert.assertNotNull(state);
MyStateHolderListener listener2 = new MyStateHolderListener();
listener2.setI(2);
@@ -454,8 +449,8 @@
wrapper2.restoreState(facesContext, state);
component.popComponentFromEL(facesContext);
- assertNotNull(wrapper2.getComponentSystemEventListener());
- assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
+ Assert.assertNotNull(wrapper2.getComponentSystemEventListener());
+ Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
public void testStateHolderListenerWithPSSFull()
@@ -471,7 +466,7 @@
Object state = wrapper.saveState(facesContext);
//In this case state should not be null, because state should be saved fully
- assertNotNull(state);
+ Assert.assertNotNull(state);
EventListenerWrapper wrapper2 = new EventListenerWrapper(component, listener);
wrapper.markInitialState();
@@ -480,8 +475,8 @@
wrapper2.restoreState(facesContext, state);
component.popComponentFromEL(facesContext);
- assertNotNull(wrapper2.getComponentSystemEventListener());
- assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
+ Assert.assertNotNull(wrapper2.getComponentSystemEventListener());
+ Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
public static class MyPartialStateHolderListener implements ComponentSystemEventListener, PartialStateHolder {
@@ -572,7 +567,7 @@
Object state = wrapper.saveState(facesContext);
//In this case state should not be null, because state should be saved fully
- assertNotNull(state);
+ Assert.assertNotNull(state);
EventListenerWrapper wrapper2 = new EventListenerWrapper();
//For restore we need to setup the context first
@@ -580,8 +575,8 @@
wrapper2.restoreState(facesContext, state);
component.popComponentFromEL(facesContext);
- assertNotNull(wrapper2.getComponentSystemEventListener());
- assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
+ Assert.assertNotNull(wrapper2.getComponentSystemEventListener());
+ Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
public void testPartialStateHolderListenerWithPSS()
@@ -595,7 +590,7 @@
Object state = wrapper.saveState(facesContext);
//In this case state should be null
- assertNull(state);
+ Assert.assertNull(state);
EventListenerWrapper wrapper2 = new EventListenerWrapper(component, listener);
wrapper.markInitialState();
@@ -604,8 +599,8 @@
wrapper2.restoreState(facesContext, state);
component.popComponentFromEL(facesContext);
- assertNotNull(wrapper2.getComponentSystemEventListener());
- assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
+ Assert.assertNotNull(wrapper2.getComponentSystemEventListener());
+ Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
public void testPartialStateHolderListenerWithPSS2()
@@ -621,7 +616,7 @@
Object state = wrapper.saveState(facesContext);
//In this case state should be not null, because something changed inside the listener
- assertNotNull(state);
+ Assert.assertNotNull(state);
EventListenerWrapper wrapper2 = new EventListenerWrapper(component, new MyPartialStateHolderListener());
wrapper.markInitialState();
@@ -630,8 +625,8 @@
wrapper2.restoreState(facesContext, state);
component.popComponentFromEL(facesContext);
- assertNotNull(wrapper2.getComponentSystemEventListener());
- assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
+ Assert.assertNotNull(wrapper2.getComponentSystemEventListener());
+ Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
public void testPartialStateHolderListenerWithPSSFull()
@@ -647,7 +642,7 @@
Object state = wrapper.saveState(facesContext);
//In this case state should not be null, because state should be saved fully
- assertNotNull(state);
+ Assert.assertNotNull(state);
EventListenerWrapper wrapper2 = new EventListenerWrapper(component, listener);
wrapper.markInitialState();
@@ -656,7 +651,7 @@
wrapper2.restoreState(facesContext, state);
component.popComponentFromEL(facesContext);
- assertNotNull(wrapper2.getComponentSystemEventListener());
- assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
+ Assert.assertNotNull(wrapper2.getComponentSystemEventListener());
+ Assert.assertEquals(wrapper.getComponentSystemEventListener(), wrapper2.getComponentSystemEventListener());
}
}
diff --git a/impl/src/test/java/javax/faces/component/UIComponentFindComponentTest.java b/impl/src/test/java/javax/faces/component/UIComponentFindComponentTest.java
index 4e91256..0175833 100644
--- a/impl/src/test/java/javax/faces/component/UIComponentFindComponentTest.java
+++ b/impl/src/test/java/javax/faces/component/UIComponentFindComponentTest.java
@@ -18,6 +18,8 @@
*/
package javax.faces.component;
+import org.junit.Assert;
+
/**
* Created by IntelliJ IDEA.
@@ -28,22 +30,17 @@
*/
public class UIComponentFindComponentTest extends AbstractComponentTest
{
- public UIComponentFindComponentTest(String arg0)
- {
- super(arg0);
- }
-
protected UIComponentBase _testImpl;
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
_testImpl = new UIOutput();
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
super.tearDown();
}
@@ -53,8 +50,8 @@
try
{
_testImpl.findComponent(null);
- assertNull(_testImpl.findComponent(""));
- fail();
+ Assert.assertNull(_testImpl.findComponent(""));
+ Assert.fail();
}
catch(NullPointerException e)
{
@@ -62,13 +59,13 @@
}
catch(Exception e)
{
- fail();
+ Assert.fail();
}
}
public void testWithEmptyExperession() throws Exception
{
- assertNull(_testImpl.findComponent(""));
+ Assert.assertNull(_testImpl.findComponent(""));
}
public void testRootExpression() throws Exception
@@ -83,7 +80,7 @@
parent.getChildren().add(_testImpl);
_testImpl.setId("testimpl");
- assertEquals(parent, _testImpl.findComponent(expression));
+ Assert.assertEquals(parent, _testImpl.findComponent(expression));
}
public void testRelativeExpression() throws Exception
@@ -99,7 +96,7 @@
parent.getChildren().add(_testImpl);
_testImpl.setId("testimpl");
- assertEquals(_testImpl, _testImpl.findComponent(expression));
+ Assert.assertEquals(_testImpl, _testImpl.findComponent(expression));
}
public void testComplexRelativeExpression() throws Exception
@@ -115,7 +112,7 @@
child1_1.getChildren().add(_testImpl);
_testImpl.setId("testimpl");
- assertEquals(_testImpl, namingContainer.findComponent(expression));
+ Assert.assertEquals(_testImpl, namingContainer.findComponent(expression));
}
public void testOverriddenFindComponent() {
@@ -156,12 +153,12 @@
uiData.getChildren().add(column);
column.getChildren().add(command);
- assertNull(viewRoot.findComponent(":xx"));
- assertEquals(uiData, viewRoot.findComponent(":data"));
- assertEquals(column, viewRoot.findComponent(":data:column"));
- assertEquals(command, viewRoot.findComponent(":data:command"));
- assertEquals(command, viewRoot.findComponent("data:1:command"));
- assertEquals(command, viewRoot.findComponent(":data:1:command"));
+ Assert.assertNull(viewRoot.findComponent(":xx"));
+ Assert.assertEquals(uiData, viewRoot.findComponent(":data"));
+ Assert.assertEquals(column, viewRoot.findComponent(":data:column"));
+ Assert.assertEquals(command, viewRoot.findComponent(":data:command"));
+ Assert.assertEquals(command, viewRoot.findComponent("data:1:command"));
+ Assert.assertEquals(command, viewRoot.findComponent(":data:1:command"));
}
public void testXXFindComponent() {
@@ -176,10 +173,10 @@
uiData.getChildren().add(column);
column.getChildren().add(command);
- assertNull(viewRoot.findComponent(":xx"));
- assertNotNull(viewRoot.findComponent(":x"));
- assertNotNull(viewRoot.findComponent(":x:column"));
- assertNotNull(viewRoot.findComponent(":x:x"));
+ Assert.assertNull(viewRoot.findComponent(":xx"));
+ Assert.assertNotNull(viewRoot.findComponent(":x"));
+ Assert.assertNotNull(viewRoot.findComponent(":x:column"));
+ Assert.assertNotNull(viewRoot.findComponent(":x:x"));
}
@@ -196,7 +193,7 @@
parent.getChildren().add(_testImpl);
_testImpl.setId("testimpl");
- assertEquals(_testImpl, namingContainer.findComponent(expression));
+ Assert.assertEquals(_testImpl, namingContainer.findComponent(expression));
}
}
diff --git a/impl/src/test/java/javax/faces/component/UIDataTest.java b/impl/src/test/java/javax/faces/component/UIDataTest.java
index 055d473..6dd2b47 100644
--- a/impl/src/test/java/javax/faces/component/UIDataTest.java
+++ b/impl/src/test/java/javax/faces/component/UIDataTest.java
@@ -42,29 +42,23 @@
import javax.faces.event.FacesEvent;
import javax.faces.event.PhaseId;
import javax.faces.render.Renderer;
-import static junit.framework.TestCase.assertEquals;
import org.apache.myfaces.test.MyFacesAsserts;
import org.apache.myfaces.test.TestRunner;
import org.apache.myfaces.test.mock.MockRenderedValueExpression;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.visit.MockVisitContext;
import org.easymock.classextension.EasyMock;
import org.easymock.classextension.IMocksControl;
+import org.junit.Assert;
public class UIDataTest extends AbstractJsfTestCase
{
-
- public UIDataTest(String name)
- {
- super(name);
- }
-
private IMocksControl _mocksControl;
private UIData _testImpl;
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
_mocksControl = EasyMock.createControl();
@@ -100,11 +94,11 @@
_testImpl.setId("xxx");
Renderer renderer = _mocksControl.createMock(Renderer.class);
renderKit.addRenderer(UIData.COMPONENT_FAMILY, UIData.COMPONENT_TYPE, renderer);
- assertEquals("xxx", _testImpl.getClientId(facesContext));
+ Assert.assertEquals("xxx", _testImpl.getClientId(facesContext));
_testImpl.setRowIndex(99);
//MYFACES-2744 UIData.getClientId() should not append rowIndex, instead use UIData.getContainerClientId()
- assertEquals("xxx", _testImpl.getClientId(facesContext));
- assertEquals("xxx:99", _testImpl.getContainerClientId(facesContext));
+ Assert.assertEquals("xxx", _testImpl.getClientId(facesContext));
+ Assert.assertEquals("xxx:99", _testImpl.getContainerClientId(facesContext));
}
/**
@@ -142,7 +136,7 @@
MyContextCallback callback = new MyContextCallback();
_testImpl.invokeOnComponent(facesContext, facet.getClientId(facesContext), callback);
// the callback should have been invoked
- assertTrue(callback.invoked);
+ Assert.assertTrue(callback.invoked);
}
/**
@@ -162,13 +156,13 @@
throws AbortProcessingException
{
// the event must be the originalEvent
- assertEquals(originalEvent, event);
+ Assert.assertEquals(originalEvent, event);
// the current row index must be the row index from the time the event was queued
- assertEquals(5, _testImpl.getRowIndex());
+ Assert.assertEquals(5, _testImpl.getRowIndex());
// the current component must be this (pushComponentToEL() must have happened)
- assertEquals(this, UIComponent.getCurrentComponent(facesContext));
+ Assert.assertEquals(this, UIComponent.getCurrentComponent(facesContext));
// to be able to verify that broadcast() really has been called
getAttributes().put("broadcastCalled", Boolean.TRUE);
@@ -198,16 +192,16 @@
// -= Assertions =-
// the current component must be null (popComponentFromEL() must have happened)
- assertNull(UIComponent.getCurrentComponent(facesContext));
+ Assert.assertNull(UIComponent.getCurrentComponent(facesContext));
// the row index must now be 0 (at broadcast() it must be 5)
- assertEquals(0, _testImpl.getRowIndex());
+ Assert.assertEquals(0, _testImpl.getRowIndex());
// verify mock behavior
_mocksControl.verify();
// verify that broadcast() really has been called
- assertEquals(Boolean.TRUE, eventComponent.getAttributes().get("broadcastCalled"));
+ Assert.assertEquals(Boolean.TRUE, eventComponent.getAttributes().get("broadcastCalled"));
}
/**
@@ -614,7 +608,7 @@
{
RowData rowData = model.get(i);
table.setRowIndex(i);
- assertEquals(rowData.getText(), text.getValue());
+ Assert.assertEquals(rowData.getText(), text.getValue());
text.getAttributes().put("style", rowData.getStyle());
}
@@ -625,7 +619,7 @@
for (int i = 0; i < model.size(); i++)
{
table.setRowIndex(i);
- assertEquals(model.get(i).getStyle(), text.getAttributes().get("style"));
+ Assert.assertEquals(model.get(i).getStyle(), text.getAttributes().get("style"));
}
}
@@ -672,7 +666,7 @@
{
RowData rowData = it.next();
table.setRowIndex(i);
- assertEquals(rowData.getText(), text.getValue());
+ Assert.assertEquals(rowData.getText(), text.getValue());
i++;
}
@@ -729,9 +723,9 @@
}
public void verify() {
- assertEquals("header facet must be visited only ones", 1, headerFacetVisits);
- assertEquals("footer facet must be visited only ones", 1, footerFacetVisits);
- assertEquals("Expected row visit does not match", expectedVisits, rowVisits);
+ Assert.assertEquals("header facet must be visited only ones", 1, headerFacetVisits);
+ Assert.assertEquals("footer facet must be visited only ones", 1, footerFacetVisits);
+ Assert.assertEquals("Expected row visit does not match", expectedVisits, rowVisits);
}
}
@@ -741,7 +735,7 @@
uiData.processDecodes(facesContext);
- assertEquals("processDecodes must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
+ Assert.assertEquals("processDecodes must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
}
@@ -752,7 +746,7 @@
_testImpl.processDecodes(facesContext);
- assertEquals("processDecodes must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
+ Assert.assertEquals("processDecodes must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
}
@@ -762,7 +756,7 @@
uiData.processValidators(facesContext);
- assertEquals("processDecodes must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
+ Assert.assertEquals("processDecodes must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
}
@@ -773,7 +767,7 @@
_testImpl.processValidators(facesContext);
- assertEquals("processValidators must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
+ Assert.assertEquals("processValidators must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
}
public void testProcessUpdatesRenderedFalse() throws Exception {
@@ -782,7 +776,7 @@
uiData.processUpdates(facesContext);
- assertEquals("processUpdates must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
+ Assert.assertEquals("processUpdates must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
}
@@ -793,7 +787,7 @@
_testImpl.processUpdates(facesContext);
- assertEquals("processUpdates must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
+ Assert.assertEquals("processUpdates must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
}
private void _addColumn() {
@@ -809,25 +803,25 @@
public class VerifyNoLifecycleMethodComponent extends UIData
{
public void setRowIndex(int rowIndex) {
- fail();
+ Assert.fail();
}
public void decode(FacesContext context) {
- fail();
+ Assert.fail();
}
public void validate(FacesContext context) {
- fail();
+ Assert.fail();
}
public void updateModel(FacesContext context) {
- fail();
+ Assert.fail();
}
public void encodeBegin(FacesContext context) throws IOException {
- fail();
+ Assert.fail();
}
public void encodeChildren(FacesContext context) throws IOException {
- fail();
+ Assert.fail();
}
public void encodeEnd(FacesContext context) throws IOException {
- fail();
+ Assert.fail();
}
}
@@ -866,7 +860,7 @@
{
RowData rowData = model.get(i);
table.setRowIndex(i);
- assertEquals(rowData.getText(), text.getValue());
+ Assert.assertEquals(rowData.getText(), text.getValue());
text.setSubmittedValue("value"+(i+1));
//text.getAttributes().put("style", rowData.getStyle());
}
@@ -905,7 +899,7 @@
{
RowData rowData = model.get(i);
table.setRowIndex(i);
- assertEquals("value"+(i+1), text.getSubmittedValue());
+ Assert.assertEquals("value"+(i+1), text.getSubmittedValue());
//assertEquals(model.get(i).getStyle(), text.getAttributes().get("style"));
}
}
@@ -989,7 +983,7 @@
{
RowData rowData = model.get(i);
table.setRowIndex(i);
- assertEquals(rowData.getText(), text.getValue());
+ Assert.assertEquals(rowData.getText(), text.getValue());
text.setSubmittedValue("value"+(i+1));
//text.getAttributes().put("style", rowData.getStyle());
}
@@ -1038,7 +1032,7 @@
{
RowData rowData = model.get(i);
table.setRowIndex(i);
- assertEquals("value"+(i+1), text.getSubmittedValue());
+ Assert.assertEquals("value"+(i+1), text.getSubmittedValue());
//assertEquals(model.get(i).getStyle(), text.getAttributes().get("style"));
}
@@ -1088,7 +1082,7 @@
{
RowData rowData = model.get(i);
table.setRowIndex(i);
- assertEquals(rowData.getText(), text.getValue());
+ Assert.assertEquals(rowData.getText(), text.getValue());
text.setSubmittedValue("value"+(i+1));
text.getTransientStateHelper().putTransient("key", "value"+(i+1));
//text.getAttributes().put("style", rowData.getStyle());
@@ -1138,8 +1132,8 @@
{
RowData rowData = model.get(i);
table.setRowIndex(i);
- assertEquals("value"+(i+1), text.getSubmittedValue());
- assertEquals("value"+(i+1), text.getTransientStateHelper().getTransient("key"));
+ Assert.assertEquals("value"+(i+1), text.getSubmittedValue());
+ Assert.assertEquals("value"+(i+1), text.getTransientStateHelper().getTransient("key"));
//assertEquals(model.get(i).getStyle(), text.getAttributes().get("style"));
}
diff --git a/impl/src/test/java/javax/faces/component/UIInputTest.java b/impl/src/test/java/javax/faces/component/UIInputTest.java
index 913b6f4..a912e58 100644
--- a/impl/src/test/java/javax/faces/component/UIInputTest.java
+++ b/impl/src/test/java/javax/faces/component/UIInputTest.java
@@ -45,9 +45,10 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.myfaces.test.mock.MockRenderedValueExpression;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.el.MockValueExpression;
import org.apache.myfaces.test.mock.visit.MockVisitCallback;
+import org.junit.Assert;
public class UIInputTest extends AbstractJsfTestCase
{
@@ -56,13 +57,8 @@
private Validator mockValidator;
private UIInput input;
- public UIInputTest(String name)
- {
- super(name);
- }
-
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
input = new UIInput();
@@ -72,7 +68,7 @@
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
super.tearDown();
input = null;
@@ -110,12 +106,12 @@
input.validate(facesContext);
verify(mockConverter);
- assertFalse(input.isValid());
- assertNotNull(facesContext.getMessages("testId"));
+ Assert.assertFalse(input.isValid());
+ Assert.assertNotNull(facesContext.getMessages("testId"));
FacesMessage message = (FacesMessage) facesContext.getMessages("testId").next();
- assertEquals(message.getDetail(), "Cannot convert");
- assertEquals(message.getSummary(), "Cannot convert");
+ Assert.assertEquals(message.getDetail(), "Cannot convert");
+ Assert.assertEquals(message.getSummary(), "Cannot convert");
}
public void testWhenSpecifiedValidatorMessageIsUsedInCaseValidatorExceptionOccurs()
@@ -130,12 +126,12 @@
input.validateValue(facesContext, "xxx");
verify(mockValidator);
- assertFalse(input.isValid());
- assertNotNull(facesContext.getMessages("testId"));
+ Assert.assertFalse(input.isValid());
+ Assert.assertNotNull(facesContext.getMessages("testId"));
FacesMessage message = (FacesMessage) facesContext.getMessages("testId").next();
- assertEquals(message.getDetail(), "Cannot validate");
- assertEquals(message.getSummary(), "Cannot validate");
+ Assert.assertEquals(message.getDetail(), "Cannot validate");
+ Assert.assertEquals(message.getSummary(), "Cannot validate");
}
public void testUpdateModelSetsTheLocalValueToModelValue()
@@ -148,7 +144,7 @@
input.updateModel(facesContext);
String updatedValue = expression.getValue(facesContext.getELContext()).toString();
- assertEquals("testValue", updatedValue);
+ Assert.assertEquals("testValue", updatedValue);
}
public void testValidateWithEmptyStringWithEmptyStringAsNullEnabled()
@@ -169,7 +165,7 @@
throws ValidatorException
{
// the value must be null
- assertNull(value);
+ Assert.assertNull(value);
}
@@ -178,7 +174,7 @@
input.setSubmittedValue("");
input.validate(facesContext);
- assertEquals(null, input.getSubmittedValue());
+ Assert.assertEquals(null, input.getSubmittedValue());
}
finally
{
@@ -203,7 +199,7 @@
throws ValidatorException
{
// the value must not be null
- assertNotNull(value);
+ Assert.assertNotNull(value);
// throw Exception to ensure this was called
throw new RuntimeException();
@@ -228,7 +224,7 @@
{
input.validate(facesContext);
- fail(); // validate() was not called --> fail!
+ Assert.fail(); // validate() was not called --> fail!
}
catch (RuntimeException e)
{
@@ -253,8 +249,8 @@
input.setSubmittedValue("asd");
input.validate(facesContext);
- assertEquals(null, input.getSubmittedValue());
- assertEquals("asd", input.getValue());
+ Assert.assertEquals(null, input.getSubmittedValue());
+ Assert.assertEquals("asd", input.getValue());
}
finally
{
@@ -274,7 +270,7 @@
input.setSubmittedValue("");
input.validate(facesContext);
- assertEquals("", input.getValue());
+ Assert.assertEquals("", input.getValue());
}
finally
{
@@ -294,7 +290,7 @@
input.setSubmittedValue("");
input.validate(facesContext);
- assertEquals("", input.getValue());
+ Assert.assertEquals("", input.getValue());
}
finally
{
@@ -314,9 +310,9 @@
input.setSubmittedValue("123");
- assertFalse(facesContext.isValidationFailed());
+ Assert.assertFalse(facesContext.isValidationFailed());
input.processValidators(facesContext);
- assertTrue(facesContext.isValidationFailed());
+ Assert.assertTrue(facesContext.isValidationFailed());
}
static public class InitParameterMockExternalContext extends org.apache.myfaces.test.mock.MockExternalContext {
@@ -346,7 +342,7 @@
input.processDecodes(facesContext);
- assertEquals("processDecodes must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
+ Assert.assertEquals("processDecodes must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
}
@@ -357,7 +353,7 @@
input.processDecodes(facesContext);
- assertEquals("processDecodes must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
+ Assert.assertEquals("processDecodes must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
}
public void testProcessValidatorsRenderedFalse() throws Exception {
@@ -366,7 +362,7 @@
input.processValidators(facesContext);
- assertEquals("processValidators must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
+ Assert.assertEquals("processValidators must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
}
@@ -377,7 +373,7 @@
input.processValidators(facesContext);
- assertEquals("processValidators must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
+ Assert.assertEquals("processValidators must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
}
@@ -387,7 +383,7 @@
input.processUpdates(facesContext);
- assertEquals("processValidators must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
+ Assert.assertEquals("processValidators must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
}
@@ -398,7 +394,7 @@
input.processUpdates(facesContext);
- assertEquals("processValidators must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
+ Assert.assertEquals("processValidators must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
}
public void testVisitTree() throws Exception {
@@ -408,29 +404,29 @@
MockVisitCallback mockVisitCallback = new MockVisitCallback();
input.visitTree(visitContext, mockVisitCallback);
- assertEquals("visitTree must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
+ Assert.assertEquals("visitTree must not change currentComponent", parent, UIComponent.getCurrentComponent(facesContext));
}
/** Verifies no call to encode* and process* methods */
public class VerifyNoLifecycleMethodComponent extends UIInput
{
public void decode(FacesContext context) {
- fail();
+ Assert.fail();
}
public void validate(FacesContext context) {
- fail();
+ Assert.fail();
}
public void updateModel(FacesContext context) {
- fail();
+ Assert.fail();
}
public void encodeBegin(FacesContext context) throws IOException {
- fail();
+ Assert.fail();
}
public void encodeChildren(FacesContext context) throws IOException {
- fail();
+ Assert.fail();
}
public void encodeEnd(FacesContext context) throws IOException {
- fail();
+ Assert.fail();
}
}
diff --git a/impl/src/test/java/javax/faces/component/UISelectItemsTest.java b/impl/src/test/java/javax/faces/component/UISelectItemsTest.java
index f5523d9..e31753e 100644
--- a/impl/src/test/java/javax/faces/component/UISelectItemsTest.java
+++ b/impl/src/test/java/javax/faces/component/UISelectItemsTest.java
@@ -24,8 +24,9 @@
import javax.el.ValueExpression;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.el.MockValueExpression;
+import org.junit.Assert;
/**
* Tests for UISelectItems.
@@ -33,11 +34,6 @@
public class UISelectItemsTest extends AbstractJsfTestCase
{
- public UISelectItemsTest(String name)
- {
- super(name);
- }
-
public void testStringListAsValue()
{
List<String> value = new ArrayList<String>();
@@ -61,7 +57,7 @@
options.add((String) iter.next().getValue());
}
- assertEquals(value, options);
+ Assert.assertEquals(value, options);
}
public void testPrimitiveArrayAsValue()
@@ -87,7 +83,7 @@
options[i] = (Integer) iter.next().getValue();
// test equality
- assertEquals(value[i], options[i]);
+ Assert.assertEquals(value[i], options[i]);
}
}
}
diff --git a/impl/src/test/java/javax/faces/component/UIViewParameterTest.java b/impl/src/test/java/javax/faces/component/UIViewParameterTest.java
index 6e14ab4..ffb7022 100644
--- a/impl/src/test/java/javax/faces/component/UIViewParameterTest.java
+++ b/impl/src/test/java/javax/faces/component/UIViewParameterTest.java
@@ -18,7 +18,8 @@
*/
package javax.faces.component;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
+import org.junit.Assert;
/**
* Test class for UIViewParameter.
@@ -29,14 +30,9 @@
{
private UIViewParameter viewParameter = null;
-
- public UIViewParameterTest(String name)
- {
- super(name);
- }
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
@@ -45,7 +41,7 @@
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
viewParameter = null;
@@ -62,9 +58,9 @@
viewParameter.setRequired(true);
viewParameter.setSubmittedValue(null);
- assertFalse(facesContext.isValidationFailed());
+ Assert.assertFalse(facesContext.isValidationFailed());
viewParameter.processValidators(facesContext);
- assertTrue(facesContext.isValidationFailed());
+ Assert.assertTrue(facesContext.isValidationFailed());
}
/**
@@ -80,7 +76,7 @@
viewParameter.decode(facesContext);
- assertEquals(viewParameter.getSubmittedValue(), notNull);
+ Assert.assertEquals(viewParameter.getSubmittedValue(), notNull);
}
}
diff --git a/impl/src/test/java/javax/faces/component/UIViewRootTest.java b/impl/src/test/java/javax/faces/component/UIViewRootTest.java
index b0f41c6..4358c75 100644
--- a/impl/src/test/java/javax/faces/component/UIViewRootTest.java
+++ b/impl/src/test/java/javax/faces/component/UIViewRootTest.java
@@ -56,6 +56,7 @@
import org.easymock.classextension.EasyMock;
import org.easymock.classextension.IMocksControl;
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -112,13 +113,13 @@
@Test
public void testSuperClass() throws Exception
{
- assertEquals(UIComponentBase.class, UIViewRoot.class.getSuperclass());
+ Assert.assertEquals(UIComponentBase.class, UIViewRoot.class.getSuperclass());
}
@Test
public void testComponentType() throws Exception
{
- assertEquals("javax.faces.ViewRoot", UIViewRoot.COMPONENT_TYPE);
+ Assert.assertEquals("javax.faces.ViewRoot", UIViewRoot.COMPONENT_TYPE);
}
@Test
@@ -129,9 +130,9 @@
_mocksControl.replay();
_facesContext.setApplication(_application);
- assertNull(_testimpl.getLocale());
+ Assert.assertNull(_testimpl.getLocale());
_testimpl.setLocale(Locale.JAPANESE);
- assertEquals(Locale.JAPANESE, _testimpl.getLocale());
+ Assert.assertEquals(Locale.JAPANESE, _testimpl.getLocale());
_mocksControl.verify();
}
@@ -155,7 +156,7 @@
{
if (!createdIds.add(_testimpl.createUniqueId()))
{
- fail("duplicate id created");
+ Assert.fail("duplicate id created");
}
}
_mocksControl.verify();
@@ -311,7 +312,7 @@
// */
// public void testSaveState()
// {
- // fail("Not yet implemented"); // TODO
+ // Assert.fail("Not yet implemented"); // TODO
// }
//
// /**
@@ -320,7 +321,7 @@
// */
// public void testRestoreState()
// {
- // fail("Not yet implemented"); // TODO
+ // Assert.fail("Not yet implemented"); // TODO
// }
//
// /**
@@ -328,7 +329,7 @@
// */
// public void testUIViewRoot()
// {
- // fail("Not yet implemented"); // TODO
+ // Assert.fail("Not yet implemented"); // TODO
// }
//
//
@@ -337,7 +338,7 @@
// */
// public void testSetLocale()
// {
- // fail("Not yet implemented"); // TODO
+ // Assert.fail("Not yet implemented"); // TODO
// }
//
// /**
@@ -345,7 +346,7 @@
// */
// public void testGetRenderKitId()
// {
- // fail("Not yet implemented"); // TODO
+ // Assert.fail("Not yet implemented"); // TODO
// }
//
// /**
@@ -353,7 +354,7 @@
// */
// public void testSetRenderKitId()
// {
- // fail("Not yet implemented"); // TODO
+ // Assert.fail("Not yet implemented"); // TODO
// }
//
// /**
@@ -361,7 +362,7 @@
// */
// public void testGetViewId()
// {
- // fail("Not yet implemented"); // TODO
+ // Assert.fail("Not yet implemented"); // TODO
// }
//
// /**
@@ -369,7 +370,7 @@
// */
// public void testSetViewId()
// {
- // fail("Not yet implemented"); // TODO
+ // Assert.fail("Not yet implemented"); // TODO
// }
//
// /**
@@ -377,7 +378,7 @@
// */
// public void testAddPhaseListener()
// {
- // fail("Not yet implemented"); // TODO
+ // Assert.fail("Not yet implemented"); // TODO
// }
//
// /**
@@ -385,7 +386,7 @@
// */
// public void testRemovePhaseListener()
// {
- // fail("Not yet implemented"); // TODO
+ // Assert.fail("Not yet implemented"); // TODO
// }
//
// /**
@@ -393,7 +394,7 @@
// */
// public void testGetBeforePhaseListener()
// {
- // fail("Not yet implemented"); // TODO
+ // Assert.fail("Not yet implemented"); // TODO
// }
//
// /**
@@ -401,7 +402,7 @@
// */
// public void testSetBeforePhaseListener()
// {
- // fail("Not yet implemented"); // TODO
+ // Assert.fail("Not yet implemented"); // TODO
// }
//
// /**
@@ -409,7 +410,7 @@
// */
// public void testGetAfterPhaseListener()
// {
- // fail("Not yet implemented"); // TODO
+ // Assert.fail("Not yet implemented"); // TODO
// }
//
// /**
@@ -417,7 +418,7 @@
// */
// public void testSetAfterPhaseListener()
// {
- // fail("Not yet implemented"); // TODO
+ // Assert.fail("Not yet implemented"); // TODO
// }
//
// /**
@@ -425,7 +426,7 @@
// */
// public void testGetFamily()
// {
- // fail("Not yet implemented"); // TODO
+ // Assert.fail("Not yet implemented"); // TODO
// }
//
@@ -627,7 +628,7 @@
// listener itself queues new event
facesContext.getViewRoot().broadcastEvents(facesContext, PhaseId.INVOKE_APPLICATION);
- assertEquals(15, actionListener.invocationCount);
+ Assert.assertEquals(15, actionListener.invocationCount);
org.easymock.EasyMock.verify(differentActionListener);
}
diff --git a/impl/src/test/java/javax/faces/component/_AttachedListStateWrapperTest.java b/impl/src/test/java/javax/faces/component/_AttachedListStateWrapperTest.java
index 52ba607..fd154cc 100644
--- a/impl/src/test/java/javax/faces/component/_AttachedListStateWrapperTest.java
+++ b/impl/src/test/java/javax/faces/component/_AttachedListStateWrapperTest.java
@@ -27,6 +27,7 @@
import java.util.List;
import junit.framework.TestCase;
+import org.junit.Assert;
public class _AttachedListStateWrapperTest extends TestCase
{
@@ -42,13 +43,13 @@
}
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
super.tearDown();
}
@@ -60,8 +61,8 @@
{
List<Object> foo = new ArrayList<Object>();
_AttachedListStateWrapper subject = new _AttachedListStateWrapper(foo);
- assertNotNull(subject.getWrappedStateList());
- assertTrue(subject.getWrappedStateList() == foo);
+ Assert.assertNotNull(subject.getWrappedStateList());
+ Assert.assertTrue(subject.getWrappedStateList() == foo);
}
public void testSerialize() throws Exception
@@ -78,7 +79,7 @@
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bais);
_AttachedListStateWrapper blorg = (_AttachedListStateWrapper) ois.readObject();
- assertEquals(blorg.getWrappedStateList(), subject.getWrappedStateList());
+ Assert.assertEquals(blorg.getWrappedStateList(), subject.getWrappedStateList());
oos.close();
ois.close();
}
diff --git a/impl/src/test/java/javax/faces/component/_AttachedStateWrapperTest.java b/impl/src/test/java/javax/faces/component/_AttachedStateWrapperTest.java
index 482c851..384ddcd 100644
--- a/impl/src/test/java/javax/faces/component/_AttachedStateWrapperTest.java
+++ b/impl/src/test/java/javax/faces/component/_AttachedStateWrapperTest.java
@@ -25,6 +25,7 @@
import java.io.ObjectOutputStream;
import junit.framework.TestCase;
+import org.junit.Assert;
public class _AttachedStateWrapperTest extends TestCase
{
@@ -40,13 +41,13 @@
}
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
super.tearDown();
}
@@ -57,8 +58,8 @@
public void test_AttachedStateWrapper()
{
_AttachedStateWrapper subject = new _AttachedStateWrapper(null, null);
- assertNull(subject.getWrappedStateObject());
- assertNull(subject.getClazz());
+ Assert.assertNull(subject.getWrappedStateObject());
+ Assert.assertNull(subject.getClazz());
}
/*
@@ -67,7 +68,7 @@
public void testGetClazz()
{
_AttachedStateWrapper subject = new _AttachedStateWrapper(String.class, "foo");
- assertEquals(subject.getClazz(), String.class);
+ Assert.assertEquals(subject.getClazz(), String.class);
}
/*
@@ -76,7 +77,7 @@
public void testGetWrappedStateObject()
{
_AttachedStateWrapper subject = new _AttachedStateWrapper(String.class, "foo");
- assertEquals(subject.getClazz(), String.class);
+ Assert.assertEquals(subject.getClazz(), String.class);
}
public void testSerialize() throws Exception
@@ -91,7 +92,7 @@
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bais);
_AttachedStateWrapper blorg = (_AttachedStateWrapper) ois.readObject();
- assertEquals(blorg.getWrappedStateObject(), subject.getWrappedStateObject());
+ Assert.assertEquals(blorg.getWrappedStateObject(), subject.getWrappedStateObject());
oos.close();
ois.close();
}
diff --git a/impl/src/test/java/javax/faces/component/_ComponentUtilsTest.java b/impl/src/test/java/javax/faces/component/_ComponentUtilsTest.java
index 62f3947..70deaf5 100644
--- a/impl/src/test/java/javax/faces/component/_ComponentUtilsTest.java
+++ b/impl/src/test/java/javax/faces/component/_ComponentUtilsTest.java
@@ -19,12 +19,10 @@
package javax.faces.component;
import org.apache.myfaces.core.api.shared.ComponentUtils;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
import org.apache.myfaces.test.mock.MockRenderedValueExpression;
import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
+import org.junit.Assert;
import org.junit.Test;
public class _ComponentUtilsTest extends AbstractJsfTestCase {
@@ -33,17 +31,17 @@
public void testIsRendered() {
UIComponent uiComponent = new UIOutput();
boolean rendered = ComponentUtils.isRendered(facesContext, uiComponent);
- assertTrue(rendered);
+ Assert.assertTrue(rendered);
uiComponent.setRendered(false);
rendered = ComponentUtils.isRendered(facesContext, uiComponent);
- assertFalse(rendered);
+ Assert.assertFalse(rendered);
UIOutput uiOutput = new UIOutput();
UIComponent parent = MockRenderedValueExpression.setUpComponentStack(facesContext, uiOutput, false);
rendered = ComponentUtils.isRendered(facesContext, uiComponent);
- assertFalse(rendered);
- assertEquals("isRendered must not change current component", parent,
+ Assert.assertFalse(rendered);
+ Assert.assertEquals("isRendered must not change current component", parent,
UIComponent.getCurrentComponent(facesContext));
}
diff --git a/impl/src/test/java/javax/faces/component/_Delta2StateHelperTest.java b/impl/src/test/java/javax/faces/component/_Delta2StateHelperTest.java
index 92eca78..69ab7b5 100644
--- a/impl/src/test/java/javax/faces/component/_Delta2StateHelperTest.java
+++ b/impl/src/test/java/javax/faces/component/_Delta2StateHelperTest.java
@@ -25,15 +25,11 @@
import javax.faces.event.PhaseEvent;
import javax.faces.event.PhaseId;
import javax.faces.event.PhaseListener;
+import org.junit.Assert;
public class _Delta2StateHelperTest extends AbstractComponentTest
{
-
- public _Delta2StateHelperTest(String name)
- {
- super(name);
- }
public static class UITestComponent extends UIComponentBase
{
@@ -111,13 +107,13 @@
}
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
super.tearDown();
}
@@ -125,11 +121,11 @@
public void testSimpleGetterSetter() throws Exception
{
UITestComponent a = new UITestComponent();
- assertNull(a.getTestProperty1());
+ Assert.assertNull(a.getTestProperty1());
a.setTestProperty1("testProperty1");
- assertEquals("testProperty1", a.getTestProperty1());
+ Assert.assertEquals("testProperty1", a.getTestProperty1());
a.setTestProperty1(null);
- assertNull(a.getTestProperty1());
+ Assert.assertNull(a.getTestProperty1());
}
public void testEmptySaveRestore() throws Exception
@@ -143,8 +139,8 @@
Object state2 = b.saveState(facesContext);
- assertEquals(a.getTestProperty1(), b.getTestProperty1());
- assertEquals(a.getTestProperty2(), b.getTestProperty2());
+ Assert.assertEquals(a.getTestProperty1(), b.getTestProperty1());
+ Assert.assertEquals(a.getTestProperty2(), b.getTestProperty2());
}
public void testSimpleSaveRestore() throws Exception
@@ -160,8 +156,8 @@
Object state2 = b.saveState(facesContext);
- assertEquals(a.getTestProperty1(), b.getTestProperty1());
- assertEquals(a.getTestProperty2(), b.getTestProperty2());
+ Assert.assertEquals(a.getTestProperty1(), b.getTestProperty1());
+ Assert.assertEquals(a.getTestProperty2(), b.getTestProperty2());
}
public void testDeltaStateSaveRestore()
@@ -188,10 +184,10 @@
Object state2 = b.saveState(facesContext);
- assertNull(a.getTestProperty1());
- assertNull(b.getTestProperty1());
- assertEquals("testProperty2", a.getTestProperty2());
- assertEquals("testProperty2", b.getTestProperty2());
+ Assert.assertNull(a.getTestProperty1());
+ Assert.assertNull(b.getTestProperty1());
+ Assert.assertEquals("testProperty2", a.getTestProperty2());
+ Assert.assertEquals("testProperty2", b.getTestProperty2());
}
public void testPutPropertyStateHelper1()
@@ -202,23 +198,23 @@
Object retValue = helper.put("someProperty", "someValue");
//No value previously set
- assertNull(retValue);
+ Assert.assertNull(retValue);
a.markInitialState();
retValue = helper.put("someProperty", "someOtherValue");
- assertEquals("someValue",retValue);
+ Assert.assertEquals("someValue",retValue);
retValue = helper.put("someProperty", "someOtherOtherValue");
- assertEquals("someOtherValue",retValue);
+ Assert.assertEquals("someOtherValue",retValue);
a.clearInitialState();
retValue = helper.put("someProperty", "someOtherOtherOtherValue");
- assertEquals("someOtherOtherValue",retValue);
+ Assert.assertEquals("someOtherOtherValue",retValue);
}
public void testPutPropertyStateHelper2()
@@ -229,23 +225,23 @@
Object retValue = helper.put("someProperty", "someValue");
//No value previously set
- assertNull(retValue);
+ Assert.assertNull(retValue);
a.markInitialState();
retValue = helper.put("someProperty", null);
- assertEquals("someValue",retValue);
+ Assert.assertEquals("someValue",retValue);
retValue = helper.put("someProperty", "someOtherOtherValue");
- assertNull(retValue);
+ Assert.assertNull(retValue);
a.clearInitialState();
retValue = helper.put("someProperty", null);
- assertEquals("someOtherOtherValue",retValue);
+ Assert.assertEquals("someOtherOtherValue",retValue);
}
public void testRemovePropertyStateHelper1()
@@ -256,23 +252,23 @@
Object retValue = helper.put("someProperty", "someValue");
//No value previously set
- assertNull(retValue);
+ Assert.assertNull(retValue);
a.markInitialState();
retValue = helper.remove("someProperty");
- assertEquals("someValue",retValue);
+ Assert.assertEquals("someValue",retValue);
retValue = helper.put("someProperty", "someOtherOtherValue");
- assertNull(retValue);
+ Assert.assertNull(retValue);
a.clearInitialState();
retValue = helper.remove("someProperty");
- assertEquals("someOtherOtherValue",retValue);
+ Assert.assertEquals("someOtherOtherValue",retValue);
}
@@ -296,15 +292,15 @@
List listA = (List) helperA.get("somePropertyList");
- assertEquals("someValue1",listA.get(0));
- assertEquals("someValue2",listA.get(1));
- assertEquals("someValue3",listA.get(2));
+ Assert.assertEquals("someValue1",listA.get(0));
+ Assert.assertEquals("someValue2",listA.get(1));
+ Assert.assertEquals("someValue3",listA.get(2));
List listB = (List) helperB.get("somePropertyList");
- assertEquals("someValue1",listB.get(0));
- assertEquals("someValue2",listB.get(1));
- assertEquals("someValue3",listB.get(2));
+ Assert.assertEquals("someValue1",listB.get(0));
+ Assert.assertEquals("someValue2",listB.get(1));
+ Assert.assertEquals("someValue3",listB.get(2));
}
public void testAddItemOnList2()
@@ -332,16 +328,16 @@
if (listA != null)
{
- assertFalse("The list should not contain [someValue1]", listA.contains("someValue1"));
- assertFalse("The list should not contain [someValue2]", listA.contains("someValue2"));
+ Assert.assertFalse("The list should not contain [someValue1]", listA.contains("someValue1"));
+ Assert.assertFalse("The list should not contain [someValue2]", listA.contains("someValue2"));
}
List listB = (List) helperB.get("somePropertyList");
if (listB != null)
{
- assertFalse("The list should not contain [someValue2]", listB.contains("someValue2"));
- assertFalse("The list should not contain [someValue1]", listB.contains("someValue1"));
+ Assert.assertFalse("The list should not contain [someValue2]", listB.contains("someValue2"));
+ Assert.assertFalse("The list should not contain [someValue1]", listB.contains("someValue1"));
}
}
@@ -368,15 +364,15 @@
List listA = (List) helperA.get("somePropertyList");
- assertTrue("The list should contain [someValue3]", listA.contains("someValue3"));
- assertFalse("The list should not contain [someValue1]", listA.contains("someValue1"));
- assertFalse("The list should not contain [someValue2]", listA.contains("someValue2"));
+ Assert.assertTrue("The list should contain [someValue3]", listA.contains("someValue3"));
+ Assert.assertFalse("The list should not contain [someValue1]", listA.contains("someValue1"));
+ Assert.assertFalse("The list should not contain [someValue2]", listA.contains("someValue2"));
List listB = (List) helperB.get("somePropertyList");
- assertTrue("The list should contain [someValue3]", listB.contains("someValue3"));
- assertFalse("The list should not contain [someValue2]", listB.contains("someValue2"));
- assertFalse("The list should not contain [someValue1]", listB.contains("someValue1"));
+ Assert.assertTrue("The list should contain [someValue3]", listB.contains("someValue3"));
+ Assert.assertFalse("The list should not contain [someValue2]", listB.contains("someValue2"));
+ Assert.assertFalse("The list should not contain [someValue1]", listB.contains("someValue1"));
}
public void testPutItemOnMap1()
@@ -399,15 +395,15 @@
Map mapA = (Map) helperA.get("somePropertyMap");
- assertEquals("someValue1",mapA.get("key1"));
- assertEquals("someValue2",mapA.get("key2"));
- assertEquals("someValue3",mapA.get("key3"));
+ Assert.assertEquals("someValue1",mapA.get("key1"));
+ Assert.assertEquals("someValue2",mapA.get("key2"));
+ Assert.assertEquals("someValue3",mapA.get("key3"));
Map mapB = (Map) helperB.get("somePropertyMap");
- assertEquals("someValue1",mapB.get("key1"));
- assertEquals("someValue2",mapB.get("key2"));
- assertEquals("someValue3",mapB.get("key3"));
+ Assert.assertEquals("someValue1",mapB.get("key1"));
+ Assert.assertEquals("someValue2",mapB.get("key2"));
+ Assert.assertEquals("someValue3",mapB.get("key3"));
}
public void testPutRemoveItemOnMap2()
@@ -434,16 +430,16 @@
if (mapA != null)
{
- assertNull(mapA.get("key2"));
- assertNull(mapA.get("key1"));
+ Assert.assertNull(mapA.get("key2"));
+ Assert.assertNull(mapA.get("key1"));
}
Map mapB = (Map) helperB.get("somePropertyMap");
if (mapB != null)
{
- assertNull(mapB.get("key2"));
- assertNull(mapB.get("key1"));
+ Assert.assertNull(mapB.get("key2"));
+ Assert.assertNull(mapB.get("key1"));
}
}
@@ -472,16 +468,16 @@
if (mapA != null)
{
- assertNull(mapA.get("key2"));
- assertNull(mapA.get("key1"));
+ Assert.assertNull(mapA.get("key2"));
+ Assert.assertNull(mapA.get("key1"));
}
Map mapB = (Map) helperB.get("somePropertyMap");
if (mapB != null)
{
- assertNull(mapB.get("key2"));
- assertNull(mapB.get("key1"));
+ Assert.assertNull(mapB.get("key2"));
+ Assert.assertNull(mapB.get("key1"));
}
}
@@ -544,8 +540,8 @@
b.restoreState(facesContext, a.saveState(facesContext));
- assertTrue(a.getPhaseListeners().contains(phaseListener1));
- assertTrue(b.getPhaseListeners().contains(phaseListener1));
+ Assert.assertTrue(a.getPhaseListeners().contains(phaseListener1));
+ Assert.assertTrue(b.getPhaseListeners().contains(phaseListener1));
}
public void testUIViewRootPhaseListener2() throws Exception
@@ -562,8 +558,8 @@
b.restoreState(facesContext, a.saveState(facesContext));
- assertTrue(a.getPhaseListeners().contains(phaseListener1));
- assertTrue(b.getPhaseListeners().contains(phaseListener1));
+ Assert.assertTrue(a.getPhaseListeners().contains(phaseListener1));
+ Assert.assertTrue(b.getPhaseListeners().contains(phaseListener1));
}
public void testUIViewRootPhaseListener3() throws Exception
@@ -587,19 +583,19 @@
b.restoreState(facesContext, a.saveState(facesContext));
- assertTrue(a.getPhaseListeners().contains(phaseListener1));
- assertTrue(b.getPhaseListeners().contains(phaseListener1));
- assertTrue(a.getPhaseListeners().contains(phaseListener2));
- assertTrue(b.getPhaseListeners().contains(phaseListener2));
+ Assert.assertTrue(a.getPhaseListeners().contains(phaseListener1));
+ Assert.assertTrue(b.getPhaseListeners().contains(phaseListener1));
+ Assert.assertTrue(a.getPhaseListeners().contains(phaseListener2));
+ Assert.assertTrue(b.getPhaseListeners().contains(phaseListener2));
a.removePhaseListener(phaseListener1);
a.removePhaseListener(phaseListener2);
c.restoreState(facesContext, a.saveState(facesContext));
- assertFalse(a.getPhaseListeners().contains(phaseListener1));
- assertFalse(c.getPhaseListeners().contains(phaseListener1));
- assertFalse(a.getPhaseListeners().contains(phaseListener2));
- assertFalse(c.getPhaseListeners().contains(phaseListener2));
+ Assert.assertFalse(a.getPhaseListeners().contains(phaseListener1));
+ Assert.assertFalse(c.getPhaseListeners().contains(phaseListener1));
+ Assert.assertFalse(a.getPhaseListeners().contains(phaseListener2));
+ Assert.assertFalse(c.getPhaseListeners().contains(phaseListener2));
}
}
diff --git a/impl/src/test/java/javax/faces/component/_DeltaFacesListenerListTest.java b/impl/src/test/java/javax/faces/component/_DeltaFacesListenerListTest.java
index f9244e5..df9dcc0 100644
--- a/impl/src/test/java/javax/faces/component/_DeltaFacesListenerListTest.java
+++ b/impl/src/test/java/javax/faces/component/_DeltaFacesListenerListTest.java
@@ -21,14 +21,11 @@
import java.util.Arrays;
import javax.faces.context.FacesContext;
import javax.faces.event.FacesListener;
+import org.junit.Assert;
public class _DeltaFacesListenerListTest extends AbstractComponentTest
{
- public _DeltaFacesListenerListTest(String arg0)
- {
- super(arg0);
- }
-
+
public static class UITestComponent extends UIComponentBase
{
@@ -178,13 +175,13 @@
}
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
super.tearDown();
}
@@ -194,9 +191,9 @@
UITestComponent a = new UITestComponent();
FacesListener listener1 = new NoStateFacesListener();
a.addFacesListener(listener1);
- assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
a.removeFacesListener(listener1);
- assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
}
public void testSimpleSaveRestore1()
@@ -207,12 +204,12 @@
a.addFacesListener(listener1);
b.addFacesListener(listener1);
b.restoreState(facesContext, a.saveState(facesContext));
- assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
- assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
a.removeFacesListener(listener1);
b.removeFacesListener(listener1);
- assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
- assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
}
public void testSimpleSaveRestore2()
@@ -225,12 +222,12 @@
a.addFacesListener(listener1);
Object [] savedState1 = (Object[]) a.saveState(facesContext);
b.restoreState(facesContext, savedState1);
- assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
- assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
a.removeFacesListener(listener1);
b.removeFacesListener(listener1);
- assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
- assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
}
public void testSimpleSaveRestore3()
@@ -244,14 +241,14 @@
a.markInitialState();
b.markInitialState();
Object [] savedState1 = (Object[]) a.saveState(facesContext);
- assertNull(savedState1 == null ? null : savedState1[1]);
+ Assert.assertNull(savedState1 == null ? null : savedState1[1]);
b.restoreState(facesContext, savedState1);
- assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
- assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
a.removeFacesListener(listener1);
b.removeFacesListener(listener1);
- assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
- assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
}
public void testSimpleSaveRestore4()
@@ -266,18 +263,18 @@
b.markInitialState();
a.addFacesListener(listener2);
b.restoreState(facesContext, a.saveState(facesContext));
- assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
- assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener2));
- assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
- assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener2));
+ Assert.assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener2));
+ Assert.assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener2));
a.removeFacesListener(listener1);
b.removeFacesListener(listener1);
a.removeFacesListener(listener2);
b.removeFacesListener(listener2);
- assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
- assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener2));
- assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
- assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener2));
+ Assert.assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener2));
+ Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener2));
}
public void testSimpleSaveRestore5()
@@ -293,25 +290,25 @@
b.markInitialState();
a.addFacesListener(listener2);
b.restoreState(facesContext, a.saveState(facesContext));
- assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
- assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener2));
- assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
- assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener2));
+ Assert.assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener2));
+ Assert.assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener2));
a.removeFacesListener(listener1);
b.removeFacesListener(listener1);
a.removeFacesListener(listener2);
b.removeFacesListener(listener2);
- assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
- assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener2));
- assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
- assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener2));
+ Assert.assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener2));
+ Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener2));
//Save fully
b.clearInitialState();
c.restoreState(facesContext, b.saveState(facesContext));
//c._facesListeners should be empty
- assertFalse(Arrays.asList(c.getFacesListeners(FacesListener.class)).contains(listener1));
- assertFalse(Arrays.asList(c.getFacesListeners(FacesListener.class)).contains(listener2));
+ Assert.assertFalse(Arrays.asList(c.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertFalse(Arrays.asList(c.getFacesListeners(FacesListener.class)).contains(listener2));
}
public void testSimpleSaveRestore6()
@@ -329,14 +326,14 @@
Object [] savedState1 = (Object[]) a.saveState(facesContext);
// This is not null because StateFacesListener is instance of StateHolder
// and always needs to be saved and restored!
- assertNotNull(savedState1[0]);
+ Assert.assertNotNull(savedState1[0]);
b.restoreState(facesContext, savedState1);
- assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
- assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
a.removeFacesListener(listener1);
b.removeFacesListener(listener1);
- assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
- assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
}
public void testSimpleSaveRestore7()
@@ -354,25 +351,25 @@
b.markInitialState();
a.addFacesListener(listener2);
b.restoreState(facesContext, a.saveState(facesContext));
- assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
- assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener2));
- assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
- assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener2));
+ Assert.assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener2));
+ Assert.assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener2));
a.removeFacesListener(listener1);
b.removeFacesListener(listener1);
a.removeFacesListener(listener2);
b.removeFacesListener(listener2);
- assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
- assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener2));
- assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
- assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener2));
+ Assert.assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener2));
+ Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener2));
//Save fully
b.clearInitialState();
c.restoreState(facesContext, b.saveState(facesContext));
//c._facesListeners should be empty
- assertFalse(Arrays.asList(c.getFacesListeners(FacesListener.class)).contains(listener1));
- assertFalse(Arrays.asList(c.getFacesListeners(FacesListener.class)).contains(listener2));
+ Assert.assertFalse(Arrays.asList(c.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertFalse(Arrays.asList(c.getFacesListeners(FacesListener.class)).contains(listener2));
}
public void testSimpleSaveRestore8()
@@ -387,14 +384,14 @@
b.markInitialState();
Object [] savedState1 = (Object[]) a.saveState(facesContext);
// This is null because StateFacesListener is instance of PartialStateHolder
- assertNull(savedState1 == null ? null : savedState1[1]);
+ Assert.assertNull(savedState1 == null ? null : savedState1[1]);
b.restoreState(facesContext, savedState1);
- assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
- assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
a.removeFacesListener(listener1);
b.removeFacesListener(listener1);
- assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
- assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
}
public void testSimpleSaveRestore9()
@@ -413,18 +410,18 @@
Object [] savedState1 = (Object[]) a.saveState(facesContext);
// This is null because StateFacesListener is instance of PartialStateHolder but a
// listener was added after markInitialState
- assertNotNull(savedState1[0]);
+ Assert.assertNotNull(savedState1[0]);
b.restoreState(facesContext, savedState1);
- assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
- assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
- assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener2));
- assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener2));
+ Assert.assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener2));
+ Assert.assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener2));
a.removeFacesListener(listener1);
b.removeFacesListener(listener1);
- assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
- assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
- assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener2));
- assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener2));
+ Assert.assertFalse(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener2));
+ Assert.assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener2));
}
public void testSimpleSaveRestoreTransient1()
@@ -436,8 +433,8 @@
listener1.setValue("value");
a.addFacesListener(listener1);
b.restoreState(facesContext, a.saveState(facesContext));
- assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
- assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
}
public void testSimpleSaveRestoreTransient2()
@@ -451,8 +448,8 @@
listener1.setValue("value");
a.addFacesListener(listener1);
b.restoreState(facesContext, a.saveState(facesContext));
- assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
- assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
}
public void testSimpleSaveRestoreTransient3()
@@ -469,8 +466,8 @@
listener1.setValue("value");
a.addFacesListener(listener1);
b.restoreState(facesContext, a.saveState(facesContext));
- assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
- assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
}
public void testSimpleSaveRestoreTransient4()
@@ -487,8 +484,8 @@
//Since listener1 is transient
Object [] savedState1 = (Object[]) a.saveState(facesContext);
b.restoreState(facesContext, savedState1);
- assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
- assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertFalse(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
}
@@ -510,11 +507,11 @@
//Since listener1 is transient
Object [] savedState1 = (Object[]) a.saveState(facesContext);
b.restoreState(facesContext, savedState1);
- assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
- assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener2));
- assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener3));
- assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
- assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener2));
- assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener3));
+ Assert.assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener2));
+ Assert.assertTrue(Arrays.asList(a.getFacesListeners(FacesListener.class)).contains(listener3));
+ Assert.assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener1));
+ Assert.assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener2));
+ Assert.assertTrue(Arrays.asList(b.getFacesListeners(FacesListener.class)).contains(listener3));
}
}
diff --git a/impl/src/test/java/javax/faces/component/_DeltaListTest.java b/impl/src/test/java/javax/faces/component/_DeltaListTest.java
index 11bdd74..ef34c69 100644
--- a/impl/src/test/java/javax/faces/component/_DeltaListTest.java
+++ b/impl/src/test/java/javax/faces/component/_DeltaListTest.java
@@ -25,15 +25,11 @@
import javax.faces.context.FacesContext;
import javax.faces.event.FacesListener;
-import org.apache.myfaces.util.lang.Assert;
+import org.junit.Assert;
public class _DeltaListTest extends AbstractComponentTest
{
- public _DeltaListTest(String arg0)
- {
- super(arg0);
- }
-
+
public static class UITestComponent extends UIComponentBase
{
public _DeltaList<FacesListener> _facesListeners = null;
@@ -50,7 +46,7 @@
public void addTestFacesListener(FacesListener listener)
{
- Assert.notNull(listener, "listener");
+ Assert.assertNotNull(listener);
if (_facesListeners == null)
{
@@ -61,7 +57,7 @@
public FacesListener[] getTestFacesListeners(Class clazz)
{
- Assert.notNull(clazz, "clazz");
+ Assert.assertNotNull(clazz);
if (!FacesListener.class.isAssignableFrom(clazz))
{
@@ -387,13 +383,13 @@
}
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
super.tearDown();
}
@@ -403,9 +399,9 @@
UITestComponent a = new UITestComponent();
FacesListener listener1 = new NoStateFacesListener();
a.addTestFacesListener(listener1);
- assertTrue(a._facesListeners.contains(listener1));
+ Assert.assertTrue(a._facesListeners.contains(listener1));
a.removeTestFacesListener(listener1);
- assertFalse(a._facesListeners.contains(listener1));
+ Assert.assertFalse(a._facesListeners.contains(listener1));
}
public void testSimpleSaveRestore1()
@@ -416,12 +412,12 @@
a.addTestFacesListener(listener1);
b.addTestFacesListener(listener1);
b.restoreState(facesContext, a.saveState(facesContext));
- assertTrue(a._facesListeners.contains(listener1));
- assertTrue(b._facesListeners.contains(listener1));
+ Assert.assertTrue(a._facesListeners.contains(listener1));
+ Assert.assertTrue(b._facesListeners.contains(listener1));
a.removeTestFacesListener(listener1);
b.removeTestFacesListener(listener1);
- assertFalse(a._facesListeners.contains(listener1));
- assertFalse(b._facesListeners.contains(listener1));
+ Assert.assertFalse(a._facesListeners.contains(listener1));
+ Assert.assertFalse(b._facesListeners.contains(listener1));
}
public void testSimpleSaveRestore2()
@@ -434,12 +430,12 @@
a.addTestFacesListener(listener1);
Object [] savedState1 = (Object[]) a.saveState(facesContext);
b.restoreState(facesContext, savedState1);
- assertTrue(a._facesListeners.contains(listener1));
- assertTrue(b._facesListeners.contains(listener1));
+ Assert.assertTrue(a._facesListeners.contains(listener1));
+ Assert.assertTrue(b._facesListeners.contains(listener1));
a.removeTestFacesListener(listener1);
b.removeTestFacesListener(listener1);
- assertFalse(a._facesListeners.contains(listener1));
- assertFalse(b._facesListeners.contains(listener1));
+ Assert.assertFalse(a._facesListeners.contains(listener1));
+ Assert.assertFalse(b._facesListeners.contains(listener1));
}
public void testSimpleSaveRestore3()
@@ -454,12 +450,12 @@
b.markInitialState();
Object [] savedState1 = (Object[]) a.saveState(facesContext);
b.restoreState(facesContext, savedState1);
- assertTrue(a._facesListeners.contains(listener1));
- assertTrue(b._facesListeners.contains(listener1));
+ Assert.assertTrue(a._facesListeners.contains(listener1));
+ Assert.assertTrue(b._facesListeners.contains(listener1));
a.removeTestFacesListener(listener1);
b.removeTestFacesListener(listener1);
- assertFalse(a._facesListeners.contains(listener1));
- assertFalse(b._facesListeners.contains(listener1));
+ Assert.assertFalse(a._facesListeners.contains(listener1));
+ Assert.assertFalse(b._facesListeners.contains(listener1));
}
public void testSimpleSaveRestore4()
@@ -474,18 +470,18 @@
b.markInitialState();
a.addTestFacesListener(listener2);
b.restoreState(facesContext, a.saveState(facesContext));
- assertTrue(a._facesListeners.contains(listener1));
- assertTrue(a._facesListeners.contains(listener2));
- assertTrue(b._facesListeners.contains(listener1));
- assertTrue(b._facesListeners.contains(listener2));
+ Assert.assertTrue(a._facesListeners.contains(listener1));
+ Assert.assertTrue(a._facesListeners.contains(listener2));
+ Assert.assertTrue(b._facesListeners.contains(listener1));
+ Assert.assertTrue(b._facesListeners.contains(listener2));
a.removeTestFacesListener(listener1);
b.removeTestFacesListener(listener1);
a.removeTestFacesListener(listener2);
b.removeTestFacesListener(listener2);
- assertFalse(a._facesListeners.contains(listener1));
- assertFalse(a._facesListeners.contains(listener2));
- assertFalse(b._facesListeners.contains(listener1));
- assertFalse(b._facesListeners.contains(listener2));
+ Assert.assertFalse(a._facesListeners.contains(listener1));
+ Assert.assertFalse(a._facesListeners.contains(listener2));
+ Assert.assertFalse(b._facesListeners.contains(listener1));
+ Assert.assertFalse(b._facesListeners.contains(listener2));
}
public void testSimpleSaveRestore5()
@@ -501,25 +497,25 @@
b.markInitialState();
a.addTestFacesListener(listener2);
b.restoreState(facesContext, a.saveState(facesContext));
- assertTrue(a._facesListeners.contains(listener1));
- assertTrue(a._facesListeners.contains(listener2));
- assertTrue(b._facesListeners.contains(listener1));
- assertTrue(b._facesListeners.contains(listener2));
+ Assert.assertTrue(a._facesListeners.contains(listener1));
+ Assert.assertTrue(a._facesListeners.contains(listener2));
+ Assert.assertTrue(b._facesListeners.contains(listener1));
+ Assert.assertTrue(b._facesListeners.contains(listener2));
a.removeTestFacesListener(listener1);
b.removeTestFacesListener(listener1);
a.removeTestFacesListener(listener2);
b.removeTestFacesListener(listener2);
- assertFalse(a._facesListeners.contains(listener1));
- assertFalse(a._facesListeners.contains(listener2));
- assertFalse(b._facesListeners.contains(listener1));
- assertFalse(b._facesListeners.contains(listener2));
+ Assert.assertFalse(a._facesListeners.contains(listener1));
+ Assert.assertFalse(a._facesListeners.contains(listener2));
+ Assert.assertFalse(b._facesListeners.contains(listener1));
+ Assert.assertFalse(b._facesListeners.contains(listener2));
//Save fully
b.clearInitialState();
c.restoreState(facesContext, b.saveState(facesContext));
//c._facesListeners should be empty
- assertFalse(c._facesListeners.contains(listener1));
- assertFalse(c._facesListeners.contains(listener2));
+ Assert.assertFalse(c._facesListeners.contains(listener1));
+ Assert.assertFalse(c._facesListeners.contains(listener2));
}
public void testSimpleSaveRestore6()
@@ -537,14 +533,14 @@
Object [] savedState1 = (Object[]) a.saveState(facesContext);
// This is not null because StateFacesListener is instance of StateHolder
// and always needs to be saved and restored!
- assertNotNull(savedState1[1]);
+ Assert.assertNotNull(savedState1[1]);
b.restoreState(facesContext, savedState1);
- assertTrue(a._facesListeners.contains(listener1));
- assertTrue(b._facesListeners.contains(listener1));
+ Assert.assertTrue(a._facesListeners.contains(listener1));
+ Assert.assertTrue(b._facesListeners.contains(listener1));
a.removeTestFacesListener(listener1);
b.removeTestFacesListener(listener1);
- assertFalse(a._facesListeners.contains(listener1));
- assertFalse(b._facesListeners.contains(listener1));
+ Assert.assertFalse(a._facesListeners.contains(listener1));
+ Assert.assertFalse(b._facesListeners.contains(listener1));
}
public void testSimpleSaveRestore7()
@@ -562,25 +558,25 @@
b.markInitialState();
a.addTestFacesListener(listener2);
b.restoreState(facesContext, a.saveState(facesContext));
- assertTrue(a._facesListeners.contains(listener1));
- assertTrue(a._facesListeners.contains(listener2));
- assertTrue(b._facesListeners.contains(listener1));
- assertTrue(b._facesListeners.contains(listener2));
+ Assert.assertTrue(a._facesListeners.contains(listener1));
+ Assert.assertTrue(a._facesListeners.contains(listener2));
+ Assert.assertTrue(b._facesListeners.contains(listener1));
+ Assert.assertTrue(b._facesListeners.contains(listener2));
a.removeTestFacesListener(listener1);
b.removeTestFacesListener(listener1);
a.removeTestFacesListener(listener2);
b.removeTestFacesListener(listener2);
- assertFalse(a._facesListeners.contains(listener1));
- assertFalse(a._facesListeners.contains(listener2));
- assertFalse(b._facesListeners.contains(listener1));
- assertFalse(b._facesListeners.contains(listener2));
+ Assert.assertFalse(a._facesListeners.contains(listener1));
+ Assert.assertFalse(a._facesListeners.contains(listener2));
+ Assert.assertFalse(b._facesListeners.contains(listener1));
+ Assert.assertFalse(b._facesListeners.contains(listener2));
//Save fully
b.clearInitialState();
c.restoreState(facesContext, b.saveState(facesContext));
//c._facesListeners should be empty
- assertFalse(c._facesListeners.contains(listener1));
- assertFalse(c._facesListeners.contains(listener2));
+ Assert.assertFalse(c._facesListeners.contains(listener1));
+ Assert.assertFalse(c._facesListeners.contains(listener2));
}
public void testSimpleSaveRestore8()
@@ -595,14 +591,14 @@
b.markInitialState();
Object [] savedState1 = (Object[]) a.saveState(facesContext);
// This is null because StateFacesListener is instance of PartialStateHolder
- assertNull(savedState1 == null ? null : savedState1[1]);
+ Assert.assertNull(savedState1 == null ? null : savedState1[1]);
b.restoreState(facesContext, savedState1);
- assertTrue(a._facesListeners.contains(listener1));
- assertTrue(b._facesListeners.contains(listener1));
+ Assert.assertTrue(a._facesListeners.contains(listener1));
+ Assert.assertTrue(b._facesListeners.contains(listener1));
a.removeTestFacesListener(listener1);
b.removeTestFacesListener(listener1);
- assertFalse(a._facesListeners.contains(listener1));
- assertFalse(b._facesListeners.contains(listener1));
+ Assert.assertFalse(a._facesListeners.contains(listener1));
+ Assert.assertFalse(b._facesListeners.contains(listener1));
}
public void testSimpleSaveRestore9()
@@ -621,18 +617,18 @@
Object [] savedState1 = (Object[]) a.saveState(facesContext);
// This is null because StateFacesListener is instance of PartialStateHolder but a
// listener was added after markInitialState
- assertNotNull(savedState1[1]);
+ Assert.assertNotNull(savedState1[1]);
b.restoreState(facesContext, savedState1);
- assertTrue(a._facesListeners.contains(listener1));
- assertTrue(b._facesListeners.contains(listener1));
- assertTrue(a._facesListeners.contains(listener2));
- assertTrue(b._facesListeners.contains(listener2));
+ Assert.assertTrue(a._facesListeners.contains(listener1));
+ Assert.assertTrue(b._facesListeners.contains(listener1));
+ Assert.assertTrue(a._facesListeners.contains(listener2));
+ Assert.assertTrue(b._facesListeners.contains(listener2));
a.removeTestFacesListener(listener1);
b.removeTestFacesListener(listener1);
- assertFalse(a._facesListeners.contains(listener1));
- assertFalse(b._facesListeners.contains(listener1));
- assertTrue(a._facesListeners.contains(listener2));
- assertTrue(b._facesListeners.contains(listener2));
+ Assert.assertFalse(a._facesListeners.contains(listener1));
+ Assert.assertFalse(b._facesListeners.contains(listener1));
+ Assert.assertTrue(a._facesListeners.contains(listener2));
+ Assert.assertTrue(b._facesListeners.contains(listener2));
}
public void testSimpleSaveRestoreTransient1()
@@ -644,9 +640,9 @@
listener1.setValue("value");
a.addTestFacesListener(listener1);
b.restoreState(facesContext, a.saveState(facesContext));
- assertTrue(a._facesListeners.contains(listener1));
- assertFalse(b._facesListeners.contains(listener1));
- assertTrue(b._facesListeners.isEmpty());
+ Assert.assertTrue(a._facesListeners.contains(listener1));
+ Assert.assertFalse(b._facesListeners.contains(listener1));
+ Assert.assertTrue(b._facesListeners.isEmpty());
}
public void testSimpleSaveRestoreTransient2()
@@ -660,8 +656,8 @@
listener1.setValue("value");
a.addTestFacesListener(listener1);
b.restoreState(facesContext, a.saveState(facesContext));
- assertTrue(a._facesListeners.contains(listener1));
- assertFalse(b._facesListeners.contains(listener1));
+ Assert.assertTrue(a._facesListeners.contains(listener1));
+ Assert.assertFalse(b._facesListeners.contains(listener1));
}
public void testSimpleSaveRestoreTransient3()
@@ -678,8 +674,8 @@
listener1.setValue("value");
a.addTestFacesListener(listener1);
b.restoreState(facesContext, a.saveState(facesContext));
- assertTrue(a._facesListeners.contains(listener1));
- assertFalse(b._facesListeners.contains(listener1));
+ Assert.assertTrue(a._facesListeners.contains(listener1));
+ Assert.assertFalse(b._facesListeners.contains(listener1));
}
public void testSimpleSaveRestoreTransient4()
@@ -696,8 +692,8 @@
//Since listener1 is transient
Object [] savedState1 = (Object[]) a.saveState(facesContext);
b.restoreState(facesContext, savedState1);
- assertTrue(a._facesListeners.contains(listener1));
- assertFalse(b._facesListeners.contains(listener1));
+ Assert.assertTrue(a._facesListeners.contains(listener1));
+ Assert.assertFalse(b._facesListeners.contains(listener1));
}
public void testSimpleSaveRestoreTransient5()
@@ -719,11 +715,11 @@
//Since listener1 is transient
Object [] savedState1 = (Object[]) a.saveState(facesContext);
b.restoreState(facesContext, savedState1);
- assertTrue(a._facesListeners.contains(listener1));
- assertFalse(b._facesListeners.contains(listener1));
- assertTrue(a._facesListeners.contains(listener2));
- assertTrue(b._facesListeners.contains(listener2));
- assertEquals("value2", ((StateFacesListener)b._facesListeners.get(b._facesListeners.indexOf(listener2))).getValue());
+ Assert.assertTrue(a._facesListeners.contains(listener1));
+ Assert.assertFalse(b._facesListeners.contains(listener1));
+ Assert.assertTrue(a._facesListeners.contains(listener2));
+ Assert.assertTrue(b._facesListeners.contains(listener2));
+ Assert.assertEquals("value2", ((StateFacesListener)b._facesListeners.get(b._facesListeners.indexOf(listener2))).getValue());
}
public void testSimpleSaveRestoreTransient6()
@@ -739,8 +735,8 @@
//Since listener1 is transient
Object [] savedState1 = (Object[]) a.saveState(facesContext);
b.restoreState(facesContext, savedState1);
- assertTrue(a._facesListeners.contains(listener1));
- assertFalse(b._facesListeners.contains(listener1));
+ Assert.assertTrue(a._facesListeners.contains(listener1));
+ Assert.assertFalse(b._facesListeners.contains(listener1));
}
public void testSimpleSaveRestoreTransient7()
@@ -762,10 +758,10 @@
//Since listener1 is transient
Object [] savedState1 = (Object[]) a.saveState(facesContext);
b.restoreState(facesContext, savedState1);
- assertTrue(a._facesListeners.contains(listener1));
- assertFalse(b._facesListeners.contains(listener1));
- assertTrue(a._facesListeners.contains(listener2));
- assertTrue(b._facesListeners.contains(listener2));
- assertEquals("value2", ((StateFacesListener)b._facesListeners.get(b._facesListeners.indexOf(listener2))).getValue());
+ Assert.assertTrue(a._facesListeners.contains(listener1));
+ Assert.assertFalse(b._facesListeners.contains(listener1));
+ Assert.assertTrue(a._facesListeners.contains(listener2));
+ Assert.assertTrue(b._facesListeners.contains(listener2));
+ Assert.assertEquals("value2", ((StateFacesListener)b._facesListeners.get(b._facesListeners.indexOf(listener2))).getValue());
}
}
diff --git a/impl/src/test/java/javax/faces/component/_DeltaStateHelperTest.java b/impl/src/test/java/javax/faces/component/_DeltaStateHelperTest.java
index 65ad89f..0f4fc45 100644
--- a/impl/src/test/java/javax/faces/component/_DeltaStateHelperTest.java
+++ b/impl/src/test/java/javax/faces/component/_DeltaStateHelperTest.java
@@ -20,6 +20,7 @@
import java.util.List;
import java.util.Map;
+import org.junit.Assert;
/**
* A generic framework less testcase for our _DeltaStateHelper class!
@@ -41,15 +42,15 @@
private void assertStructure()
{
- assertTrue("check for key1", _instance.get(KEY1).equals(VAL1));
- assertTrue("check for key2", _instance.get(KEY2) instanceof Map);
- assertTrue("check for key3", _instance.get(KEY3) instanceof List);
+ Assert.assertTrue("check for key1", _instance.get(KEY1).equals(VAL1));
+ Assert.assertTrue("check for key2", _instance.get(KEY2) instanceof Map);
+ Assert.assertTrue("check for key3", _instance.get(KEY3) instanceof List);
- assertTrue("check for list size",
+ Assert.assertTrue("check for list size",
((List) _instance.get(KEY3)).size() >= 1);
- assertTrue("check for map entries", ((Map) _instance.get(KEY2)).get(
+ Assert.assertTrue("check for map entries", ((Map) _instance.get(KEY2)).get(
KEY_2_2).equals(VAL3));
- assertTrue("check for map entries", ((Map) _instance.get(KEY2)).get(
+ Assert.assertTrue("check for map entries", ((Map) _instance.get(KEY2)).get(
KEY_2_1).equals(VAL2));
}
@@ -80,13 +81,8 @@
}
}
- public _DeltaStateHelperTest(String testName)
- {
- super(testName);
- }
-
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
@@ -96,7 +92,7 @@
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
super.tearDown();
@@ -108,10 +104,10 @@
*/
public void testIsInitalStateMarked()
{
- assertTrue("Initial state must be marked", _instance
+ Assert.assertTrue("Initial state must be marked", _instance
.isInitialStateMarked());
_instance.setInitialStateMarked(false);
- assertFalse("Initial state must be false", _instance
+ Assert.assertFalse("Initial state must be false", _instance
.isInitialStateMarked());
}
@@ -122,25 +118,25 @@
{
_instance.add(KEY1, VAL1);
Object val = _instance.get(KEY1);
- assertTrue("Value must be list", val instanceof List);
- assertTrue("Value size must be one", ((List) val).size() == 1);
+ Assert.assertTrue("Value must be list", val instanceof List);
+ Assert.assertTrue("Value size must be one", ((List) val).size() == 1);
_instance.add(KEY1, new Integer(2));
_instance.add(KEY2, new Integer(2));
val = _instance.get(KEY1);
- assertTrue("Value must be list", val instanceof List);
- assertTrue("Value size must be one", ((List) val).size() == 2);
+ Assert.assertTrue("Value must be list", val instanceof List);
+ Assert.assertTrue("Value size must be one", ((List) val).size() == 2);
- assertTrue("Value msut be of type string and must equal val1",
+ Assert.assertTrue("Value msut be of type string and must equal val1",
((List) val).get(0).equals(VAL1));
- assertTrue("Value msut be of type int and must equal 2", ((List) val)
+ Assert.assertTrue("Value msut be of type int and must equal 2", ((List) val)
.get(1).equals(new Integer(2)));
val = _instance.get(KEY2);
- assertTrue("Value must be list", val instanceof List);
- assertTrue("Value size must be one", ((List) val).size() == 1);
+ Assert.assertTrue("Value must be list", val instanceof List);
+ Assert.assertTrue("Value size must be one", ((List) val).size() == 1);
}
/**
@@ -172,12 +168,12 @@
{
_setupGetTests();
- assertTrue("check for key1", _instance.get(KEY1).equals(VAL1));
+ Assert.assertTrue("check for key1", _instance.get(KEY1).equals(VAL1));
Map entry = (Map) _instance.get(KEY2);
- assertTrue("check for key2", _instance.get(KEY2) instanceof Map);
+ Assert.assertTrue("check for key2", _instance.get(KEY2) instanceof Map);
- assertTrue("check for key2 structure", entry.size() == 2
+ Assert.assertTrue("check for key2 structure", entry.size() == 2
&& entry.get(KEY_2_1).equals(VAL2)
&& entry.get(KEY_2_2).equals(VAL3));
}
@@ -187,21 +183,21 @@
_instance.put(KEY1, null);
_instance.put(KEY2, null);
- assertNull("key1 is not null", _instance.get(KEY1));
- assertNull("key2 is not null", _instance.get(KEY2));
+ Assert.assertNull("key1 is not null", _instance.get(KEY1));
+ Assert.assertNull("key2 is not null", _instance.get(KEY2));
_setupGetTests();
- assertTrue("check for key1", _instance.get(KEY1).equals(VAL1));
+ Assert.assertTrue("check for key1", _instance.get(KEY1).equals(VAL1));
Map entry = (Map) _instance.get(KEY2);
- assertTrue("check for key2", _instance.get(KEY2) instanceof Map);
+ Assert.assertTrue("check for key2", _instance.get(KEY2) instanceof Map);
- assertTrue("check for key2 structure", entry.size() == 2
+ Assert.assertTrue("check for key2 structure", entry.size() == 2
&& entry.get(KEY_2_1).equals(VAL2)
&& entry.get(KEY_2_2).equals(VAL3));
_instance.put(KEY1, null);
- assertNull("key1 is not null", _instance.get(KEY1));
+ Assert.assertNull("key1 is not null", _instance.get(KEY1));
}
/**
@@ -219,7 +215,7 @@
{
_setupGetTests();
_instance.remove(KEY1);
- assertTrue("key 1 should not exist anymore",
+ Assert.assertTrue("key 1 should not exist anymore",
_instance.get(KEY1) == null);
//TODO check the deleted data structure for further internal structural tests
}
@@ -235,8 +231,8 @@
_instance.remove(KEY3, VAL3);
- assertTrue("no key2 should exist anymore", _instance.get(KEY2) == null);
- assertTrue("key3 also should not exist anymore",
+ Assert.assertTrue("no key2 should exist anymore", _instance.get(KEY2) == null);
+ Assert.assertTrue("key3 also should not exist anymore",
_instance.get(KEY3) == null);
}
@@ -252,8 +248,8 @@
//save stating does not need a facesContext for now!
Object retVal = _instance.saveState(facesContext);
- assertTrue("retVal must be an array", retVal instanceof Object[]);
- assertTrue("arraylength must be given", ((Object[]) retVal).length > 0);
+ Assert.assertTrue("retVal must be an array", retVal instanceof Object[]);
+ Assert.assertTrue("arraylength must be given", ((Object[]) retVal).length > 0);
//only basic structural tests are done here
//the more important ones are the ones in restorestate
@@ -263,7 +259,7 @@
_instance.put(KEY5, VAL5);
Object[] deltaSaveState = (Object[]) _instance.saveState(facesContext);
//only the new value should be saved as delta
- assertTrue("Delta Savestate structure", deltaSaveState.length == 2
+ Assert.assertTrue("Delta Savestate structure", deltaSaveState.length == 2
&& deltaSaveState[0].equals(KEY5)
&& deltaSaveState[1].equals(VAL5));
@@ -299,6 +295,6 @@
public void testIsTransient()
{
_instance.setTransient(true);
- assertTrue(_instance.isTransient());
+ Assert.assertTrue(_instance.isTransient());
}
}
diff --git a/impl/src/test/java/javax/faces/component/_SelectItemsUtilTest.java b/impl/src/test/java/javax/faces/component/_SelectItemsUtilTest.java
index 0ef049e..a9af647 100644
--- a/impl/src/test/java/javax/faces/component/_SelectItemsUtilTest.java
+++ b/impl/src/test/java/javax/faces/component/_SelectItemsUtilTest.java
@@ -24,6 +24,7 @@
import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -85,11 +86,11 @@
boolean matchValue = _SelectItemsUtil.matchValue(facesContext, uiComponent, value, iterator, null);
- assertTrue("Value Float 1.2 must match SelectItem.value \"1.2\" (type of String)", matchValue);
+ Assert.assertTrue("Value Float 1.2 must match SelectItem.value \"1.2\" (type of String)", matchValue);
Float valueNotInSelectItems = Float.valueOf("2.0");
matchValue = _SelectItemsUtil.matchValue(facesContext, uiComponent, valueNotInSelectItems, iterator, null);
- assertFalse(matchValue);
+ Assert.assertFalse(matchValue);
}
@Test
@@ -104,11 +105,11 @@
Object enumValue = MockEnum.THREE;
boolean matchValue = _SelectItemsUtil.matchValue(facesContext, uiComponent, enumValue, iterator, null);
- assertTrue("Value Enum THREE must match SelectItem.value \"THREE\" (type of String)", matchValue);
+ Assert.assertTrue("Value Enum THREE must match SelectItem.value \"THREE\" (type of String)", matchValue);
enumValue = MockEnum.FOUR;
matchValue = _SelectItemsUtil.matchValue(facesContext, uiComponent, enumValue, iterator, null);
- assertFalse(matchValue);
+ Assert.assertFalse(matchValue);
}
@Test
@@ -123,7 +124,7 @@
Object enumValue = MockEnum.TWO;
boolean matchValue = _SelectItemsUtil.matchValue(facesContext, uiComponent, enumValue, iterator, null);
- assertTrue("Value Enum TWO must match SelectItem.value \"TWO\" (type of String)", matchValue);
+ Assert.assertTrue("Value Enum TWO must match SelectItem.value \"TWO\" (type of String)", matchValue);
}
private static enum MockEnum {
@@ -153,11 +154,11 @@
{
Float value = Float.parseFloat(NO_SELECTION_ITEM_VALUE);
boolean noSelectionOption = _SelectItemsUtil.isNoSelectionOption(facesContext, uiComponent, value, iterator, null);
- assertTrue(noSelectionOption);
+ Assert.assertTrue(noSelectionOption);
Float valueNotInSelectItems = Float.valueOf("2.0");
noSelectionOption = _SelectItemsUtil.isNoSelectionOption(facesContext, uiComponent, valueNotInSelectItems, iterator, null);
- assertFalse(noSelectionOption);
+ Assert.assertFalse(noSelectionOption);
}
diff --git a/impl/src/test/java/javax/faces/component/_SharedRendererUtilsTest.java b/impl/src/test/java/javax/faces/component/_SharedRendererUtilsTest.java
index d365a63..add85c9 100644
--- a/impl/src/test/java/javax/faces/component/_SharedRendererUtilsTest.java
+++ b/impl/src/test/java/javax/faces/component/_SharedRendererUtilsTest.java
@@ -29,8 +29,9 @@
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.el.MockValueExpression;
+import org.junit.Assert;
public class _SharedRendererUtilsTest extends AbstractJsfTestCase
{
@@ -171,14 +172,9 @@
private UISelectMany uiSelectMany;
private String[] submittedValue;
private Converter pojoConverter = new POJOConverter();
-
- public _SharedRendererUtilsTest(String name)
- {
- super(name);
- }
-
+
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
@@ -187,7 +183,7 @@
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
super.tearDown();
@@ -202,8 +198,8 @@
public void testGetConvertedUISelectManyValueNoConverterNoValueExpression()
{
Object target = SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
- assertTrue(target instanceof Object[]);
- assertTrue(Arrays.deepEquals((Object[]) target, submittedValue));
+ Assert.assertTrue(target instanceof Object[]);
+ Assert.assertTrue(Arrays.deepEquals((Object[]) target, submittedValue));
}
/**
@@ -217,10 +213,10 @@
ValueExpression expr = new MockValueExpression("#{bean.intArrayValue}", int[].class);
uiSelectMany.setValueExpression("value", expr);
Object target = SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
- assertTrue(target instanceof int[]);
+ Assert.assertTrue(target instanceof int[]);
int[] array = (int[]) target;
- assertTrue(new Integer(submittedValue[0]).equals(array[0]));
- assertTrue(new Integer(submittedValue[0]).equals(array[0]));
+ Assert.assertTrue(new Integer(submittedValue[0]).equals(array[0]));
+ Assert.assertTrue(new Integer(submittedValue[0]).equals(array[0]));
}
@@ -235,10 +231,10 @@
ValueExpression expr = new MockValueExpression("#{bean.floatArrayValue}", Float[].class);
uiSelectMany.setValueExpression("value", expr);
Object target = SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
- assertTrue(target instanceof Float[]);
+ Assert.assertTrue(target instanceof Float[]);
Float[] array = (Float[]) target;
- assertTrue(new Float(submittedValue[0]).equals(array[0]));
- assertTrue(new Float(submittedValue[1]).equals(array[1]));
+ Assert.assertTrue(new Float(submittedValue[0]).equals(array[0]));
+ Assert.assertTrue(new Float(submittedValue[1]).equals(array[1]));
}
/**
@@ -253,10 +249,10 @@
uiSelectMany.setValueExpression("value", expr);
uiSelectMany.setConverter(pojoConverter);
Object target = SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
- assertTrue(target instanceof POJO[]);
+ Assert.assertTrue(target instanceof POJO[]);
POJO[] array = (POJO[]) target;
- assertTrue(pojoConverter.getAsObject(facesContext, uiSelectMany, submittedValue[0]).equals(array[0]));
- assertTrue(pojoConverter.getAsObject(facesContext, uiSelectMany, submittedValue[1]).equals(array[1]));
+ Assert.assertTrue(pojoConverter.getAsObject(facesContext, uiSelectMany, submittedValue[0]).equals(array[0]));
+ Assert.assertTrue(pojoConverter.getAsObject(facesContext, uiSelectMany, submittedValue[1]).equals(array[1]));
}
/**
@@ -273,10 +269,10 @@
uiSelectMany.setValueExpression("value", expr);
uiSelectMany.setConverter(pojoConverter);
Object target = SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
- assertTrue(target instanceof Collection);
+ Assert.assertTrue(target instanceof Collection);
Collection collection = (Collection) target;
- assertTrue(collection.contains(pojoConverter.getAsObject(facesContext, uiSelectMany, submittedValue[0])));
- assertTrue(collection.contains(pojoConverter.getAsObject(facesContext, uiSelectMany, submittedValue[1])));
+ Assert.assertTrue(collection.contains(pojoConverter.getAsObject(facesContext, uiSelectMany, submittedValue[0])));
+ Assert.assertTrue(collection.contains(pojoConverter.getAsObject(facesContext, uiSelectMany, submittedValue[1])));
}
/**
@@ -295,10 +291,10 @@
uiSelectMany.setConverter(pojoConverter);
uiSelectMany.getAttributes().put("collectionType", "java.util.HashSet");
Object target = SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
- assertTrue(target instanceof HashSet);
+ Assert.assertTrue(target instanceof HashSet);
HashSet hashSet = (HashSet) target;
- assertTrue(hashSet.contains(pojoConverter.getAsObject(facesContext, uiSelectMany, submittedValue[0])));
- assertTrue(hashSet.contains(pojoConverter.getAsObject(facesContext, uiSelectMany, submittedValue[1])));
+ Assert.assertTrue(hashSet.contains(pojoConverter.getAsObject(facesContext, uiSelectMany, submittedValue[0])));
+ Assert.assertTrue(hashSet.contains(pojoConverter.getAsObject(facesContext, uiSelectMany, submittedValue[1])));
}
/**
@@ -314,7 +310,7 @@
try
{
SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
- fail();
+ Assert.fail();
}
catch (ConverterException ce)
{
@@ -337,7 +333,7 @@
try
{
SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
- fail();
+ Assert.fail();
}
catch (FacesException fe)
{
diff --git a/impl/src/test/java/javax/faces/convert/DateTimeConverterTest.java b/impl/src/test/java/javax/faces/convert/DateTimeConverterTest.java
index 9a61c27..13ea2d5 100644
--- a/impl/src/test/java/javax/faces/convert/DateTimeConverterTest.java
+++ b/impl/src/test/java/javax/faces/convert/DateTimeConverterTest.java
@@ -27,24 +27,16 @@
import javax.faces.component.UIInput;
import javax.faces.context.FacesContext;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
+import org.junit.Assert;
public class DateTimeConverterTest extends AbstractJsfTestCase
{
private DateTimeConverter mock;
- public static void main(String[] args)
- {
- junit.textui.TestRunner.run(DateTimeConverterTest.class);
- }
-
- public DateTimeConverterTest(String name)
- {
- super(name);
- }
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
@@ -55,7 +47,7 @@
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
super.tearDown();
@@ -77,7 +69,7 @@
{
mock.getAsObject(FacesContext.getCurrentInstance(), input, "15/15/15");
- assertTrue("this date should not be parsable - and it is, so this is wrong.", false);
+ Assert.assertTrue("this date should not be parsable - and it is, so this is wrong.", false);
}
catch (ConverterException e)
{
@@ -94,18 +86,18 @@
String str = format.format(date);
- assertEquals("12/01/01", str);
+ Assert.assertEquals("12/01/01", str);
format = new SimpleDateFormat("MM/dd/yyyy");
format.setTimeZone(TimeZone.getDefault());
str = format.format(date);
- assertEquals("12/01/0001", str);
+ Assert.assertEquals("12/01/0001", str);
}
catch (ConverterException e)
{
- assertTrue("this date should not be parsable - and it is, so this is wrong.", false);
+ Assert.assertTrue("this date should not be parsable - and it is, so this is wrong.", false);
}
}
}
diff --git a/impl/src/test/java/javax/faces/convert/DoubleConverterTest.java b/impl/src/test/java/javax/faces/convert/DoubleConverterTest.java
index 883c115..787f8c1 100644
--- a/impl/src/test/java/javax/faces/convert/DoubleConverterTest.java
+++ b/impl/src/test/java/javax/faces/convert/DoubleConverterTest.java
@@ -18,12 +18,13 @@
*/
package javax.faces.convert;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.junit.Test;
import javax.faces.component.UIInput;
import javax.faces.context.FacesContext;
import java.util.Locale;
+import org.junit.Assert;
/**
* Test the {@link DoubleConverter}.
@@ -32,13 +33,8 @@
private DoubleConverter mock;
- public DoubleConverterTest(String name)
- {
- super(name);
- }
-
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
@@ -46,7 +42,7 @@
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
super.tearDown();
@@ -64,21 +60,21 @@
{
Double d = (Double) mock.getAsObject(FacesContext.getCurrentInstance(), input, "47,3443");
- assertNotNull(d);
- assertEquals(47.3443d, d.doubleValue());
+ Assert.assertNotNull(d);
+ Assert.assertEquals(47.3443d, d.doubleValue(), 0);
}
{
Double d = (Double) mock.getAsObject(FacesContext.getCurrentInstance(), input, "0,3443e3");
- assertNotNull(d);
- assertEquals(344.3d, d.doubleValue());
+ Assert.assertNotNull(d);
+ Assert.assertEquals(344.3d, d.doubleValue(), 0);
}
{
// values with a dot as decimal seperator should still work...
Double d = (Double) mock.getAsObject(FacesContext.getCurrentInstance(), input, "0.3443e3");
- assertNotNull(d);
- assertEquals(344.3d, d.doubleValue());
+ Assert.assertNotNull(d);
+ Assert.assertEquals(344.3d, d.doubleValue(), 0);
}
}
@@ -94,8 +90,8 @@
{
Double d = (Double) mock.getAsObject(FacesContext.getCurrentInstance(), input, "47.3443");
- assertNotNull(d);
- assertEquals(47.3443d, d.doubleValue());
+ Assert.assertNotNull(d);
+ Assert.assertEquals(47.3443d, d.doubleValue(), 0);
}
{
@@ -103,7 +99,7 @@
try
{
Double d = (Double) mock.getAsObject(FacesContext.getCurrentInstance(), input, "47,3443");
- fail();
+ Assert.fail();
}
catch (ConverterException cev)
{
diff --git a/impl/src/test/java/javax/faces/convert/EnumConverterTest.java b/impl/src/test/java/javax/faces/convert/EnumConverterTest.java
index c36cdb1..79a91b2 100644
--- a/impl/src/test/java/javax/faces/convert/EnumConverterTest.java
+++ b/impl/src/test/java/javax/faces/convert/EnumConverterTest.java
@@ -22,7 +22,8 @@
import javax.faces.component.UIInput;
import javax.faces.context.FacesContext;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
+import org.junit.Assert;
/**
* This testcase test <code>javax.faces.convert.EnumConverter</code>.
@@ -45,20 +46,15 @@
private EnumConverter converter;
- public EnumConverterTest(String name)
- {
- super(name);
- }
-
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
converter = new EnumConverter(testEnum.class);
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
super.tearDown();
converter = null;
@@ -72,7 +68,7 @@
{
UIInput input = new UIInput();
Object convertedObj = converter.getAsObject(FacesContext.getCurrentInstance(), input, "ITEM2");
- assertEquals(convertedObj, testEnum.ITEM2);
+ Assert.assertEquals(convertedObj, testEnum.ITEM2);
}
/**
@@ -83,7 +79,7 @@
{
UIInput input = new UIInput();
Object convertedObj = converter.getAsObject(FacesContext.getCurrentInstance(), input, null);
- assertNull(convertedObj);
+ Assert.assertNull(convertedObj);
}
/**
@@ -96,7 +92,7 @@
try
{
converter.getAsObject(FacesContext.getCurrentInstance(), input, "NO_ENUM_CONST");
- fail("Converter exception should be thrown");
+ Assert.fail("Converter exception should be thrown");
}
catch (ConverterException e)
{
@@ -115,7 +111,7 @@
try
{
testConverter.getAsObject(FacesContext.getCurrentInstance(), input, "ITEM2");
- fail("Converter exception should be thrown");
+ Assert.fail("Converter exception should be thrown");
}
catch (ConverterException e)
{
@@ -131,7 +127,7 @@
{
UIInput input = new UIInput();
String convertedStr = converter.getAsString(FacesContext.getCurrentInstance(), input, testEnum.ITEM1);
- assertEquals(convertedStr, testEnum.ITEM1.name());
+ Assert.assertEquals(convertedStr, testEnum.ITEM1.name());
}
/**
@@ -142,7 +138,7 @@
{
UIInput input = new UIInput();
String convertedStr = converter.getAsString(FacesContext.getCurrentInstance(), input, null);
- assertEquals(convertedStr, "");
+ Assert.assertEquals(convertedStr, "");
}
/**
@@ -155,7 +151,7 @@
try
{
String convertedStr = converter.getAsString(FacesContext.getCurrentInstance(), input, "HALLO");
- fail("Converter exception should be thrown");
+ Assert.fail("Converter exception should be thrown");
}
catch (ConverterException e)
{
@@ -174,7 +170,7 @@
try
{
testConverter.getAsString(FacesContext.getCurrentInstance(), input, testEnum.ITEM1);
- fail("Converter exception should be thrown");
+ Assert.fail("Converter exception should be thrown");
}
catch (ConverterException e)
{
diff --git a/impl/src/test/java/javax/faces/convert/MessageUtilsTest.java b/impl/src/test/java/javax/faces/convert/MessageUtilsTest.java
index 57c8418..63d4341 100644
--- a/impl/src/test/java/javax/faces/convert/MessageUtilsTest.java
+++ b/impl/src/test/java/javax/faces/convert/MessageUtilsTest.java
@@ -22,25 +22,21 @@
import javax.faces.component.html.HtmlInputText;
import org.apache.myfaces.core.api.shared.MessageUtils;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.el.MockValueExpression;
+import org.junit.Assert;
public class MessageUtilsTest extends AbstractJsfTestCase
{
- public MessageUtilsTest(String name)
- {
- super(name);
- }
-
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
super.tearDown();
}
@@ -50,7 +46,7 @@
HtmlInputText inputText = new HtmlInputText();
inputText.getAttributes().put("label", "testLabel");
Object label = MessageUtils.getLabel(facesContext, inputText);
- assertEquals("testLabel", label);
+ Assert.assertEquals("testLabel", label);
}
public void testGetLabelFromValueExpression()
@@ -61,7 +57,7 @@
inputText.setValueExpression("label", expression);
Object label = MessageUtils.getLabel(facesContext, inputText);
- assertEquals("testLabel", label);
+ Assert.assertEquals("testLabel", label);
}
public void testGetLabelReturnsClientIdWhenLabelIsNotSpecified()
@@ -69,6 +65,6 @@
HtmlInputText inputText = new HtmlInputText();
inputText.setId("testId");
Object label = MessageUtils.getLabel(facesContext, inputText);
- assertEquals("testId", label);
+ Assert.assertEquals("testId", label);
}
}
\ No newline at end of file
diff --git a/impl/src/test/java/javax/faces/convert/NumberConverterTest.java b/impl/src/test/java/javax/faces/convert/NumberConverterTest.java
index 230b3e4..37b3ab0 100644
--- a/impl/src/test/java/javax/faces/convert/NumberConverterTest.java
+++ b/impl/src/test/java/javax/faces/convert/NumberConverterTest.java
@@ -24,7 +24,7 @@
import javax.el.ValueExpression;
import javax.faces.component.UIInput;
import javax.faces.context.FacesContext;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.junit.Assert;
import org.junit.Test;
@@ -32,18 +32,8 @@
{
private NumberConverter mock;
- public static void main(String[] args)
- {
- junit.textui.TestRunner.run(NumberConverterTest.class);
- }
-
- public NumberConverterTest(String name)
- {
- super(name);
- }
-
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
@@ -51,7 +41,7 @@
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
super.tearDown();
@@ -70,7 +60,7 @@
mock.setType("currency");
String stringValue = mock.getAsString(facesContext, input, new Double(12345.68d));
Number number = (Number) mock.getAsObject(FacesContext.getCurrentInstance(), input, "12\u00a0345,68 \u20AC");
- assertNotNull(number);
+ Assert.assertNotNull(number);
}
@Test
@@ -81,7 +71,7 @@
UIInput input = new UIInput();
mock.setType("currency");
Number number = (Number) mock.getAsObject(FacesContext.getCurrentInstance(), input, "12 345,68 \u20AC");
- assertNotNull(number);
+ Assert.assertNotNull(number);
}
/**
@@ -98,8 +88,8 @@
Number testValue = 12345.68d;
String stringValue = mock.getAsString(facesContext, input, testValue);
Number number = (Number) mock.getAsObject(facesContext, input, stringValue);
- assertNotNull(number);
- assertEquals(testValue, number);
+ Assert.assertNotNull(number);
+ Assert.assertEquals(testValue, number);
}
/**
@@ -116,8 +106,8 @@
Number testValue = 12345.68d;
String stringValue = mock.getAsString(facesContext, input, testValue);
Number number = (Number) mock.getAsObject(facesContext, input, stringValue);
- assertNotNull(number);
- assertEquals(testValue, number);
+ Assert.assertNotNull(number);
+ Assert.assertEquals(testValue, number);
}
/**
@@ -134,8 +124,8 @@
Number testValue = 12345.68d;
String stringValue = mock.getAsString(facesContext, input, testValue);
Number number = (Number) mock.getAsObject(facesContext, input, stringValue);
- assertNotNull(number);
- assertEquals(testValue, number);
+ Assert.assertNotNull(number);
+ Assert.assertEquals(testValue, number);
}
@Test
@@ -148,8 +138,8 @@
Number testValue = 12345.68d;
String stringValue = mock.getAsString(facesContext, input, testValue);
Number number = (Number) mock.getAsObject(facesContext, input, stringValue);
- assertNotNull(number);
- assertEquals(testValue, number);
+ Assert.assertNotNull(number);
+ Assert.assertEquals(testValue, number);
}
@Test
@@ -163,8 +153,8 @@
Number testValue = 12345.68d;
String stringValue = mock.getAsString(facesContext, input, testValue);
Number number = (Number) mock.getAsObject(facesContext, input, stringValue);
- assertNotNull(number);
- assertEquals(testValue, number);
+ Assert.assertNotNull(number);
+ Assert.assertEquals(testValue, number);
}
@Test
@@ -176,11 +166,11 @@
FacesContext.getCurrentInstance().getViewRoot().setLocale(new Locale("cs"));
UIInput input = new UIInput();
String stringValue = mock.getAsString(facesContext, input, new Long(7000));
- assertEquals("must return 7&NBSP000", "7\u00a0000", stringValue);
+ Assert.assertEquals("must return 7&NBSP000", "7\u00a0000", stringValue);
Number number = (Number) mock.getAsObject(FacesContext.getCurrentInstance(), input, stringValue);
- assertNotNull(number);
- assertEquals(new Long(7000), number);
+ Assert.assertNotNull(number);
+ Assert.assertEquals(new Long(7000), number);
}
@Test
@@ -200,9 +190,9 @@
Number number = (Number) mock.getAsObject(FacesContext.getCurrentInstance(), input, "1");
- assertNotNull(number);
- assertTrue(number instanceof BigInteger);
- assertEquals(BigInteger.ONE, number);
+ Assert.assertNotNull(number);
+ Assert.assertTrue(number instanceof BigInteger);
+ Assert.assertEquals(BigInteger.ONE, number);
}
@Test
diff --git a/impl/src/test/java/javax/faces/event/MethodExpressionActionListenerTest.java b/impl/src/test/java/javax/faces/event/MethodExpressionActionListenerTest.java
index c7b6a00..791ee56 100644
--- a/impl/src/test/java/javax/faces/event/MethodExpressionActionListenerTest.java
+++ b/impl/src/test/java/javax/faces/event/MethodExpressionActionListenerTest.java
@@ -25,8 +25,9 @@
import javax.el.MethodNotFoundException;
import javax.faces.component.UICommand;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.easymock.classextension.EasyMock;
+import org.junit.Assert;
/**
* Tests for {@link MethodExpressionActionListener}
@@ -41,12 +42,8 @@
private ActionEvent actionEvent;
private Object[] paramsWithActionEvent;
- public MethodExpressionActionListenerTest(String name)
- {
- super(name);
- }
-
- protected void setUp() throws Exception
+ @Override
+ public void setUp() throws Exception
{
super.setUp();
uiComponent = new UICommand();
@@ -60,7 +57,8 @@
methodExpressionZeroArg = EasyMock.createNiceMock(MethodExpression.class);
}
- protected void tearDown() throws Exception
+ @Override
+ public void tearDown() throws Exception
{
uiComponent = null;
actionEvent = null;
@@ -135,7 +133,7 @@
{
methodExpressionActionListener = new MethodExpressionActionListener(methodExpressionOneArg, methodExpressionZeroArg);
Object[] expectedState = new Object [] {methodExpressionOneArg, methodExpressionZeroArg};
- assertTrue("Both MethodExpression instances described in the constructor must be saved.",
+ Assert.assertTrue("Both MethodExpression instances described in the constructor must be saved.",
Arrays.deepEquals(expectedState, (Object[]) methodExpressionActionListener.saveState(facesContext)));
}
@@ -150,11 +148,11 @@
// Test if the instance variables are set to the right values via reflection
Field oneArgField = MethodExpressionActionListener.class.getDeclaredField("methodExpressionOneArg");
oneArgField.setAccessible(true);
- assertEquals(methodExpressionOneArg, oneArgField.get(methodExpressionActionListener));
+ Assert.assertEquals(methodExpressionOneArg, oneArgField.get(methodExpressionActionListener));
Field zeroArgField = MethodExpressionActionListener.class.getDeclaredField("methodExpressionZeroArg");
zeroArgField.setAccessible(true);
- assertEquals(methodExpressionZeroArg, zeroArgField.get(methodExpressionActionListener));
+ Assert.assertEquals(methodExpressionZeroArg, zeroArgField.get(methodExpressionActionListener));
}
}
diff --git a/impl/src/test/java/javax/faces/event/MethodExpressionValueChangeListenerTest.java b/impl/src/test/java/javax/faces/event/MethodExpressionValueChangeListenerTest.java
index ccb1208..920c2fa 100644
--- a/impl/src/test/java/javax/faces/event/MethodExpressionValueChangeListenerTest.java
+++ b/impl/src/test/java/javax/faces/event/MethodExpressionValueChangeListenerTest.java
@@ -25,8 +25,9 @@
import javax.el.MethodNotFoundException;
import javax.faces.component.UICommand;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.easymock.classextension.EasyMock;
+import org.junit.Assert;
/**
* Tests for {@link MethodExpressionValueChangeListener}
@@ -41,12 +42,7 @@
private ValueChangeEvent valueChangeEvent;
private Object[] paramsWithValueChangeEvent;
- public MethodExpressionValueChangeListenerTest(String name)
- {
- super(name);
- }
-
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
uiComponent = new UICommand();
@@ -60,7 +56,7 @@
methodExpressionZeroArg = EasyMock.createNiceMock(MethodExpression.class);
}
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
uiComponent = null;
valueChangeEvent = null;
@@ -135,7 +131,7 @@
{
methodExpressionValueChangeListener = new MethodExpressionValueChangeListener(methodExpressionOneArg, methodExpressionZeroArg);
Object[] expectedState = new Object [] {methodExpressionOneArg, methodExpressionZeroArg};
- assertTrue("Both MethodExpression instances described in the constructor must be saved.",
+ Assert.assertTrue("Both MethodExpression instances described in the constructor must be saved.",
Arrays.deepEquals(expectedState, (Object[]) methodExpressionValueChangeListener.saveState(facesContext)));
}
@@ -150,11 +146,11 @@
// Test if the instance variables are set to the right values via reflection
Field oneArgField = MethodExpressionValueChangeListener.class.getDeclaredField("methodExpressionOneArg");
oneArgField.setAccessible(true);
- assertEquals(methodExpressionOneArg, oneArgField.get(methodExpressionValueChangeListener));
+ Assert.assertEquals(methodExpressionOneArg, oneArgField.get(methodExpressionValueChangeListener));
Field zeroArgField = MethodExpressionValueChangeListener.class.getDeclaredField("methodExpressionZeroArg");
zeroArgField.setAccessible(true);
- assertEquals(methodExpressionZeroArg, zeroArgField.get(methodExpressionValueChangeListener));
+ Assert.assertEquals(methodExpressionZeroArg, zeroArgField.get(methodExpressionValueChangeListener));
}
}
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 dd16009..0327a3f 100644
--- a/impl/src/test/java/org/apache/myfaces/application/ApplicationImplJsfTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/ApplicationImplJsfTest.java
@@ -29,12 +29,13 @@
import javax.faces.view.facelets.FaceletContext;
import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.el.MockExpressionFactory;
import org.apache.myfaces.view.facelets.impl.FaceletCacheFactoryImpl;
import org.apache.myfaces.view.facelets.mock.MockViewDeclarationLanguageFactory;
import org.easymock.classextension.EasyMock;
import org.easymock.classextension.IMocksControl;
+import org.junit.Assert;
/**
* Test class for ApplicationImpl that extends AbstractJsfTestCase
@@ -96,22 +97,17 @@
*/
private static void assertRendererTypeResourceBeanInfo(UIComponent component, Resource resource, BeanInfo metadata)
{
- assertEquals(COMPOSITE_RENDERER_MSG, "javax.faces.Composite", component.getRendererType());
- assertEquals(RESOURCE_MSG, resource, component.getAttributes().get(Resource.COMPONENT_RESOURCE_KEY));
- assertEquals(BEANINFO_MSG, metadata, component.getAttributes().get(UIComponent.BEANINFO_KEY));
+ Assert.assertEquals(COMPOSITE_RENDERER_MSG, "javax.faces.Composite", component.getRendererType());
+ Assert.assertEquals(RESOURCE_MSG, resource, component.getAttributes().get(Resource.COMPONENT_RESOURCE_KEY));
+ Assert.assertEquals(BEANINFO_MSG, metadata, component.getAttributes().get(UIComponent.BEANINFO_KEY));
}
private TestApplicationWrapper _testApplication;
private IMocksControl _mocksControl;
private FaceletContext _faceletContext;
-
- public ApplicationImplJsfTest(String name)
- {
- super(name);
- }
-
+
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
@@ -132,7 +128,7 @@
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
_mocksControl = null;
_faceletContext = null;
@@ -178,7 +174,7 @@
UIComponent component = _testApplication.createComponent(facesContext, resource);
// asserts for the first component
- assertTrue("The component has to be an UINamingContainer", component instanceof UINamingContainer);
+ Assert.assertTrue("The component has to be an UINamingContainer", component instanceof UINamingContainer);
assertRendererTypeResourceBeanInfo(component, resource, metadata);
// ---- second component test - from a script ------------------------------------------
@@ -194,7 +190,7 @@
component = _testApplication.createComponent(facesContext, resource);
// asserts for the second component
- assertTrue("The component has to be a MockResourceComponent", component instanceof MockResourceComponent);
+ Assert.assertTrue("The component has to be a MockResourceComponent", component instanceof MockResourceComponent);
assertRendererTypeResourceBeanInfo(component, resource, metadata);
// remove the script resource again
@@ -237,7 +233,7 @@
component = _testApplication.createComponent(facesContext, componentResource);
// asserts for the third component
- assertTrue("The component has to be a MockResourceComponent", component instanceof MockResourceComponent);
+ Assert.assertTrue("The component has to be a MockResourceComponent", component instanceof MockResourceComponent);
assertRendererTypeResourceBeanInfo(component, componentResource, metadataComponentResource);
// ---- fourth component test - with a custom componentType ------------------------------
@@ -258,7 +254,7 @@
component = _testApplication.createComponent(facesContext, resource);
// asserts for the fourth component
- assertTrue("The component has to be an instance of UIOutput", component instanceof UIOutput);
+ Assert.assertTrue("The component has to be an instance of UIOutput", component instanceof UIOutput);
assertRendererTypeResourceBeanInfo(component, resource, metadata);*/
}
diff --git a/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java b/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java
index 8af55af..c980fc1 100644
--- a/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java
@@ -46,6 +46,7 @@
import org.apache.myfaces.config.RuntimeConfig;
import org.apache.myfaces.test.mock.MockFacesContext;
import org.apache.myfaces.test.mock.MockFacesContext12;
+import org.junit.Assert;
/**
* @author Mathias Broekelmann (latest modification by $Author$)
@@ -59,7 +60,7 @@
protected ApplicationImpl application;
protected MockFacesContext facesContext;
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
application = new ApplicationImpl(new RuntimeConfig());
facesContext = new MockFacesContext();
@@ -146,7 +147,7 @@
application.addComponent("testComponent", UIOutput.class.getName());
replay(context);
replay(expr);
- assertTrue(UIOutput.class.isAssignableFrom(application.createComponent(expr, context, "testComponent").getClass()));
+ Assert.assertTrue(UIOutput.class.isAssignableFrom(application.createComponent(expr, context, "testComponent").getClass()));
}
public void testCreateComponentExpressionFacesExceptionTest() throws Exception
@@ -168,7 +169,7 @@
}
catch (Throwable e)
{
- fail("FacesException expected: " + e.getMessage());
+ Assert.fail("FacesException expected: " + e.getMessage());
}
}
@@ -189,16 +190,16 @@
@Override
String getBundleName(FacesContext facesContext, String name)
{
- assertEquals(var, name);
+ Assert.assertEquals(var, name);
return bundleName;
}
@Override
ResourceBundle getResourceBundle(String name, Locale locale, ClassLoader loader)
{
- assertEquals(Thread.currentThread().getContextClassLoader(), loader);
- assertEquals(bundleName, name);
- assertEquals(expectedLocale, locale);
+ Assert.assertEquals(Thread.currentThread().getContextClassLoader(), loader);
+ Assert.assertEquals(bundleName, name);
+ Assert.assertEquals(expectedLocale, locale);
return bundle;
}
};
@@ -216,8 +217,8 @@
application.addConverter(Enum.class, EnumConverter.class.getName());
Converter converter = application.createConverter(MyEnum.class);
- assertNotNull(converter);
- assertEquals(converter.getClass(), EnumConverter.class);
+ Assert.assertNotNull(converter);
+ Assert.assertEquals(converter.getClass(), EnumConverter.class);
}
@@ -263,6 +264,6 @@
Converter converter = application.createConverter(AnotherEnum.class);
assertNotNull(converter);
- assertEquals(converter.getClass(), EnumCodedTestConverter.class);
+ Assert.assertEquals(converter.getClass(), EnumCodedTestConverter.class);
}
}
diff --git a/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java b/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java
index 205f3ec..5bb2a3b 100644
--- a/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java
@@ -619,8 +619,8 @@
// http://www.nfjsone.com/blog/ed_burns/2009/09/dealing_gracefully_with_viewexpiredexception_in_jsf2
underTest.handleNavigation(facesContext, null, "viewExpired");
- assertNotNull(facesContext.getViewRoot());
- assertEquals("/viewExpired.xhtml", facesContext.getViewRoot().getViewId());
+ Assert.assertNotNull(facesContext.getViewRoot());
+ Assert.assertEquals("/viewExpired.xhtml", facesContext.getViewRoot().getViewId());
}
@Test
@@ -634,8 +634,8 @@
// http://www.nfjsone.com/blog/ed_burns/2009/09/dealing_gracefully_with_viewexpiredexception_in_jsf2
underTest.handleNavigation(facesContext, null, "viewExpired.xhtml");
- assertNotNull(facesContext.getViewRoot());
- assertEquals("/viewExpired.xhtml", facesContext.getViewRoot().getViewId());
+ Assert.assertNotNull(facesContext.getViewRoot());
+ Assert.assertEquals("/viewExpired.xhtml", facesContext.getViewRoot().getViewId());
}
@@ -650,11 +650,11 @@
// http://www.nfjsone.com/blog/ed_burns/2009/09/dealing_gracefully_with_viewexpiredexception_in_jsf2
underTest.handleNavigation(facesContext, null, "viewExpired");
- assertNotNull(facesContext.getViewRoot());
+ Assert.assertNotNull(facesContext.getViewRoot());
// In this case, we have /viewExpired.jsf, but note the default ViewHandlerImpl converts the viewId
// from /viewExpired.jsf to /viewExpired.xhtml, when deriveViewId() is called.
- assertEquals("/viewExpired.jsf", facesContext.getViewRoot().getViewId());
+ Assert.assertEquals("/viewExpired.jsf", facesContext.getViewRoot().getViewId());
}
@@ -667,8 +667,8 @@
// http://www.nfjsone.com/blog/ed_burns/2009/09/dealing_gracefully_with_viewexpiredexception_in_jsf2
underTest.handleNavigation(facesContext, null, "viewExpired.xhtml");
- assertNotNull(facesContext.getViewRoot());
- assertEquals("/viewExpired.xhtml", facesContext.getViewRoot().getViewId());
+ Assert.assertNotNull(facesContext.getViewRoot());
+ Assert.assertEquals("/viewExpired.xhtml", facesContext.getViewRoot().getViewId());
}
@@ -684,8 +684,8 @@
underTest.handleNavigation(facesContext, null, "/viewExpired.xhtml");
- assertNotNull(facesContext.getViewRoot());
- assertEquals("/viewExpired.xhtml", facesContext.getViewRoot().getViewId());
+ Assert.assertNotNull(facesContext.getViewRoot());
+ Assert.assertEquals("/viewExpired.xhtml", facesContext.getViewRoot().getViewId());
}
@Test
diff --git a/impl/src/test/java/org/apache/myfaces/application/ResourceHandlerImplTest.java b/impl/src/test/java/org/apache/myfaces/application/ResourceHandlerImplTest.java
index 2a24ed3..0a840bf 100644
--- a/impl/src/test/java/org/apache/myfaces/application/ResourceHandlerImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/ResourceHandlerImplTest.java
@@ -20,7 +20,7 @@
import java.io.InputStream;
import java.net.MalformedURLException;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.junit.Assert;
import org.junit.Test;
@@ -43,13 +43,8 @@
private ResourceHandlerImpl resourceHandler;
- public ResourceHandlerImplTest(String name)
- {
- super(name);
- }
-
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
@@ -58,7 +53,7 @@
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
resourceHandler = null;
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 c2c5403..7631966 100644
--- a/impl/src/test/java/org/apache/myfaces/application/ViewIdSupportMockTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/ViewIdSupportMockTest.java
@@ -28,6 +28,7 @@
import org.apache.myfaces.test.MyFacesAsserts;
import org.apache.myfaces.test.FacesTestCase;
import org.apache.myfaces.test.TestRunner;
+import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
@@ -36,7 +37,7 @@
private ViewIdSupport viewIdSupport;
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
@@ -54,7 +55,7 @@
map.put("javax.servlet.include.path_info", expectedValue);
Mockito.when(_externalContext.getRequestMap()).thenReturn(map);
- assertEquals(expectedValue, viewIdSupport.calculateViewId(_facesContext));
+ Assert.assertEquals(expectedValue, viewIdSupport.calculateViewId(_facesContext));
}
public void testCalculateViewIdFromRequestPathInfo()
@@ -64,7 +65,7 @@
String expectedValue = "requestPathInfo_VIEWID";
Mockito.when(_externalContext.getRequestPathInfo()).thenReturn(expectedValue);
- assertEquals(expectedValue, viewIdSupport.calculateViewId(_facesContext));
+ Assert.assertEquals(expectedValue, viewIdSupport.calculateViewId(_facesContext));
}
public void testCalculateViewIdFromRequestAttributeIncludeServletPath()
@@ -76,7 +77,7 @@
Mockito.when(_externalContext.getRequestPathInfo()).thenReturn(null);
- assertEquals(expectedValue, viewIdSupport.calculateViewId(_facesContext));
+ Assert.assertEquals(expectedValue, viewIdSupport.calculateViewId(_facesContext));
}
public void testCalculateViewIdFromRequestServletPath()
@@ -86,7 +87,7 @@
String expectedValue = "RequestServletPath_VIEWID";
Mockito.when(_externalContext.getRequestServletPath()).thenReturn(expectedValue);
- assertEquals(expectedValue, viewIdSupport.calculateViewId(_facesContext));
+ Assert.assertEquals(expectedValue, viewIdSupport.calculateViewId(_facesContext));
}
public void testCalculateViewIdFacesException()
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 21b730d..46fa68c 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
@@ -22,17 +22,14 @@
import org.apache.myfaces.application.viewstate.StateUtils;
import org.apache.myfaces.spi.impl.DefaultSerialFactory;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import java.io.Serializable;
import java.util.Arrays;
+import org.junit.Assert;
public abstract class AbstractStateUtilsTest extends AbstractJsfTestCase implements Serializable
{
- public AbstractStateUtilsTest(String name) {
- super(name);
- }
-
protected String sensitiveString;
private static final String TEST_DATA = "This is the test data.";
// 76543210
@@ -64,9 +61,9 @@
{
String constructed = StateUtils.construct(sensitiveString, externalContext);
Object object = StateUtils.reconstruct(constructed, externalContext);
- assertTrue(object instanceof String);
+ Assert.assertTrue(object instanceof String);
String string = (String) object;
- assertEquals(string, sensitiveString);
+ Assert.assertEquals(string, sensitiveString);
}
/**
@@ -78,14 +75,14 @@
{
String constructed = StateUtils.construct(TEST_DATA, externalContext);
Object object = org.apache.myfaces.application.viewstate.StateUtils.reconstruct(constructed, externalContext);
- assertTrue(TEST_DATA.equals(object));
+ Assert.assertTrue(TEST_DATA.equals(object));
}
public void testSerialization()
{
byte[] bytes = StateUtils.getAsByteArray(TEST_DATA, externalContext);
Object object = StateUtils.getAsObject(bytes, externalContext);
- assertTrue(TEST_DATA.equals(object));
+ Assert.assertTrue(TEST_DATA.equals(object));
}
public void testCryptography()
@@ -95,7 +92,7 @@
byte[] insecure = StateUtils.decrypt(secure, externalContext);
secure = StateUtils.encrypt(insecure, externalContext); // * 2
insecure = StateUtils.decrypt(secure, externalContext);
- assertTrue(Arrays.equals(insecure, sensitiveBytes));
+ Assert.assertTrue(Arrays.equals(insecure, sensitiveBytes));
}
public void testCompression()
@@ -103,10 +100,10 @@
int size = 2049;
byte[] orginalBytes = new byte[size];
byte[] lessBytes = StateUtils.compress(orginalBytes);
- assertTrue(lessBytes.length < orginalBytes.length);
+ Assert.assertTrue(lessBytes.length < orginalBytes.length);
byte[] moreBytes = StateUtils.decompress(lessBytes);
- assertTrue(moreBytes.length > lessBytes.length);
- assertTrue(Arrays.equals(moreBytes, orginalBytes));
+ Assert.assertTrue(moreBytes.length > lessBytes.length);
+ Assert.assertTrue(Arrays.equals(moreBytes, orginalBytes));
}
public void testEncoding()
@@ -114,7 +111,7 @@
byte[] orginalBytes = sensitiveString.getBytes();
byte[] encoded = StateUtils.encode(orginalBytes);
byte[] decoded = StateUtils.decode(encoded);
- assertTrue(Arrays.equals(decoded, orginalBytes));
+ Assert.assertTrue(Arrays.equals(decoded, orginalBytes));
}
/**
@@ -128,7 +125,7 @@
try
{
Object object = StateUtils.reconstruct(constructed, externalContext);
- assertFalse(TEST_DATA.equals(object));
+ Assert.assertFalse(TEST_DATA.equals(object));
}
catch (Exception e)
{
@@ -147,7 +144,7 @@
try
{
Object object = StateUtils.getAsObject(bytes, externalContext);
- assertFalse(TEST_DATA.equals(object));
+ Assert.assertFalse(TEST_DATA.equals(object));
}
catch (Exception e)
{
@@ -169,7 +166,7 @@
try
{
byte[] insecure = StateUtils.decrypt(secure, externalContext);
- assertFalse(Arrays.equals(insecure, sensitiveBytes));
+ Assert.assertFalse(Arrays.equals(insecure, sensitiveBytes));
}
catch (Exception e)
{
@@ -190,7 +187,7 @@
try
{
byte[] moreBytes = StateUtils.decompress(lessBytes);
- assertFalse(Arrays.equals(moreBytes, orginalBytes));
+ Assert.assertFalse(Arrays.equals(moreBytes, orginalBytes));
}
catch (Exception e)
{
@@ -210,7 +207,7 @@
try
{
byte[] decoded = StateUtils.decode(encoded);
- assertFalse(Arrays.equals(decoded, orginalBytes));
+ Assert.assertFalse(Arrays.equals(decoded, orginalBytes));
}
catch (Exception e)
{
diff --git a/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsAES_CBCTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsAES_CBCTest.java
index 4a2957e..61c6763 100644
--- a/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsAES_CBCTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsAES_CBCTest.java
@@ -38,16 +38,6 @@
public class CachedStateUtilsAES_CBCTest extends AbstractStateUtilsTest
{
- public CachedStateUtilsAES_CBCTest(String name)
- {
- super(name);
- }
-
- //No longer necessary using junit 4 to run tests
- //public static Test suite() {
- // return null; // keep this method or maven won't run it
- //}
-
public void setUp() throws Exception
{
super.setUp();
diff --git a/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsBlowfish_ECBTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsBlowfish_ECBTest.java
index 1caa3c5..e24ba8f 100644
--- a/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsBlowfish_ECBTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsBlowfish_ECBTest.java
@@ -24,17 +24,6 @@
public class CachedStateUtilsBlowfish_ECBTest extends AbstractStateUtilsTest
{
-
- public CachedStateUtilsBlowfish_ECBTest(String name)
- {
- super(name);
- }
-
- // No longer necessary using junit 4 to run tests
- //public static Test suite() {
- // return null; // keep this method or maven won't run it
- //}
-
public void setUp() throws Exception
{
super.setUp();
diff --git a/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsDefaultTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsDefaultTest.java
index e636b7d..c1f02c6 100644
--- a/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsDefaultTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsDefaultTest.java
@@ -25,16 +25,6 @@
public class CachedStateUtilsDefaultTest extends AbstractStateUtilsTest
{
- public CachedStateUtilsDefaultTest(String name)
- {
- super(name);
- }
-
- // No longer necessary using junit 4 to run tests
- //public static Test suite() {
- // return null; // keep this method or maven won't run it
- //}
-
public void setUp() throws Exception
{
super.setUp();
diff --git a/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsTripleDES_ECBTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsTripleDES_ECBTest.java
index bfec16e..ba9d835 100644
--- a/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsTripleDES_ECBTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsTripleDES_ECBTest.java
@@ -16,25 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-
package org.apache.myfaces.application.viewstate;
-import org.apache.myfaces.application.viewstate.StateUtils;
public class CachedStateUtilsTripleDES_ECBTest extends AbstractStateUtilsTest
{
- public CachedStateUtilsTripleDES_ECBTest(String name)
- {
- super(name);
- }
-
- // No longer necessary using junit 4 to run tests
- //public static Test suite() {
- // return null; // keep this method or maven won't run it
- //}
-
public void setUp() throws Exception
{
super.setUp();
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 8a1cb91..b9acf2e 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
@@ -17,23 +17,15 @@
package org.apache.myfaces.application.viewstate;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import javax.faces.FacesException;
+import org.junit.Assert;
-public class InitVector_CBCTestCase extends AbstractJsfTestCase {
-
- public InitVector_CBCTestCase(String name) {
- super(name);
- }
-
- // No longer necessary using junit 4 to run tests
- //public static Test suite() {
- // return null; // keep this method or maven won't run it
- //}
-
- public void setUp() throws Exception{
-
+public class InitVector_CBCTestCase extends AbstractJsfTestCase
+{
+ public void setUp() throws Exception
+ {
super.setUp();
servletContext.addInitParameter(StateUtils.INIT_SECRET, "shouldn't matter");
@@ -46,15 +38,15 @@
}
- public void testDecryption() {
-
+ public void testDecryption()
+ {
byte[] sensitiveBytes = "bound to fail".getBytes();
try{
StateUtils.decrypt(sensitiveBytes, externalContext);
- fail("MyFaces should throw a meaningful " +
+ Assert.fail("MyFaces should throw a meaningful " +
"exception when users opt for CBC mode " +
"encryption w/out an initialization vector.");
@@ -71,7 +63,7 @@
StateUtils.encrypt(sensitiveBytes, externalContext);
- fail("MyFaces should throw a meaningful " +
+ Assert.fail("MyFaces should throw a meaningful " +
"exception when users opt for CBC mode " +
"encryption w/out an initialization vector.");
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 7f5f73c..272d54a 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
@@ -18,23 +18,14 @@
package org.apache.myfaces.application.viewstate;
import org.apache.myfaces.application.viewstate.StateUtils;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import javax.crypto.SecretKey;
+import org.junit.Assert;
public class SecretKeyCacheTest extends AbstractJsfTestCase
{
- public SecretKeyCacheTest(String name)
- {
- super(name);
- }
-
- // No longer necessary using junit 4 to run tests
- //public static Test suite() {
- // return null; // keep this method or maven won't run it
- //}
-
public void setUp() throws Exception
{
super.setUp();
@@ -50,7 +41,7 @@
SecretKey secretKey = (SecretKey) servletContext.getAttribute(StateUtils.INIT_SECRET_KEY_CACHE);
- assertTrue("Making sure MyFaces uses the " +
+ Assert.assertTrue("Making sure MyFaces uses the " +
"default algorithm when one is not specified",
StateUtils.DEFAULT_ALGORITHM.equals(secretKey.getAlgorithm()));
@@ -64,7 +55,7 @@
Object object = servletContext.getAttribute(StateUtils.INIT_SECRET_KEY_CACHE);
- assertNull("Making sure StateUtils.initSecret does not create a SecretKey", object);
+ Assert.assertNull("Making sure StateUtils.initSecret does not create a SecretKey", object);
}
@@ -74,10 +65,10 @@
Object object = servletContext.getAttribute(StateUtils.INIT_SECRET_KEY_CACHE);
- assertFalse("Making sure StateUtils.initSecret() puts an object in application scope",
+ Assert.assertFalse("Making sure StateUtils.initSecret() puts an object in application scope",
object == null);
- assertTrue("Making sure StateUtils.initSecret() is creating a SecretKey",
+ Assert.assertTrue("Making sure StateUtils.initSecret() is creating a SecretKey",
object instanceof SecretKey);
}
diff --git a/impl/src/test/java/org/apache/myfaces/application/viewstate/SecretKeyConfigurationTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/SecretKeyConfigurationTest.java
index ac5d8a0..67d8987 100644
--- a/impl/src/test/java/org/apache/myfaces/application/viewstate/SecretKeyConfigurationTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/SecretKeyConfigurationTest.java
@@ -13,20 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.myfaces.application.viewstate;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
+import org.junit.Assert;
import org.junit.Test;
public class SecretKeyConfigurationTest extends AbstractJsfTestCase
{
- public SecretKeyConfigurationTest(String name)
- {
- super(name);
- }
-
@Override
public void setUp() throws Exception
{
@@ -41,7 +35,7 @@
try{
StateUtils.encrypt("serialized objects".getBytes(), externalContext);
- fail("An exception should be thrown if there" +
+ Assert.fail("An exception should be thrown if there" +
" is no SecretKey in application scope and cacheing is enabled ");
}catch(Exception e){
}
@@ -56,7 +50,7 @@
try{
StateUtils.encrypt("serialized objects".getBytes(), externalContext);
- fail("An exception should be thrown if there" +
+ Assert.fail("An exception should be thrown if there" +
" is no SecretKey in application scope and cacheing is enabled ");
}catch(Exception cce){
}
@@ -78,7 +72,7 @@
}
}
- assertTrue("An exception should be thrown if there" +
+ Assert.assertTrue("An exception should be thrown if there" +
" is no SecretKey in application scope and cacheing is enabled ", npeThrown);
}
@@ -90,7 +84,7 @@
try{
StateUtils.decrypt("serialized objects".getBytes(), externalContext);
- fail("An exception should be thrown if there" +
+ Assert.fail("An exception should be thrown if there" +
" is no SecretKey in application scope and cacheing is enabled ");
}catch(Exception cce){
}
diff --git a/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsAES_CBCTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsAES_CBCTest.java
index 55a442f..de3b0a6 100644
--- a/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsAES_CBCTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsAES_CBCTest.java
@@ -32,16 +32,6 @@
public class StateUtilsAES_CBCTest extends AbstractStateUtilsTest
{
-
- public StateUtilsAES_CBCTest(String name) {
- super(name);
- }
-
- // No longer necessary using junit 4 to run tests
- //public static Test suite() {
- // return null; // keep this method or maven won't run it
- //}
-
public void setUp() throws Exception
{
super.setUp();
diff --git a/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsBlowfish_ECBTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsBlowfish_ECBTest.java
index 6f1cc1a..2e1fc68 100644
--- a/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsBlowfish_ECBTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsBlowfish_ECBTest.java
@@ -30,16 +30,6 @@
public class StateUtilsBlowfish_ECBTest extends AbstractStateUtilsTest
{
-
- public StateUtilsBlowfish_ECBTest(String name) {
- super(name);
- }
-
- // No longer necessary using junit 4 to run tests
- //public static Test suite() {
- // return null; // keep this method or maven won't run it
- //}
-
public void setUp() throws Exception
{
super.setUp();
diff --git a/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsDefaultTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsDefaultTest.java
index f49b089..07f4be5 100644
--- a/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsDefaultTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsDefaultTest.java
@@ -24,16 +24,6 @@
public class StateUtilsDefaultTest extends AbstractStateUtilsTest
{
-
- public StateUtilsDefaultTest(String name) {
- super(name);
- }
-
- // No longer necessary using junit 4 to run tests
- //public static Test suite() {
- // return null; // keep this method or maven won't run it
- //}
-
public void setUp() throws Exception
{
super.setUp();
diff --git a/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsTripleDES_ECBTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsTripleDES_ECBTest.java
index e12e838..eddd9f3 100644
--- a/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsTripleDES_ECBTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsTripleDES_ECBTest.java
@@ -30,16 +30,6 @@
public class StateUtilsTripleDES_ECBTest extends AbstractStateUtilsTest
{
-
- public StateUtilsTripleDES_ECBTest(String name) {
- super(name);
- }
-
- // No longer necessary using junit 4 to run tests
- //public static Test suite() {
- // return null; // keep this method or maven won't run it
- //}
-
public void setUp() throws Exception
{
super.setUp();
diff --git a/impl/src/test/java/org/apache/myfaces/config/ConfigFilesXmlValidationUtilsTestCase.java b/impl/src/test/java/org/apache/myfaces/config/ConfigFilesXmlValidationUtilsTestCase.java
index 7f168be..fb36469 100644
--- a/impl/src/test/java/org/apache/myfaces/config/ConfigFilesXmlValidationUtilsTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/config/ConfigFilesXmlValidationUtilsTestCase.java
@@ -21,6 +21,7 @@
import java.net.URL;
import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
+import org.junit.Assert;
import org.junit.Test;
import org.xml.sax.SAXException;
@@ -47,12 +48,20 @@
url , externalContext, ConfigFilesXmlValidationUtils.getFacesConfigVersion(url));
}
- @Test(expected = SAXException.class)
+ @Test
public void testJSFInvalidConfig1() throws Exception
{
- URL url = getClass().getResource("invalid-config_1.xml");
- ConfigFilesXmlValidationUtils.validateFacesConfigFile(
- url , externalContext, ConfigFilesXmlValidationUtils.getFacesConfigVersion(url));
+ try
+ {
+ URL url = getClass().getResource("invalid-config_1.xml");
+ ConfigFilesXmlValidationUtils.validateFacesConfigFile(
+ url , externalContext, ConfigFilesXmlValidationUtils.getFacesConfigVersion(url));
+ Assert.fail();
+ }
+ catch (SAXException e)
+ {
+ // expected
+ }
}
/*
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 f4937de..17f5af6 100644
--- a/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java
@@ -25,20 +25,15 @@
import org.apache.myfaces.config.impl.FacesConfigDispenserImpl;
import org.apache.myfaces.config.impl.FacesConfigUnmarshallerImpl;
import org.apache.myfaces.config.impl.element.FacesConfigImpl;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
+import org.junit.Assert;
public class FacesConfigValidatorTestCase extends AbstractJsfTestCase
{
-
private FacesConfigDispenser dispenser;
private FacesConfigUnmarshaller<FacesConfigImpl> unmarshaller;
-
- public FacesConfigValidatorTestCase(String name)
- {
- super(name);
- }
-
- protected void setUp() throws Exception
+
+ public void setUp() throws Exception
{
super.setUp();
@@ -65,7 +60,7 @@
int expected = 2;
- assertTrue(list.size() + " should equal " + expected, list.size() == expected);
+ Assert.assertTrue(list.size() + " should equal " + expected, list.size() == expected);
}
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 e1149fa..35402f6 100644
--- a/impl/src/test/java/org/apache/myfaces/config/LogMetaInfUtilsTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/config/LogMetaInfUtilsTestCase.java
@@ -19,21 +19,16 @@
package org.apache.myfaces.config;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import java.net.URL;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.junit.Assert;
public class LogMetaInfUtilsTestCase extends AbstractJsfTestCase
{
-
- public LogMetaInfUtilsTestCase(String name)
- {
- super(name);
- }
-
public void testVersionNumber() throws Exception
{
@@ -55,27 +50,27 @@
LogMetaInfUtils.addJarInfo(libs, new URL("file:/opt/project/tobago/tobago-example/tobago-example-demo/target/tobago-example-demo/WEB-INF/lib/slf4j-log4j12-1.6.1.jar"));
final List<LogMetaInfUtils.JarInfo> mf = libs.get("myfaces-api");
- assertEquals(2, mf.size());
- assertEquals("1.2.11-SNAPSHOT", mf.get(0).getVersion());
- assertEquals("2", mf.get(1).getVersion());
+ Assert.assertEquals(2, mf.size());
+ Assert.assertEquals("1.2.11-SNAPSHOT", mf.get(0).getVersion());
+ Assert.assertEquals("2", mf.get(1).getVersion());
final List<LogMetaInfUtils.JarInfo> tk12 = libs.get("tomahawk12");
- assertEquals(1, tk12.size());
- assertEquals("1.1.10-SNAPSHOT", tk12.get(0).getVersion());
+ Assert.assertEquals(1, tk12.size());
+ Assert.assertEquals("1.1.10-SNAPSHOT", tk12.get(0).getVersion());
final List<LogMetaInfUtils.JarInfo> tksb = libs.get("tomahawk-sandbox12");
- assertEquals(1, tksb.size());
- assertEquals("1.1.10", tksb.get(0).getVersion());
+ Assert.assertEquals(1, tksb.size());
+ Assert.assertEquals("1.1.10", tksb.get(0).getVersion());
final List<LogMetaInfUtils.JarInfo> tobago = libs.get("tobago-core");
- assertEquals(2, tobago.size());
- assertEquals("1.5.0-alpha-3-SNAPSHOT", tobago.get(0).getVersion());
- assertEquals("1.0.35", tobago.get(1).getVersion());
+ Assert.assertEquals(2, tobago.size());
+ Assert.assertEquals("1.5.0-alpha-3-SNAPSHOT", tobago.get(0).getVersion());
+ Assert.assertEquals("1.0.35", tobago.get(1).getVersion());
final List<LogMetaInfUtils.JarInfo> other = libs.get("other");
- assertNull(other);
+ Assert.assertNull(other);
final List<LogMetaInfUtils.JarInfo> slf = libs.get("slf4j-log4j12");
- assertNull(slf);
+ Assert.assertNull(slf);
}
}
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 f9802a9..83f87a8 100644
--- a/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java
+++ b/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java
@@ -21,7 +21,7 @@
import org.apache.myfaces.config.impl.element.ConfigOthersSlotImpl;
import org.apache.myfaces.config.impl.element.FacesConfigNameSlotImpl;
import org.apache.myfaces.config.impl.element.OrderingImpl;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import javax.faces.FacesException;
import java.util.ArrayList;
@@ -30,19 +30,16 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.myfaces.config.impl.FacesConfigUnmarshallerImpl;
+import org.junit.Assert;
public class OrderingFacesConfigTest extends AbstractJsfTestCase
{
private static final Logger log = Logger.getLogger(OrderingFacesConfigTest.class.getName());
private FacesConfigUnmarshallerImpl _impl;
+
- public OrderingFacesConfigTest(String name)
- {
- super(name);
- }
-
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
_impl = new FacesConfigUnmarshallerImpl(null);
@@ -443,7 +440,7 @@
Collections.shuffle(appConfigResources);
List<FacesConfig> sortedList = applyFullAlgorithm(appConfigResources);
- assertEquals(cfgC, sortedList.get(0));
+ Assert.assertEquals(cfgC, sortedList.get(0));
}
}
@@ -473,7 +470,7 @@
Collections.shuffle(appConfigResources);
List<FacesConfig> sortedList = applyFullAlgorithm(appConfigResources);
- assertEquals(cfgC, sortedList.get(sortedList.size()-1));
+ Assert.assertEquals(cfgC, sortedList.get(sortedList.size()-1));
}
}
@@ -516,9 +513,9 @@
Collections.shuffle(appConfigResources);
List<FacesConfig> sortedList = applyFullAlgorithm(appConfigResources);
- assertEquals(cfg3, sortedList.get(0));
+ Assert.assertEquals(cfg3, sortedList.get(0));
- assertEquals(cfg6, sortedList.get(sortedList.size()-1));
+ Assert.assertEquals(cfg6, sortedList.get(sortedList.size()-1));
}
}
@@ -880,7 +877,7 @@
//printFacesConfigList("Sorted-List: [", sortedResources);
- assertTrue(sortedResources.containsAll(appConfigResources));
+ Assert.assertTrue(sortedResources.containsAll(appConfigResources));
appConfigResources = new ArrayList<FacesConfig>();
appConfigResources.add(cfgOWB);
@@ -892,7 +889,7 @@
//printFacesConfigList("Sorted-List: [", sortedResources);
- assertTrue(sortedResources.containsAll(appConfigResources));
+ Assert.assertTrue(sortedResources.containsAll(appConfigResources));
}
diff --git a/impl/src/test/java/org/apache/myfaces/config/impl/digister/FacesConfigUnmarshallerImplTest.java b/impl/src/test/java/org/apache/myfaces/config/impl/digister/FacesConfigUnmarshallerImplTest.java
index 5afa10c..940da9f 100644
--- a/impl/src/test/java/org/apache/myfaces/config/impl/digister/FacesConfigUnmarshallerImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/config/impl/digister/FacesConfigUnmarshallerImplTest.java
@@ -27,6 +27,7 @@
import org.apache.myfaces.config.element.LocaleConfig;
import org.apache.myfaces.config.element.OrderSlot;
import org.apache.myfaces.config.impl.element.ConfigOthersSlotImpl;
+import org.junit.Assert;
/**
* @author Mathias Broekelmann (latest modification by $Author$)
@@ -36,7 +37,7 @@
{
private FacesConfigUnmarshallerImpl _impl;
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
_impl = new FacesConfigUnmarshallerImpl(null);
}
@@ -45,53 +46,53 @@
{
FacesConfig cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
"empty-config.xml"), "empty-config.xml");
- assertNotNull(cfg);
- assertTrue(cfg.getApplications().isEmpty());
- assertTrue(cfg.getComponents().isEmpty());
- assertTrue(cfg.getConverters().isEmpty());
- assertTrue(cfg.getFactories().isEmpty());
- assertTrue(cfg.getLifecyclePhaseListener().isEmpty());
- assertTrue(cfg.getNavigationRules().isEmpty());
- assertTrue(cfg.getRenderKits().isEmpty());
- assertTrue(cfg.getValidators().isEmpty());
+ Assert.assertNotNull(cfg);
+ Assert.assertTrue(cfg.getApplications().isEmpty());
+ Assert.assertTrue(cfg.getComponents().isEmpty());
+ Assert.assertTrue(cfg.getConverters().isEmpty());
+ Assert.assertTrue(cfg.getFactories().isEmpty());
+ Assert.assertTrue(cfg.getLifecyclePhaseListener().isEmpty());
+ Assert.assertTrue(cfg.getNavigationRules().isEmpty());
+ Assert.assertTrue(cfg.getRenderKits().isEmpty());
+ Assert.assertTrue(cfg.getValidators().isEmpty());
}
public void testApplicationConfig() throws Exception
{
FacesConfig cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
"application-config.xml"), "application-config.xml");
- assertNotNull(cfg);
- assertEquals(1, cfg.getApplications().size());
+ Assert.assertNotNull(cfg);
+ Assert.assertEquals(1, cfg.getApplications().size());
Application app = cfg.getApplications().get(0);
- assertEquals(2, app.getActionListener().size());
- assertEquals("action-listener1", app.getActionListener().get(0));
- assertEquals("action-listener2", app.getActionListener().get(1));
- assertEquals(1, app.getDefaultRenderkitId().size());
- assertEquals("default-render-kit-id", app.getDefaultRenderkitId()
+ Assert.assertEquals(2, app.getActionListener().size());
+ Assert.assertEquals("action-listener1", app.getActionListener().get(0));
+ Assert.assertEquals("action-listener2", app.getActionListener().get(1));
+ Assert.assertEquals(1, app.getDefaultRenderkitId().size());
+ Assert.assertEquals("default-render-kit-id", app.getDefaultRenderkitId()
.get(0));
assertLocaleConfig(app.getLocaleConfig());
- assertEquals(1, app.getMessageBundle().size());
- assertEquals("message-bundle", app.getMessageBundle().get(0));
- assertEquals(1, app.getNavigationHandler().size());
- assertEquals("navigation-handler", app.getNavigationHandler().get(0));
- assertEquals(1, app.getPropertyResolver().size());
- assertEquals("property-resolver", app.getPropertyResolver().get(0));
+ Assert.assertEquals(1, app.getMessageBundle().size());
+ Assert.assertEquals("message-bundle", app.getMessageBundle().get(0));
+ Assert.assertEquals(1, app.getNavigationHandler().size());
+ Assert.assertEquals("navigation-handler", app.getNavigationHandler().get(0));
+ Assert.assertEquals(1, app.getPropertyResolver().size());
+ Assert.assertEquals("property-resolver", app.getPropertyResolver().get(0));
- assertEquals(1, app.getStateManager().size());
- assertEquals("state-manager", app.getStateManager().get(0));
+ Assert.assertEquals(1, app.getStateManager().size());
+ Assert.assertEquals("state-manager", app.getStateManager().get(0));
- assertEquals(1, app.getVariableResolver().size());
- assertEquals("variable-resolver", app.getVariableResolver().get(0));
+ Assert.assertEquals(1, app.getVariableResolver().size());
+ Assert.assertEquals("variable-resolver", app.getVariableResolver().get(0));
- assertEquals(1, app.getViewHandler().size());
- assertEquals("view-handler", app.getViewHandler().get(0));
+ Assert.assertEquals(1, app.getViewHandler().size());
+ Assert.assertEquals("view-handler", app.getViewHandler().get(0));
- assertEquals(1, app.getElResolver().size());
- assertEquals("el-resolver", app.getElResolver().get(0));
+ Assert.assertEquals(1, app.getElResolver().size());
+ Assert.assertEquals("el-resolver", app.getElResolver().get(0));
- assertEquals(1, app.getResourceBundle().size());
- assertEquals("base-name", app.getResourceBundle().get(0).getBaseName());
- assertEquals("var", app.getResourceBundle().get(0).getVar());
+ Assert.assertEquals(1, app.getResourceBundle().size());
+ Assert.assertEquals("base-name", app.getResourceBundle().get(0).getBaseName());
+ Assert.assertEquals("var", app.getResourceBundle().get(0).getVar());
}
/**
@@ -99,62 +100,62 @@
*/
private void assertLocaleConfig(List<LocaleConfig> localeConfig)
{
- assertEquals(1, localeConfig.size());
+ Assert.assertEquals(1, localeConfig.size());
LocaleConfig cfg = localeConfig.get(0);
- assertEquals("aa", cfg.getDefaultLocale());
- assertEquals(2, cfg.getSupportedLocales().size());
- assertEquals("aa", cfg.getSupportedLocales().get(0));
- assertEquals("bb", cfg.getSupportedLocales().get(1));
+ Assert.assertEquals("aa", cfg.getDefaultLocale());
+ Assert.assertEquals(2, cfg.getSupportedLocales().size());
+ Assert.assertEquals("aa", cfg.getSupportedLocales().get(0));
+ Assert.assertEquals("bb", cfg.getSupportedLocales().get(1));
}
public void testAbsoluteOrderingConfig() throws Exception
{
FacesConfig cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
"absolute-ordering-config.xml"), "absolute-ordering-config.xml");
- assertNotNull(cfg);
- assertEquals("true", cfg.getMetadataComplete());
- assertEquals("a",cfg.getName());
+ Assert.assertNotNull(cfg);
+ Assert.assertEquals("true", cfg.getMetadataComplete());
+ Assert.assertEquals("a",cfg.getName());
List<OrderSlot> orderList = cfg.getAbsoluteOrdering().getOrderList();
- assertEquals("b", ((FacesConfigNameSlot) orderList.get(0)).getName());
- assertEquals("c", ((FacesConfigNameSlot) orderList.get(1)).getName());
- assertEquals(ConfigOthersSlotImpl.class, orderList.get(2).getClass());
- assertEquals("d", ((FacesConfigNameSlot) orderList.get(3)).getName());
+ Assert.assertEquals("b", ((FacesConfigNameSlot) orderList.get(0)).getName());
+ Assert.assertEquals("c", ((FacesConfigNameSlot) orderList.get(1)).getName());
+ Assert.assertEquals(ConfigOthersSlotImpl.class, orderList.get(2).getClass());
+ Assert.assertEquals("d", ((FacesConfigNameSlot) orderList.get(3)).getName());
- assertTrue(cfg.getApplications().isEmpty());
- assertTrue(cfg.getComponents().isEmpty());
- assertTrue(cfg.getConverters().isEmpty());
- assertTrue(cfg.getFactories().isEmpty());
- assertTrue(cfg.getLifecyclePhaseListener().isEmpty());
- assertTrue(cfg.getNavigationRules().isEmpty());
- assertTrue(cfg.getRenderKits().isEmpty());
- assertTrue(cfg.getValidators().isEmpty());
+ Assert.assertTrue(cfg.getApplications().isEmpty());
+ Assert.assertTrue(cfg.getComponents().isEmpty());
+ Assert.assertTrue(cfg.getConverters().isEmpty());
+ Assert.assertTrue(cfg.getFactories().isEmpty());
+ Assert.assertTrue(cfg.getLifecyclePhaseListener().isEmpty());
+ Assert.assertTrue(cfg.getNavigationRules().isEmpty());
+ Assert.assertTrue(cfg.getRenderKits().isEmpty());
+ Assert.assertTrue(cfg.getValidators().isEmpty());
}
public void testOrderingConfig() throws Exception
{
FacesConfig cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
"ordering-config.xml"), "ordering-config.xml");
- assertNotNull(cfg);
- assertEquals("a",cfg.getName());
+ Assert.assertNotNull(cfg);
+ Assert.assertEquals("a",cfg.getName());
List<OrderSlot> orderList = cfg.getOrdering().getBeforeList();
- assertEquals("b", ((FacesConfigNameSlot) orderList.get(0)).getName());
- assertEquals("c", ((FacesConfigNameSlot) orderList.get(1)).getName());
- assertEquals(org.apache.myfaces.config.impl.element.ConfigOthersSlotImpl.class, orderList.get(2).getClass());
+ Assert.assertEquals("b", ((FacesConfigNameSlot) orderList.get(0)).getName());
+ Assert.assertEquals("c", ((FacesConfigNameSlot) orderList.get(1)).getName());
+ Assert.assertEquals(org.apache.myfaces.config.impl.element.ConfigOthersSlotImpl.class, orderList.get(2).getClass());
orderList = cfg.getOrdering().getAfterList();
- assertEquals("d", ((FacesConfigNameSlot) orderList.get(0)).getName());
+ Assert.assertEquals("d", ((FacesConfigNameSlot) orderList.get(0)).getName());
- assertTrue(cfg.getApplications().isEmpty());
- assertTrue(cfg.getComponents().isEmpty());
- assertTrue(cfg.getConverters().isEmpty());
- assertTrue(cfg.getFactories().isEmpty());
- assertTrue(cfg.getLifecyclePhaseListener().isEmpty());
- assertTrue(cfg.getNavigationRules().isEmpty());
- assertTrue(cfg.getRenderKits().isEmpty());
- assertTrue(cfg.getValidators().isEmpty());
+ Assert.assertTrue(cfg.getApplications().isEmpty());
+ Assert.assertTrue(cfg.getComponents().isEmpty());
+ Assert.assertTrue(cfg.getConverters().isEmpty());
+ Assert.assertTrue(cfg.getFactories().isEmpty());
+ Assert.assertTrue(cfg.getLifecyclePhaseListener().isEmpty());
+ Assert.assertTrue(cfg.getNavigationRules().isEmpty());
+ Assert.assertTrue(cfg.getRenderKits().isEmpty());
+ Assert.assertTrue(cfg.getValidators().isEmpty());
}
public void testFacesFlowConfig() throws Exception
@@ -162,68 +163,68 @@
FacesConfig cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
"faces-flow.xml"), "faces-flow.xml");
- assertNotNull(cfg);
- assertEquals(1, cfg.getFacesFlowDefinitions().size());
+ Assert.assertNotNull(cfg);
+ Assert.assertEquals(1, cfg.getFacesFlowDefinitions().size());
FacesFlowDefinition facesFlowDefinition = cfg.getFacesFlowDefinitions().get(0);
- assertEquals("flow1", facesFlowDefinition.getId());
- assertEquals("node1", facesFlowDefinition.getStartNode());
- assertEquals("#{flowBean.init}", facesFlowDefinition.getInitializer());
- assertEquals("#{flowBean.finalize}", facesFlowDefinition.getFinalizer());
+ Assert.assertEquals("flow1", facesFlowDefinition.getId());
+ Assert.assertEquals("node1", facesFlowDefinition.getStartNode());
+ Assert.assertEquals("#{flowBean.init}", facesFlowDefinition.getInitializer());
+ Assert.assertEquals("#{flowBean.finalize}", facesFlowDefinition.getFinalizer());
//view
- assertEquals(1, facesFlowDefinition.getViewList().size());
+ Assert.assertEquals(1, facesFlowDefinition.getViewList().size());
FacesFlowView facesFlowView = facesFlowDefinition.getViewList().get(0);
- assertEquals("outcome2", facesFlowView.getId());
- assertEquals("outcome-to-2.xhtml", facesFlowView.getVdlDocument());
+ Assert.assertEquals("outcome2", facesFlowView.getId());
+ Assert.assertEquals("outcome-to-2.xhtml", facesFlowView.getVdlDocument());
//switch
- assertEquals(1, facesFlowDefinition.getSwitchList().size());
+ Assert.assertEquals(1, facesFlowDefinition.getSwitchList().size());
FacesFlowSwitch facesFlowSwitch = facesFlowDefinition.getSwitchList().get(0);
- assertEquals("switch1", facesFlowSwitch.getId());
- assertEquals("outcome2", facesFlowSwitch.getDefaultOutcome().getFromOutcome());
+ Assert.assertEquals("switch1", facesFlowSwitch.getId());
+ Assert.assertEquals("outcome2", facesFlowSwitch.getDefaultOutcome().getFromOutcome());
NavigationCase swNavigationCase = facesFlowSwitch.getNavigationCaseList().get(0);
- assertEquals("#{flowBean.token > 0}", swNavigationCase.getIf());
- assertEquals("outcome2", swNavigationCase.getFromOutcome());
+ Assert.assertEquals("#{flowBean.token > 0}", swNavigationCase.getIf());
+ Assert.assertEquals("outcome2", swNavigationCase.getFromOutcome());
//flow return
- assertEquals(1, facesFlowDefinition.getReturnList().size());
+ Assert.assertEquals(1, facesFlowDefinition.getReturnList().size());
FacesFlowReturn facesFlowReturn = facesFlowDefinition.getReturnList().get(0);
- assertEquals("flowReturn1", facesFlowReturn.getId());
- assertEquals("/outcome1", facesFlowReturn.getNavigationCase().getFromOutcome());
+ Assert.assertEquals("flowReturn1", facesFlowReturn.getId());
+ Assert.assertEquals("/outcome1", facesFlowReturn.getNavigationCase().getFromOutcome());
//navigation rule
- assertEquals(1, facesFlowDefinition.getNavigationRuleList().size());
+ Assert.assertEquals(1, facesFlowDefinition.getNavigationRuleList().size());
NavigationRule navigationRule = facesFlowDefinition.getNavigationRuleList().get(0);
- assertEquals("/x.xhtml", navigationRule.getFromViewId());
- assertEquals(1, navigationRule.getNavigationCases().size());
+ Assert.assertEquals("/x.xhtml", navigationRule.getFromViewId());
+ Assert.assertEquals(1, navigationRule.getNavigationCases().size());
NavigationCase navigationCase = navigationRule.getNavigationCases().get(0);
- assertEquals("go", navigationCase.getFromOutcome());
- assertEquals("#{test.true}", navigationCase.getIf());
- assertEquals("/y.xhtml", navigationCase.getToViewId());
+ Assert.assertEquals("go", navigationCase.getFromOutcome());
+ Assert.assertEquals("#{test.true}", navigationCase.getIf());
+ Assert.assertEquals("/y.xhtml", navigationCase.getToViewId());
//flow call
- assertEquals(1, facesFlowDefinition.getFlowCallList().size());
+ Assert.assertEquals(1, facesFlowDefinition.getFlowCallList().size());
FacesFlowCall facesFlowCall = facesFlowDefinition.getFlowCallList().get(0);
- assertEquals("flowCall", facesFlowCall.getId());
- assertEquals("flow2", facesFlowCall.getFlowReference().getFlowId());
- assertEquals(1, facesFlowCall.getOutboundParameterList().size());
+ Assert.assertEquals("flowCall", facesFlowCall.getId());
+ Assert.assertEquals("flow2", facesFlowCall.getFlowReference().getFlowId());
+ Assert.assertEquals(1, facesFlowCall.getOutboundParameterList().size());
FacesFlowParameter facesFlowOutboundParameter = facesFlowCall.getOutboundParameterList().get(0);
- assertEquals("name1", facesFlowOutboundParameter.getName());
- assertEquals("value1", facesFlowOutboundParameter.getValue());
+ Assert.assertEquals("name1", facesFlowOutboundParameter.getName());
+ Assert.assertEquals("value1", facesFlowOutboundParameter.getValue());
//method call
- assertEquals(1, facesFlowDefinition.getMethodCallList().size());
+ Assert.assertEquals(1, facesFlowDefinition.getMethodCallList().size());
FacesFlowMethodCall facesFlowMethodCall = facesFlowDefinition.getMethodCallList().get(0);
- assertEquals("method1", facesFlowMethodCall.getId());
- assertEquals("#{flowBean.doSomething}", facesFlowMethodCall.getMethod());
- assertEquals("outcome2", facesFlowMethodCall.getDefaultOutcome());
+ Assert.assertEquals("method1", facesFlowMethodCall.getId());
+ Assert.assertEquals("#{flowBean.doSomething}", facesFlowMethodCall.getMethod());
+ Assert.assertEquals("outcome2", facesFlowMethodCall.getDefaultOutcome());
//inbound param
- assertEquals(1, facesFlowDefinition.getInboundParameterList().size());
+ Assert.assertEquals(1, facesFlowDefinition.getInboundParameterList().size());
FacesFlowParameter facesFlowParameter = facesFlowDefinition.getInboundParameterList().get(0);
- assertEquals("name1", facesFlowParameter.getName());
- assertEquals("value1", facesFlowParameter.getValue());*/
+ Assert.assertEquals("name1", facesFlowParameter.getName());
+ Assert.assertEquals("value1", facesFlowParameter.getValue());*/
}
public void testCsrf() throws Exception
@@ -231,10 +232,10 @@
FacesConfig cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
"csrf-and-contracts.xml"), "csrf-and-contracts.xml");
- assertNotNull(cfg);
- assertEquals(2, cfg.getProtectedViewsUrlPatternList().size());
- assertEquals("/files/*.xhtml", cfg.getProtectedViewsUrlPatternList().get(0));
- assertEquals("/files2/*.xhtml", cfg.getProtectedViewsUrlPatternList().get(1));
+ Assert.assertNotNull(cfg);
+ Assert.assertEquals(2, cfg.getProtectedViewsUrlPatternList().size());
+ Assert.assertEquals("/files/*.xhtml", cfg.getProtectedViewsUrlPatternList().get(0));
+ Assert.assertEquals("/files2/*.xhtml", cfg.getProtectedViewsUrlPatternList().get(1));
}
@@ -244,15 +245,15 @@
FacesConfig cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
"csrf-and-contracts.xml"), "csrf-and-contracts.xml");
- assertNotNull(cfg);
+ Assert.assertNotNull(cfg);
Application app = cfg.getApplications().get(0);
- assertNotNull(app);
- assertEquals(1, app.getResourceLibraryContractMappings().size());
+ Assert.assertNotNull(app);
+ Assert.assertEquals(1, app.getResourceLibraryContractMappings().size());
ContractMapping mapping = app.getResourceLibraryContractMappings().get(0);
- assertEquals("/files/*.xhtml", mapping.getUrlPatternList().get(0));
- assertEquals("contractA contractB", mapping.getContractList().get(0));
+ Assert.assertEquals("/files/*.xhtml", mapping.getUrlPatternList().get(0));
+ Assert.assertEquals("contractA contractB", mapping.getContractList().get(0));
}
public void testContracts2() throws Exception
@@ -260,16 +261,16 @@
FacesConfig cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
"contracts2.xml"), "contracts2.xml");
- assertNotNull(cfg);
+ Assert.assertNotNull(cfg);
Application app = cfg.getApplications().get(0);
- assertNotNull(app);
- assertEquals(1, app.getResourceLibraryContractMappings().size());
+ Assert.assertNotNull(app);
+ Assert.assertEquals(1, app.getResourceLibraryContractMappings().size());
ContractMapping mapping = app.getResourceLibraryContractMappings().get(0);
- assertTrue(mapping.getUrlPatternList().contains("/files/*.xhtml"));
- assertTrue(mapping.getUrlPatternList().contains("/files2/*.xhtml"));
- assertTrue(mapping.getContractList().contains("contractA"));
- assertTrue(mapping.getContractList().contains("contractB"));
+ Assert.assertTrue(mapping.getUrlPatternList().contains("/files/*.xhtml"));
+ Assert.assertTrue(mapping.getUrlPatternList().contains("/files2/*.xhtml"));
+ Assert.assertTrue(mapping.getContractList().contains("contractA"));
+ Assert.assertTrue(mapping.getContractList().contains("contractB"));
}
}
diff --git a/impl/src/test/java/org/apache/myfaces/context/ContextRegexpTest.java b/impl/src/test/java/org/apache/myfaces/context/ContextRegexpTest.java
index a2d34c6..d586841 100644
--- a/impl/src/test/java/org/apache/myfaces/context/ContextRegexpTest.java
+++ b/impl/src/test/java/org/apache/myfaces/context/ContextRegexpTest.java
@@ -16,6 +16,7 @@
package org.apache.myfaces.context;
import junit.framework.TestCase;
+import org.junit.Assert;
/**
* Regular Expression tests used within the faces context submodules
@@ -41,10 +42,10 @@
if(len > 0) {//all others trimmed by the re
splitted[len] = splitted[len].trim();
}
- assertTrue("length assertion", splitted.length == 3);
- assertTrue(splitted[0].trim().equals("hello"));
- assertTrue(splitted[1].trim().equals("world"));
- assertTrue(splitted[2].trim().equals("bla"));
+ Assert.assertTrue("length assertion", splitted.length == 3);
+ Assert.assertTrue(splitted[0].trim().equals("hello"));
+ Assert.assertTrue(splitted[1].trim().equals("world"));
+ Assert.assertTrue(splitted[2].trim().equals("bla"));
}
/**
@@ -53,8 +54,8 @@
*/
public void testCondition2() {
String[] splitted = " ".split(RE_SPLITTER);
- assertTrue(splitted.length == 1);
- assertTrue(splitted[0] != null);
+ Assert.assertTrue(splitted.length == 1);
+ Assert.assertTrue(splitted[0] != null);
}
/**
@@ -63,7 +64,7 @@
*/
public void testCondition3() {
String[] splitted = "".split(RE_SPLITTER);
- assertTrue(splitted.length == 1);
- assertTrue(splitted[0] != null);
+ Assert.assertTrue(splitted.length == 1);
+ Assert.assertTrue(splitted[0] != null);
}
}
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 bf433b6..ffe806a 100644
--- a/impl/src/test/java/org/apache/myfaces/context/ExecutePhaseClientIdsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/context/ExecutePhaseClientIdsTest.java
@@ -24,7 +24,8 @@
import javax.faces.context.PartialViewContext;
import org.apache.myfaces.context.servlet.FacesContextImpl;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
+import org.junit.Assert;
/**
*
@@ -32,12 +33,9 @@
* @version $Revision$ $Date$
*/
public class ExecutePhaseClientIdsTest extends AbstractJsfTestCase {
- public ExecutePhaseClientIdsTest() {
- super("ExecutePhaseClientIdsTest");
- }
-
+
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
FactoryFinder.setFactory(FactoryFinder.PARTIAL_VIEW_CONTEXT_FACTORY,
"org.apache.myfaces.context.PartialViewContextFactoryImpl");
@@ -59,7 +57,7 @@
PartialViewContext pprContext = context.getPartialViewContext();
- assertTrue(pprContext.getExecuteIds().isEmpty());
+ Assert.assertTrue(pprContext.getExecuteIds().isEmpty());
}
/**
@@ -73,7 +71,7 @@
PartialViewContext pprContext = context.getPartialViewContext();
- assertTrue(pprContext.getExecuteIds().isEmpty());
+ Assert.assertTrue(pprContext.getExecuteIds().isEmpty());
}
/**
@@ -90,7 +88,7 @@
PartialViewContext pprContext = context.getPartialViewContext();
- assertTrue(pprContext.getExecuteIds().isEmpty());
+ Assert.assertTrue(pprContext.getExecuteIds().isEmpty());
}*/
/**
@@ -106,8 +104,8 @@
PartialViewContext pprContext = context.getPartialViewContext();
- assertTrue("Length must be one",pprContext.getExecuteIds().size() == 1);
- assertTrue("Value match", pprContext.getExecuteIds().iterator().next().equals("view1:panel1:_component1"));
+ Assert.assertTrue("Length must be one",pprContext.getExecuteIds().size() == 1);
+ Assert.assertTrue("Value match", pprContext.getExecuteIds().iterator().next().equals("view1:panel1:_component1"));
}
/**
@@ -124,13 +122,13 @@
PartialViewContext pprContext = context.getPartialViewContext();
- assertTrue("Length must be four", pprContext.getExecuteIds().size() == 4);
+ Assert.assertTrue("Length must be four", pprContext.getExecuteIds().size() == 4);
// FIXME: Latest spec uses a Collection so order is not garanteed
-// assertTrue("Value match", pprContext.getExecuteIds().get(0).equals("view1:panel1:_component1"));
-// assertTrue("Value match", pprContext.getExecuteIds().get(2).equals("component3"));
+// Assert.assertTrue("Value match", pprContext.getExecuteIds().get(0).equals("view1:panel1:_component1"));
+// Assert.assertTrue("Value match", pprContext.getExecuteIds().get(2).equals("component3"));
//
//
-// assertTrue("Value match", pprContext.getExecuteIds().get(3).equals("component4"));
+// Assert.assertTrue("Value match", pprContext.getExecuteIds().get(3).equals("component4"));
}
}
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 252e744..e2b3784 100644
--- a/impl/src/test/java/org/apache/myfaces/context/IsRenderedTest.java
+++ b/impl/src/test/java/org/apache/myfaces/context/IsRenderedTest.java
@@ -20,7 +20,8 @@
import javax.faces.context.PartialViewContext;
import org.apache.myfaces.context.servlet.FacesContextImpl;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
+import org.junit.Assert;
/**
* Various tests for the faces context is rendered
@@ -31,12 +32,8 @@
*/
public class IsRenderedTest extends AbstractJsfTestCase {
- public IsRenderedTest() {
- super("IsRenderedTest");
- }
-
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
FactoryFinder.setFactory(FactoryFinder.PARTIAL_VIEW_CONTEXT_FACTORY,
"org.apache.myfaces.context.PartialViewContextFactoryImpl");
@@ -55,11 +52,11 @@
PartialViewContext pprContext = context.getPartialViewContext();
pprContext.setRenderAll(true);
- assertTrue("override should trigger no matter which condition we have", pprContext.isRenderAll());
+ Assert.assertTrue("override should trigger no matter which condition we have", pprContext.isRenderAll());
context = new FacesContextImpl(servletContext, request, response);
pprContext.setRenderAll(false);
- assertFalse("override should trigger no matter which condition we have", pprContext.isRenderAll());
+ Assert.assertFalse("override should trigger no matter which condition we have", pprContext.isRenderAll());
}
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 896047e..379a371 100644
--- a/impl/src/test/java/org/apache/myfaces/context/PartialResponseWriterImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/context/PartialResponseWriterImplTest.java
@@ -31,7 +31,8 @@
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.myfaces.renderkit.html.HtmlResponseWriterImpl;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
+import org.junit.Assert;
import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -55,16 +56,12 @@
private static final String STD_UPDATE_RESULT = "<changes><update id=\"blaId\"><![CDATA[testing]]></update>";
private static final String CORR_OUTPUT = "checking for correct output: ";
- public PartialResponseWriterImplTest() {
- super("PartialResponseWriterImplTest");
- }
-
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
_contentCollector = new StringWriter(100);
}
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
super.tearDown();
_contentCollector = null;
}
@@ -83,7 +80,7 @@
is2.setCharacterStream(new StringReader(output));
Document doc2 = db.parse(is2);
doc2.normalizeDocument();
- assertTrue(doc1.isEqualNode(doc2));
+ Assert.assertTrue(doc1.isEqualNode(doc2));
}
/**
@@ -139,7 +136,7 @@
checkOutput(new File(getLocalFile("nestedScriptCDATA.xml").toURI()), _contentCollector.toString());
} catch (IOException e) {
- fail(e.toString());
+ Assert.fail(e.toString());
}
}
@@ -153,9 +150,9 @@
// _writer.endCDATA();
_writer.flush();
_writer.close();
- assertTrue(CORR_OUTPUT, _contentCollector.toString().equals("testing"));
+ Assert.assertTrue(CORR_OUTPUT, _contentCollector.toString().equals("testing"));
} catch (IOException e) {
- fail(e.toString());
+ Assert.fail(e.toString());
}
}
@@ -169,9 +166,9 @@
// _writer.endCDATA();
_writer.flush();
_writer.close();
- assertTrue(CORR_OUTPUT, _contentCollector.toString().equals("<![CDATA[testing]]>"));
+ Assert.assertTrue(CORR_OUTPUT, _contentCollector.toString().equals("<![CDATA[testing]]>"));
} catch (IOException e) {
- fail(e.toString());
+ Assert.fail(e.toString());
}
}
@@ -185,9 +182,9 @@
_writer.endCDATA();
_writer.flush();
_writer.close();
- assertTrue(CORR_OUTPUT+ _contentCollector.toString(), _contentCollector.toString().equals("<![CDATA[<![CDATA[testing]]><![CDATA[]]]]><![CDATA[>]]>"));
+ Assert.assertTrue(CORR_OUTPUT+ _contentCollector.toString(), _contentCollector.toString().equals("<![CDATA[<![CDATA[testing]]><![CDATA[]]]]><![CDATA[>]]>"));
} catch (IOException e) {
- fail(e.toString());
+ Assert.fail(e.toString());
}
}
@@ -199,9 +196,9 @@
_writer.write("testing");
_writer.flush();
_writer.close();
- assertTrue(CORR_OUTPUT+ _contentCollector.toString(), _contentCollector.toString().equals("<![CDATA[<![CDATA[testing]]>"));
+ Assert.assertTrue(CORR_OUTPUT+ _contentCollector.toString(), _contentCollector.toString().equals("<![CDATA[<![CDATA[testing]]>"));
} catch (IOException e) {
- fail(e.toString());
+ Assert.fail(e.toString());
}
}
@@ -213,9 +210,9 @@
_writer.startUpdate("blaId");
_writer.write("testing");
_writer.endUpdate();
- assertTrue(CORR_OUTPUT, _contentCollector.toString().equals(STD_UPDATE_RESULT));
+ Assert.assertTrue(CORR_OUTPUT, _contentCollector.toString().equals(STD_UPDATE_RESULT));
} catch (IOException e) {
- fail(e.toString());
+ Assert.fail(e.toString());
}
}
@@ -227,9 +224,9 @@
_writer.write("testing");
_writer.endCDATA();
_writer.endUpdate();
- assertTrue(CORR_OUTPUT+_contentCollector.toString(), _contentCollector.toString().equals("<changes><update id=\"blaId\"><![CDATA[<![CDATA[testing]]><![CDATA[]]]]><![CDATA[>]]></update>"));
+ Assert.assertTrue(CORR_OUTPUT+_contentCollector.toString(), _contentCollector.toString().equals("<changes><update id=\"blaId\"><![CDATA[<![CDATA[testing]]><![CDATA[]]]]><![CDATA[>]]></update>"));
} catch (IOException e) {
- fail(e.toString());
+ Assert.fail(e.toString());
}
}
@@ -242,9 +239,9 @@
_writer.startCDATA();
_writer.write("testing");
_writer.endUpdate();
- assertTrue(CORR_OUTPUT+_contentCollector.toString(), _contentCollector.toString().equals("<changes><update id=\"blaId\"><![CDATA[<![CDATA[<![CDATA[testing]]></update>"));
+ Assert.assertTrue(CORR_OUTPUT+_contentCollector.toString(), _contentCollector.toString().equals("<changes><update id=\"blaId\"><![CDATA[<![CDATA[<![CDATA[testing]]></update>"));
} catch (IOException e) {
- fail(e.toString());
+ Assert.fail(e.toString());
}
}
@@ -254,9 +251,9 @@
_writer.startInsertAfter("blaId");
_writer.write("testing");
_writer.endInsert();
- assertTrue(CORR_OUTPUT, _contentCollector.toString().equals("<changes><insert><after id=\"blaId\"><![CDATA[testing]]></after></insert>"));
+ Assert.assertTrue(CORR_OUTPUT, _contentCollector.toString().equals("<changes><insert><after id=\"blaId\"><![CDATA[testing]]></after></insert>"));
} catch (IOException e) {
- fail(e.toString());
+ Assert.fail(e.toString());
}
}
@@ -266,9 +263,9 @@
_writer.startInsertBefore("blaId");
_writer.write("testing");
_writer.endInsert();
- assertTrue(CORR_OUTPUT, _contentCollector.toString().equals("<changes><insert><before id=\"blaId\"><![CDATA[testing]]></before></insert>"));
+ Assert.assertTrue(CORR_OUTPUT, _contentCollector.toString().equals("<changes><insert><before id=\"blaId\"><![CDATA[testing]]></before></insert>"));
} catch (IOException e) {
- fail(e.toString());
+ Assert.fail(e.toString());
}
}
@@ -281,9 +278,9 @@
_writer.writeAttribute("value","]]>", null);
_writer.endElement("input");
_writer.endInsert();
- assertTrue(CORR_OUTPUT+_contentCollector.toString(), _contentCollector.toString().contains("value=\"]]>\""));
+ Assert.assertTrue(CORR_OUTPUT+_contentCollector.toString(), _contentCollector.toString().contains("value=\"]]>\""));
} catch (IOException e) {
- fail(e.toString());
+ Assert.fail(e.toString());
}
}
@@ -293,9 +290,9 @@
_writer = createTestProbe();
try {
_writer.delete("blaId");
- assertTrue(CORR_OUTPUT+_contentCollector.toString(), _contentCollector.toString().equals("<changes><delete id=\"blaId\"></delete>"));
+ Assert.assertTrue(CORR_OUTPUT+_contentCollector.toString(), _contentCollector.toString().equals("<changes><delete id=\"blaId\"></delete>"));
} catch (IOException e) {
- fail(e.toString());
+ Assert.fail(e.toString());
}
}
@@ -305,10 +302,10 @@
String illegalChars = "\u0001\u0002\u0003\u0004\u0005\u0006\u000B\f\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F\uDBFF\uDC00";
String legalChars = "foo";
_writer.write(illegalChars + legalChars);
- assertEquals("All illegal XML unicode characters should have been replaced by spaces", legalChars, _contentCollector.toString().trim());
+ Assert.assertEquals("All illegal XML unicode characters should have been replaced by spaces", legalChars, _contentCollector.toString().trim());
} catch (IOException e) {
- fail(e.toString());
+ Assert.fail(e.toString());
}
}
@@ -318,10 +315,10 @@
String illegalChars = "\u0001\u0002\u0003\u0004\u0005\u0006\u000B\f\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F\uDBFF\uDC00";
String legalChars = "foo";
_writer.writeText(illegalChars + legalChars, null);
- assertEquals("All illegal XML unicode characters should have been replaced by spaces", legalChars, _contentCollector.toString().trim());
+ Assert.assertEquals("All illegal XML unicode characters should have been replaced by spaces", legalChars, _contentCollector.toString().trim());
} catch (IOException e) {
- fail(e.toString());
+ Assert.fail(e.toString());
}
}
@@ -333,11 +330,11 @@
_writer.startElement(legalChars, null);
_writer.writeAttribute(legalChars, illegalChars + legalChars, null);
_writer.endElement(legalChars);
- assertTrue("All illegal XML unicode characters should have been replaced by spaces",
+ Assert.assertTrue("All illegal XML unicode characters should have been replaced by spaces",
_contentCollector.toString().matches("<:X: :X:=\"[ ]+:X:\"></:X:>".replace(":X:", legalChars)));
} catch (IOException e) {
- fail(e.toString());
+ Assert.fail(e.toString());
}
}
@@ -349,10 +346,10 @@
String escaped = _contentCollector.toString();
- assertEquals("All illegal XML unicode characters should have been replaced by spaces", input, escaped.trim());
+ Assert.assertEquals("All illegal XML unicode characters should have been replaced by spaces", input, escaped.trim());
} catch (IOException e) {
- fail(e.toString());
+ Assert.fail(e.toString());
}
}
@@ -364,10 +361,10 @@
String escaped = _contentCollector.toString();
- assertEquals("All illegal XML unicode characters should have been replaced by spaces", input, escaped.trim());
+ Assert.assertEquals("All illegal XML unicode characters should have been replaced by spaces", input, escaped.trim());
} catch (IOException e) {
- fail(e.toString());
+ Assert.fail(e.toString());
}
}
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 e36bdd7..1fe43fc 100644
--- a/impl/src/test/java/org/apache/myfaces/context/RenderPhaseClientIdsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/context/RenderPhaseClientIdsTest.java
@@ -23,7 +23,8 @@
import javax.faces.context.PartialViewContext;
import org.apache.myfaces.context.servlet.FacesContextImpl;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
+import org.junit.Assert;
/**
* Testcases for the request parameter handling
@@ -35,12 +36,8 @@
*/
public class RenderPhaseClientIdsTest extends AbstractJsfTestCase {
- public RenderPhaseClientIdsTest() {
- super("RenderPhaseClientIdsTest");
- }
-
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
FactoryFinder.setFactory(FactoryFinder.PARTIAL_VIEW_CONTEXT_FACTORY,
"org.apache.myfaces.context.PartialViewContextFactoryImpl");
@@ -62,7 +59,7 @@
PartialViewContext pprContext = context.getPartialViewContext();
- assertTrue(pprContext.getRenderIds().isEmpty());
+ Assert.assertTrue(pprContext.getRenderIds().isEmpty());
}
/**
@@ -76,7 +73,7 @@
PartialViewContext pprContext = context.getPartialViewContext();
- assertTrue(pprContext.getRenderIds().isEmpty());
+ Assert.assertTrue(pprContext.getRenderIds().isEmpty());
}
/**
@@ -93,7 +90,7 @@
PartialViewContext pprContext = context.getPartialViewContext();
- assertTrue(pprContext.getRenderIds().isEmpty());
+ Assert.assertTrue(pprContext.getRenderIds().isEmpty());
}*/
/**
@@ -109,8 +106,8 @@
PartialViewContext pprContext = context.getPartialViewContext();
- assertTrue("Length must be one",pprContext.getRenderIds().size() == 1);
- assertTrue("Value match",pprContext.getRenderIds().iterator().next().equals("view1:panel1:_component1"));
+ Assert.assertTrue("Length must be one",pprContext.getRenderIds().size() == 1);
+ Assert.assertTrue("Value match",pprContext.getRenderIds().iterator().next().equals("view1:panel1:_component1"));
}
/**
@@ -127,13 +124,13 @@
PartialViewContext pprContext = context.getPartialViewContext();
- assertTrue("Length must be four",pprContext.getRenderIds().size() == 4);
+ Assert.assertTrue("Length must be four",pprContext.getRenderIds().size() == 4);
// FIXME: Latest spec uses a Collection so order is not garanteed
-// assertTrue("Value match",pprContext.getRenderIds().get(0).equals("view1:panel1:_component1"));
-// assertTrue("Value match",pprContext.getRenderIds().get(2).equals("component3"));
+// Assert.assertTrue("Value match",pprContext.getRenderIds().get(0).equals("view1:panel1:_component1"));
+// Assert.assertTrue("Value match",pprContext.getRenderIds().get(2).equals("component3"));
//
//
-// assertTrue("Value match",pprContext.getRenderIds().get(3).equals("component4"));
+// Assert.assertTrue("Value match",pprContext.getRenderIds().get(3).equals("component4"));
}
}
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 0e160b3..d1afef4 100644
--- a/impl/src/test/java/org/apache/myfaces/context/ResponseWrapperSwitchTest.java
+++ b/impl/src/test/java/org/apache/myfaces/context/ResponseWrapperSwitchTest.java
@@ -29,8 +29,9 @@
import javax.servlet.WriteListener;
import org.apache.myfaces.context.servlet.FacesContextImpl;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockResponseWriter;
+import org.junit.Assert;
/**
* Testcase for the response switching
@@ -40,19 +41,15 @@
*/
public class ResponseWrapperSwitchTest extends AbstractJsfTestCase {
- public ResponseWrapperSwitchTest() {
- super("ResponseWrapperSwitchTest");
- }
-
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
FactoryFinder.setFactory (FactoryFinder.EXCEPTION_HANDLER_FACTORY,
"org.apache.myfaces.context.ExceptionHandlerFactoryImpl");
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
super.tearDown();
}
@@ -168,14 +165,14 @@
try {
responseWriter = new MockResponseWriter(((ServletResponse) context.getExternalContext().getResponse()).getWriter(), null, null);
} catch (IOException ex) {
- super.fail(ex.getMessage());
+ Assert.fail(ex.getMessage());
}
context.setResponseWriter(responseWriter);
}
- assertTrue("responsewriter not null", responseWriter != null);
+ Assert.assertTrue("responsewriter not null", responseWriter != null);
try {
responseWriter.append("hello world");
@@ -183,10 +180,10 @@
responseWriter.close();
} catch (IOException ex) {
- super.fail(ex.getMessage());
+ Assert.fail(ex.getMessage());
}
- assertTrue(ostrWriter.toString().trim().equals("hello world"));
+ Assert.assertTrue(ostrWriter.toString().trim().equals("hello world"));
}
@@ -217,7 +214,7 @@
- assertTrue("responsewriter not null", responseWriter != null);
+ Assert.assertTrue("responsewriter not null", responseWriter != null);
context.getPartialViewContext().enableResponseWriting(false);
try {
@@ -230,7 +227,7 @@
}
- assertTrue(ostrWriter.toString().trim().equals(""));
+ Assert.assertTrue(ostrWriter.toString().trim().equals(""));
}*/
@@ -267,7 +264,7 @@
}
- assertTrue(ostr.toString().trim().equals(""));
+ Assert.assertTrue(ostr.toString().trim().equals(""));
}*/
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 fc6950e..50e4774 100644
--- a/impl/src/test/java/org/apache/myfaces/context/TestIsAjaxRequest.java
+++ b/impl/src/test/java/org/apache/myfaces/context/TestIsAjaxRequest.java
@@ -21,7 +21,8 @@
import javax.faces.FactoryFinder;
import javax.faces.context.FacesContext;
import org.apache.myfaces.context.servlet.FacesContextImpl;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
+import org.junit.Assert;
/**
* Tests the facesContext isAjaxRequest
@@ -34,10 +35,6 @@
Map<String, String> requestParameterMap = null;
FacesContext context = null;
- public TestIsAjaxRequest() {
- super("TestIsAjaxRequest");
- }
-
public void setUp() throws Exception {
super.setUp();
@@ -57,13 +54,13 @@
public void testNoEntry() {
- assertFalse("no ajax request found", context.getPartialViewContext().isAjaxRequest());
+ Assert.assertFalse("no ajax request found", context.getPartialViewContext().isAjaxRequest());
}
public void testEntry() {
request.addHeader("Faces-Request", "partial/ajax");
request.addParameter("javax.faces.partial.ajax","true");
- assertTrue("no ajax request found", context.getPartialViewContext().isAjaxRequest());
+ Assert.assertTrue("no ajax request found", context.getPartialViewContext().isAjaxRequest());
}
}
diff --git a/impl/src/test/java/org/apache/myfaces/event/GlobalPostAddToViewEventTestCase.java b/impl/src/test/java/org/apache/myfaces/event/GlobalPostAddToViewEventTestCase.java
index aef65d0..b7fdfbb 100644
--- a/impl/src/test/java/org/apache/myfaces/event/GlobalPostAddToViewEventTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/event/GlobalPostAddToViewEventTestCase.java
@@ -49,7 +49,7 @@
}
@Test
- public void postAddToViewSourceNull() throws Exception
+ public void testPostAddToViewSourceNull() throws Exception
{
ApplicationImplEventManager eventManager = new ApplicationImplEventManager();
@@ -61,7 +61,7 @@
}
@Test
- public void postAddToViewSourceSuperClass() throws Exception
+ public void testPostAddToViewSourceSuperClass() throws Exception
{
ApplicationImplEventManager eventManager = new ApplicationImplEventManager();
@@ -73,7 +73,7 @@
}
@Test
- public void postAddToViewSourceDirect() throws Exception
+ public void testPostAddToViewSourceDirect() throws Exception
{
ApplicationImplEventManager eventManager = new ApplicationImplEventManager();
@@ -85,7 +85,7 @@
}
@Test
- public void postAddToViewSourceUnmatching() throws Exception
+ public void testPostAddToViewSourceUnmatching() throws Exception
{
ApplicationImplEventManager eventManager = new ApplicationImplEventManager();
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 d6c74cd..ac455c2 100644
--- a/impl/src/test/java/org/apache/myfaces/lifecycle/RestoreViewExecutorTest.java
+++ b/impl/src/test/java/org/apache/myfaces/lifecycle/RestoreViewExecutorTest.java
@@ -26,6 +26,7 @@
import org.apache.myfaces.application.ViewIdSupport;
import org.apache.myfaces.test.FacesTestCase;
+import org.junit.Assert;
import org.mockito.Mockito;
/**
@@ -40,7 +41,7 @@
private ViewIdSupport _viewHandlerSupport;
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
_viewHandler = Mockito.mock(ViewHandler.class);
@@ -78,7 +79,7 @@
*/
public void testGetPhase()
{
- assertEquals(PhaseId.RESTORE_VIEW, _testimpl.getPhase());
+ Assert.assertEquals(PhaseId.RESTORE_VIEW, _testimpl.getPhase());
}
}
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 2ec7113..473b918 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/ErrorPageWriterTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/ErrorPageWriterTest.java
@@ -31,9 +31,10 @@
import org.apache.myfaces.renderkit.html.HtmlTextRenderer;
import org.apache.myfaces.application.viewstate.StateUtils;
import org.apache.myfaces.spi.impl.DefaultSerialFactory;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
+import org.junit.Assert;
/**
* @author Bruno Aranda (latest modification by $Author: struberg $)
@@ -41,19 +42,9 @@
*/
public class ErrorPageWriterTest extends AbstractJsfTestCase
{
- public static Test suite()
- {
- return new TestSuite(ErrorPageWriterTest.class); // needed in maven
- }
-
private MockResponseWriter writer ;
private HtmlOutputText outputText;
- public ErrorPageWriterTest(String name)
- {
- super(name);
- }
-
public void setUp() throws Exception
{
super.setUp();
@@ -107,7 +98,7 @@
}
int indexOfHasRenderedAttribute = output.indexOf("rendered=\"\"");
boolean hasRenderedAttribute = (-1 != indexOfHasRenderedAttribute);
- assertTrue("rendered attribute wasn't written correctly: " + surroundingText, hasRenderedAttribute);
+ Assert.assertTrue("rendered attribute wasn't written correctly: " + surroundingText, hasRenderedAttribute);
}
}
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/HtmlRenderKitImplTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/HtmlRenderKitImplTest.java
index 87000c8..09d4eb0 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/HtmlRenderKitImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/HtmlRenderKitImplTest.java
@@ -99,15 +99,24 @@
Assert.assertEquals(ContentTypeUtils.HTML_CONTENT_TYPE, responseWriter.getWriterContentTypeMode());
}
- @Test(expected=IllegalArgumentException.class)
+ @Test
public void testCreateResponseWriterContentType6()
{
- MyfacesConfig config = new MyfacesConfig();
- facesContext.getExternalContext().getApplicationMap().put(MyfacesConfig.class.getName(), config);
- request.addHeader("Accept", "image/png"); //Webkit
- HtmlRenderKitImpl renderKit = new HtmlRenderKitImpl();
- StringWriter writer = new StringWriter();
- HtmlResponseWriterImpl responseWriter = (HtmlResponseWriterImpl) renderKit.createResponseWriter(writer, null, null);
+ try
+ {
+ MyfacesConfig config = new MyfacesConfig();
+ facesContext.getExternalContext().getApplicationMap().put(MyfacesConfig.class.getName(), config);
+ request.addHeader("Accept", "image/png"); //Webkit
+ HtmlRenderKitImpl renderKit = new HtmlRenderKitImpl();
+ StringWriter writer = new StringWriter();
+ HtmlResponseWriterImpl responseWriter = (HtmlResponseWriterImpl) renderKit.createResponseWriter(writer, null, null);
+
+ Assert.fail();
+ }
+ catch (IllegalArgumentException e)
+ {
+ // expected
+ }
}
@Test
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 84d5b14..e4a271e 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/RendererUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/RendererUtilsTest.java
@@ -37,7 +37,7 @@
import org.junit.Assert;
import org.apache.myfaces.renderkit.html.util.HTML;
import org.apache.myfaces.renderkit.html.util.JSFAttr;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockResponseWriter;
import org.easymock.classextension.EasyMock;
import org.junit.Test;
@@ -72,11 +72,7 @@
private UIPanel parent;
- public RendererUtilsTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
writer = new MockResponseWriter(new StringWriter(), null, null);
@@ -103,7 +99,7 @@
parent = new UIPanel();
}
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
super.tearDown();
}
@@ -124,7 +120,7 @@
String iconSrc = RendererUtils.getIconSrc(facesContext, graphicImage,
HTML.IMG_ELEM);
- assertEquals(
+ Assert.assertEquals(
"If name or name/library present, source must be obtained from ResourceHandler",
requestPath, iconSrc);
@@ -141,8 +137,8 @@
String iconSrc = RendererUtils.getIconSrc(facesContext, graphicImage,
HTML.IMG_ELEM);
- assertEquals("RES_NOT_FOUND", iconSrc);
- assertTrue("If resource is not found, a Message must be added",
+ Assert.assertEquals("RES_NOT_FOUND", iconSrc);
+ Assert.assertTrue("If resource is not found, a Message must be added",
facesContext.getMessages(graphicImage.getClientId(facesContext)).hasNext());
}
@@ -155,8 +151,8 @@
uiInput.setSubmittedValue(submittedValue);
String stringValue = RendererUtils.getStringValue(facesContext, uiInput);
- assertNotNull(stringValue);
- assertEquals("If submittedvalue is not String, toString() must be used", submittedValue.toString(), stringValue);
+ Assert.assertNotNull(stringValue);
+ Assert.assertEquals("If submittedvalue is not String, toString() must be used", submittedValue.toString(), stringValue);
}
public void testGetConvertedUIOutputValue()
@@ -167,7 +163,7 @@
Object convertedUIOutputValue = RendererUtils.getConvertedUIOutputValue(facesContext, uiInput, submittedValue);
- assertEquals("If submittedvalue is not String, toString() must be used", submittedValue.toString(), convertedUIOutputValue);
+ Assert.assertEquals("If submittedvalue is not String, toString() must be used", submittedValue.toString(), convertedUIOutputValue);
}
@Test
@@ -175,16 +171,16 @@
{
UIComponent uiComponent = new UIOutput();
boolean rendered = RendererUtils.isRendered(facesContext, uiComponent);
- assertTrue(rendered);
+ Assert.assertTrue(rendered);
uiComponent.setRendered(false);
rendered = RendererUtils.isRendered(facesContext, uiComponent);
- assertFalse(rendered);
+ Assert.assertFalse(rendered);
uiComponent = _setUpComponentStack();
rendered = RendererUtils.isRendered(facesContext, uiComponent);
- assertFalse(rendered);
- assertEquals("isRendered must not change current component", parent, UIComponent.getCurrentComponent(facesContext));
+ Assert.assertFalse(rendered);
+ Assert.assertEquals("isRendered must not change current component", parent, UIComponent.getCurrentComponent(facesContext));
}
/**
@@ -216,15 +212,15 @@
}
@Override
public void encodeBegin(FacesContext context) throws IOException {
- fail();
+ Assert.fail();
}
@Override
public void encodeChildren(FacesContext context) throws IOException {
- fail();
+ Assert.fail();
}
@Override
public void encodeEnd(FacesContext context) throws IOException {
- fail();
+ Assert.fail();
}
}
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 57354b3..66b8254 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
@@ -21,7 +21,7 @@
import org.apache.myfaces.renderkit.html.util.HtmlRendererUtils;
import org.junit.Assert;
import org.apache.myfaces.renderkit.ClientBehaviorEvents;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import javax.faces.component.UIComponent;
import javax.faces.component.behavior.*;
@@ -34,11 +34,6 @@
public class ClientBehaviorRendererUtilsTest extends AbstractJsfTestCase
{
- public ClientBehaviorRendererUtilsTest(String name)
- {
- super(name);
- }
-
public void setUp() throws Exception
{
super.setUp();
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 64badbf..9897fd5 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
@@ -25,11 +25,12 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.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;
/**
* @author Leonardo Uribe
@@ -40,15 +41,6 @@
private MockResponseWriter writer ;
private HtmlBody body;
- public HtmlBodyRendererTest(String name)
- {
- super(name);
- }
-
- public static Test suite() {
- return new TestSuite(HtmlBodyRendererTest.class);
- }
-
public void setUp() throws Exception
{
super.setUp();
@@ -82,7 +74,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
body, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -93,7 +85,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
body, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
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 55f358f..fc3f130 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
@@ -29,7 +29,7 @@
import junit.framework.TestSuite;
import org.apache.myfaces.config.MyfacesConfig;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockExternalContext;
import org.apache.myfaces.test.mock.MockHttpServletRequest;
import org.apache.myfaces.test.mock.MockHttpServletResponse;
@@ -38,20 +38,13 @@
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;
public class HtmlButtonRendererTest extends AbstractJsfTestCase {
private MockResponseWriter writer;
private HtmlCommandButton commandButton;
private HtmlForm form;
-
- public HtmlButtonRendererTest(String name) {
- super(name);
- }
-
- public static Test suite() {
- return new TestSuite(HtmlButtonRendererTest.class);
- }
public void setUp() throws Exception {
super.setUp();
@@ -129,7 +122,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
commandButton, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -176,7 +169,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
commandButton, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -191,12 +184,12 @@
{
commandButton.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
- assertTrue(output.matches(".+id=\".+\".+"));
- assertTrue(output.matches(".+name=\".+\".+"));
+ Assert.assertTrue(output.matches(".+id=\".+\".+"));
+ Assert.assertTrue(output.matches(".+name=\".+\".+"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -225,10 +218,10 @@
commandButton.encodeAll(facesContext);
String output = writer.getWriter().toString();
- assertFalse(output.contains("param1"));
- assertFalse(output.contains("value1"));
- assertTrue(output.contains("param2"));
- assertTrue(output.contains("value2"));
+ Assert.assertFalse(output.contains("param1"));
+ Assert.assertFalse(output.contains("value1"));
+ Assert.assertTrue(output.contains("param2"));
+ Assert.assertTrue(output.contains("value2"));
}
}
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 45fdb42..d6c84ac 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
@@ -28,11 +28,12 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.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;
/**
* @author Bruno Aranda (latest modification by $Author$)
@@ -44,15 +45,6 @@
private HtmlSelectManyCheckbox selectManyCheckbox;
private HtmlSelectBooleanCheckbox selectBooleanCheckbox;
- public HtmlCheckboxRendererTest(String name)
- {
- super(name);
- }
-
- public static Test suite() {
- return new TestSuite(HtmlCheckboxRendererTest.class);
- }
-
public void setUp() throws Exception
{
super.setUp();
@@ -126,7 +118,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
selectManyCheckbox, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -139,7 +131,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
selectBooleanCheckbox, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -154,12 +146,12 @@
{
selectBooleanCheckbox.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
- assertTrue(output.matches(".+id=\".+\".+"));
- assertTrue(output.matches(".+name=\".+\".+"));
+ Assert.assertTrue(output.matches(".+id=\".+\".+"));
+ Assert.assertTrue(output.matches(".+name=\".+\".+"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -184,12 +176,12 @@
selectManyCheckbox.getChildren().add(item2);
selectManyCheckbox.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
- assertTrue(output.matches(".+id=\".+\".+"));
- assertTrue(output.matches(".+name=\".+\".+"));
+ Assert.assertTrue(output.matches(".+id=\".+\".+"));
+ Assert.assertTrue(output.matches(".+name=\".+\".+"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
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 f5902cd..bb076bb 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
@@ -25,7 +25,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
@@ -41,15 +41,6 @@
private MockResponseWriter writer ;
private HtmlDoctype doctype;
- public HtmlDoctypeRendererTest(String name)
- {
- super(name);
- }
-
- public static Test suite() {
- return new TestSuite(HtmlDoctypeRendererTest.class);
- }
-
public void setUp() throws Exception
{
super.setUp();
@@ -85,7 +76,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
doctype, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
Assert.assertTrue("Does not match with: <!DOCTYPE rootElement PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">",
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 f9e4c94..064c219 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
@@ -35,8 +35,9 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
+import org.junit.Assert;
public class HtmlEscapeRendererTest extends AbstractJsfTestCase
{
@@ -53,12 +54,7 @@
private static String TEST_STRING = "<b>Out&p&utá</b>";
private static String TEST_STRING_ESCAPED = "<b>Out&p&amp;ut&aacute;</b>";
-
- public static Test suite()
- {
- return new TestSuite(HtmlEscapeRendererTest.class); // needed in maven
- }
-
+
private HtmlOutputText outputText;
private HtmlOutputLabel outputLabel;
private HtmlSelectOneRadio selectOneRadio;
@@ -67,11 +63,6 @@
private HtmlSelectManyCheckbox selectManyCheckbox;
private HtmlSelectManyListbox selectManyListbox;
private HtmlSelectManyMenu selectManyMenu;
-
- public HtmlEscapeRendererTest(String name)
- {
- super(name);
- }
public void setUp() throws Exception
{
@@ -147,7 +138,7 @@
outputText.encodeEnd(facesContext);
facesContext.renderResponse();
String output = swriter.toString();
- assertTrue(output.contains(TEST_STRING_ESCAPED));
+ Assert.assertTrue(output.contains(TEST_STRING_ESCAPED));
}
}
}
@@ -167,7 +158,7 @@
outputText.encodeEnd(facesContext);
facesContext.renderResponse();
String output = swriter.toString();
- assertTrue(output.contains(TEST_STRING));
+ Assert.assertTrue(output.contains(TEST_STRING));
}
}
}
@@ -189,7 +180,7 @@
outputLabel.encodeAll(facesContext);
facesContext.renderResponse();
String output = swriter.toString();
- assertTrue(output.contains(TEST_STRING_ESCAPED));
+ Assert.assertTrue(output.contains(TEST_STRING_ESCAPED));
}
}
}
@@ -209,7 +200,7 @@
outputLabel.encodeAll(facesContext);
facesContext.renderResponse();
String output = swriter.toString();
- assertTrue(output.contains(TEST_STRING));
+ Assert.assertTrue(output.contains(TEST_STRING));
}
}
}
@@ -242,7 +233,7 @@
component.encodeAll(facesContext);
facesContext.renderResponse();
String output = swriter.toString();
- assertTrue(output.contains(TEST_STRING_ESCAPED));
+ Assert.assertTrue(output.contains(TEST_STRING_ESCAPED));
}
public void testUISelectNoEscapeValue() throws Exception
@@ -273,6 +264,6 @@
component.encodeAll(facesContext);
facesContext.renderResponse();
String output = swriter.toString();
- assertTrue(output.contains(TEST_STRING));
+ Assert.assertTrue(output.contains(TEST_STRING));
}
}
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 8a72577..a2b0501 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
@@ -28,26 +28,18 @@
import junit.framework.TestSuite;
import org.apache.myfaces.renderkit.html.util.HTML;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.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;
public class HtmlFormRendererTest extends AbstractJsfTestCase
{
private MockResponseWriter writer ;
private HtmlForm form;
- public HtmlFormRendererTest(String name)
- {
- super(name);
- }
-
- public static Test suite() {
- return new TestSuite(HtmlFormRendererTest.class);
- }
-
public void setUp() throws Exception
{
super.setUp();
@@ -84,10 +76,10 @@
} catch(Exception e) {
StringWriter sw = new StringWriter();
e.printStackTrace(new PrintWriter(sw));
- fail(sw.toString() + "\nHTML.FORM_PASSTHROUGH_ATTRIBUTES: " + printHTMLAttrs(HTML.FORM_PASSTHROUGH_ATTRIBUTES));
+ Assert.fail(sw.toString() + "\nHTML.FORM_PASSTHROUGH_ATTRIBUTES: " + printHTMLAttrs(HTML.FORM_PASSTHROUGH_ATTRIBUTES));
}
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -101,10 +93,10 @@
} catch(Exception e) {
StringWriter sw = new StringWriter();
e.printStackTrace(new PrintWriter(sw));
- fail(sw.toString() + "\nHTML.FORM_PASSTHROUGH_ATTRIBUTES: " + printHTMLAttrs(HTML.FORM_PASSTHROUGH_ATTRIBUTES));
+ Assert.fail(sw.toString() + "\nHTML.FORM_PASSTHROUGH_ATTRIBUTES: " + printHTMLAttrs(HTML.FORM_PASSTHROUGH_ATTRIBUTES));
}
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -129,12 +121,12 @@
{
form.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
- assertTrue(output.matches(".+id=\".+\".+"));
- assertTrue(output.matches(".+name=\".+\".+"));
+ Assert.assertTrue(output.matches(".+id=\".+\".+"));
+ Assert.assertTrue(output.matches(".+name=\".+\".+"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
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 703b67c..235c3aa 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
@@ -28,24 +28,16 @@
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
+import org.junit.Assert;
public class HtmlFormatRendererTest extends AbstractJsfTestCase
{
private MockResponseWriter writer;
private HtmlOutputFormat outputFormat;
-
- public HtmlFormatRendererTest(String name)
- {
- super(name);
- }
-
- public static Test suite() {
- return new TestSuite(HtmlFormatRendererTest.class);
- }
-
+
public void setUp() throws Exception {
super.setUp();
outputFormat = new HtmlOutputFormat();
@@ -82,7 +74,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
outputFormat, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -94,7 +86,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
outputFormat, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -117,6 +109,6 @@
outputFormat.encodeAll(facesContext);
String output = writer.getWriter().toString();
- assertEquals("prefixvalue2-{1}suffix", output);
+ Assert.assertEquals("prefixvalue2-{1}suffix", output);
}
}
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 c2e0a42..9bead4c 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
@@ -30,9 +30,10 @@
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
+import org.junit.Assert;
/**
* @author Bruno Aranda (latest modification by $Author$)
@@ -47,15 +48,6 @@
private HtmlPanelGrid panelGrid;
private HtmlOutputText colText;
- public HtmlGridRendererTest(String name)
- {
- super(name);
- }
-
- public static Test suite() {
- return new TestSuite(HtmlGridRendererTest.class);
- }
-
public void setUp() throws Exception
{
super.setUp();
@@ -107,7 +99,7 @@
facesContext.renderResponse();
String output = writer.getWriter().toString();
- assertEquals("<table><tbody>"+
+ Assert.assertEquals("<table><tbody>"+
"<tr><td>col1Text</td></tr>"+
"<tr><td>col2Text</td></tr>"+
"</tbody>"+"</table>", output);
@@ -120,7 +112,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
panelGrid, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -131,7 +123,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
panelGrid, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -145,12 +137,12 @@
{
panelGrid.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
- assertTrue(output.matches(".+id=\".+\".+"));
- assertTrue(output.matches(".+name=\".+\".+"));
+ Assert.assertTrue(output.matches(".+id=\".+\".+"));
+ Assert.assertTrue(output.matches(".+name=\".+\".+"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
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 ec92d7e..4acafe2 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
@@ -32,9 +32,10 @@
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
+import org.junit.Assert;
/**
* @author Bruno Aranda (latest modification by $Author$)
@@ -47,15 +48,6 @@
private MockResponseWriter writer ;
private HtmlPanelGroup panelGroup;
- public HtmlGroupRendererTest(String name)
- {
- super(name);
- }
-
- public static Test suite() {
- return new TestSuite(HtmlGroupRendererTest.class);
- }
-
public void setUp() throws Exception
{
super.setUp();
@@ -115,7 +107,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
panelGroup, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -126,7 +118,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
panelGroup, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -137,13 +129,13 @@
{
panelGroup.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
- assertTrue(output.matches(".+id=\".+\".+"));
- assertTrue(output.contains("myfaces.ab"));
+ Assert.assertTrue(output.matches(".+id=\".+\".+"));
+ Assert.assertTrue(output.contains("myfaces.ab"));
}
catch (Exception e)
{
e.printStackTrace();
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
}
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 4e33521..9a89b2a 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
@@ -25,11 +25,12 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.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;
/**
* @author Leonardo Uribe
@@ -40,15 +41,6 @@
private MockResponseWriter writer ;
private HtmlHead head;
- public HtmlHeadRendererTest(String name)
- {
- super(name);
- }
-
- public static Test suite() {
- return new TestSuite(HtmlHeadRendererTest.class);
- }
-
public void setUp() throws Exception
{
super.setUp();
@@ -84,7 +76,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
head, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
}
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 e27a3d5..94db6ac 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
@@ -28,9 +28,10 @@
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
+import org.junit.Assert;
/**
* @author Bruno Aranda (latest modification by $Author$)
@@ -40,15 +41,6 @@
{
private MockResponseWriter writer ;
private HtmlGraphicImage graphicImage;
-
- public HtmlImageRendererTest(String name)
- {
- super(name);
- }
-
- public static Test suite() {
- return new TestSuite(HtmlImageRendererTest.class);
- }
public void setUp() throws Exception
{
@@ -87,7 +79,7 @@
facesContext.renderResponse();
String output = writer.getWriter().toString();
- assertEquals("<img id=\"img1\" src=\"" + src + "\"/>", output);
+ Assert.assertEquals("<img id=\"img1\" src=\"" + src + "\"/>", output);
}
public void testHtmlPropertyPassTru() throws Exception
@@ -100,7 +92,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
graphicImage, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -114,7 +106,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
graphicImage, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -128,12 +120,12 @@
{
graphicImage.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
- assertTrue(output.matches(".+id=\".+\".+"));
- assertTrue(output.matches(".+name=\".+\".+"));
+ Assert.assertTrue(output.matches(".+id=\".+\".+"));
+ Assert.assertTrue(output.matches(".+name=\".+\".+"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
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 40dbd81..e9a54dc 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
@@ -31,6 +31,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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -122,7 +123,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
label, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -145,7 +146,7 @@
label.encodeAll(facesContext);
String page = getPageContents();
- assertEquals("<label id=\"labelId\"><span class="required">field label</span></label>", page);
+ Assert.assertEquals("<label id=\"labelId\"><span class="required">field label</span></label>", page);
}
@Test
@@ -159,7 +160,7 @@
label.encodeAll(facesContext);
String page = getPageContents();
- assertEquals("<label id=\"labelId\"><span class=\"required\">field label</span></label>", page);
+ Assert.assertEquals("<label id=\"labelId\"><span class=\"required\">field label</span></label>", page);
}
/**
@@ -173,12 +174,12 @@
{
label.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
- assertTrue(output.matches(".+id=\".+\".+"));
- assertTrue(output.matches(".+name=\".+\".+"));
+ Assert.assertTrue(output.matches(".+id=\".+\".+"));
+ Assert.assertTrue(output.matches(".+name=\".+\".+"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
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 ce2926e..ec107c8 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
@@ -31,11 +31,12 @@
import junit.framework.TestSuite;
import org.apache.myfaces.application.NavigationHandlerImpl;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.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;
/**
* @author Bruno Aranda (latest modification by $Author$)
@@ -49,15 +50,6 @@
private HtmlOutputLink outputLink;
private HtmlOutcomeTargetLink outcomeTargetLink;
- public HtmlLinkRendererTest(String name)
- {
- super(name);
- }
-
- public static Test suite() {
- return new TestSuite(HtmlLinkRendererTest.class);
- }
-
public void setUp() throws Exception
{
super.setUp();
@@ -138,7 +130,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
commandLink, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -175,7 +167,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
outputLink, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -189,12 +181,12 @@
{
outputLink.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
- assertTrue(output.matches(".+id=\".+\".+"));
- assertTrue(output.matches(".+name=\".+\".+"));
+ Assert.assertTrue(output.matches(".+id=\".+\".+"));
+ Assert.assertTrue(output.matches(".+name=\".+\".+"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -210,12 +202,12 @@
commandLink.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
System.out.println("----OUTPUT----"+output);
- assertTrue(output.matches("(?s).+id=\".+\".+"));
- assertTrue(output.matches("(?s).+name=\".+\".+"));
+ Assert.assertTrue(output.matches("(?s).+id=\".+\".+"));
+ Assert.assertTrue(output.matches("(?s).+name=\".+\".+"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -230,12 +222,12 @@
{
outcomeTargetLink.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
- assertTrue(output.matches(".+id=\".+\".+"));
- assertTrue(output.matches(".+name=\".+\".+"));
+ Assert.assertTrue(output.matches(".+id=\".+\".+"));
+ Assert.assertTrue(output.matches(".+name=\".+\".+"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -258,8 +250,8 @@
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
// make sure the parameters are rendered
- assertTrue(output.contains("param1=value1"));
- assertTrue(output.contains("param2=value2"));
+ Assert.assertTrue(output.contains("param1=value1"));
+ Assert.assertTrue(output.contains("param2=value2"));
}
/**
@@ -279,7 +271,7 @@
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
// make sure the fragment is rendered
- assertTrue(output.contains("param1=value1#" + fragment));
+ Assert.assertTrue(output.contains("param1=value1#" + fragment));
}
/**
@@ -293,7 +285,7 @@
outputLink.setValue("http://www.irian.at");
outputLink.encodeAll(facesContext);
String output = writer.getWriter().toString();
- assertEquals("<a href=\"http://www.irian.at#fragment\"></a>", output);
+ Assert.assertEquals("<a href=\"http://www.irian.at#fragment\"></a>", output);
}
/**
@@ -315,10 +307,10 @@
commandLink.encodeAll(facesContext);
String output = writer.getWriter().toString();
- assertFalse(output.contains("param1"));
- assertFalse(output.contains("value1"));
- assertTrue(output.contains("param2"));
- assertTrue(output.contains("value2"));
+ Assert.assertFalse(output.contains("param1"));
+ Assert.assertFalse(output.contains("value1"));
+ Assert.assertTrue(output.contains("param2"));
+ Assert.assertTrue(output.contains("value2"));
}
/**
@@ -340,10 +332,10 @@
outputLink.encodeAll(facesContext);
String output = writer.getWriter().toString();
- assertFalse(output.contains("param1"));
- assertFalse(output.contains("value1"));
- assertTrue(output.contains("param2"));
- assertTrue(output.contains("value2"));
+ Assert.assertFalse(output.contains("param1"));
+ Assert.assertFalse(output.contains("value1"));
+ Assert.assertTrue(output.contains("param2"));
+ Assert.assertTrue(output.contains("value2"));
}
/**
@@ -362,11 +354,11 @@
{
outcomeTargetLink.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
- assertTrue(output.contains("myParameter=myValue"));
+ Assert.assertTrue(output.contains("myParameter=myValue"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -386,11 +378,11 @@
{
outcomeTargetLink.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
- assertFalse(output.contains("myNullParameter"));
+ Assert.assertFalse(output.contains("myNullParameter"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
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 449a870..8a3502b 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
@@ -34,9 +34,10 @@
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
+import org.junit.Assert;
/**
* @author Bruno Aranda (latest modification by $Author$)
@@ -48,15 +49,6 @@
private HtmlSelectOneListbox selectOneListbox;
private HtmlSelectManyListbox selectManyListbox;
- public HtmlListboxRendererTest(String name)
- {
- super(name);
- }
-
- public static Test suite() {
- return new TestSuite(HtmlListboxRendererTest.class);
- }
-
public void setUp() throws Exception
{
super.setUp();
@@ -101,7 +93,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
selectOneListbox, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -120,7 +112,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
selectManyListbox, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -144,12 +136,12 @@
selectOneListbox.getChildren().add(item2);
selectOneListbox.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
- assertTrue(output.matches(".+id=\".+\".+"));
- assertTrue(output.matches(".+name=\".+\".+"));
+ Assert.assertTrue(output.matches(".+id=\".+\".+"));
+ Assert.assertTrue(output.matches(".+name=\".+\".+"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -174,12 +166,12 @@
selectManyListbox.getChildren().add(item2);
selectManyListbox.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
- assertTrue(output.matches(".+id=\".+\".+"));
- assertTrue(output.matches(".+name=\".+\".+"));
+ Assert.assertTrue(output.matches(".+id=\".+\".+"));
+ Assert.assertTrue(output.matches(".+name=\".+\".+"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
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 abee74b..a334e86 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
@@ -34,9 +34,10 @@
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
+import org.junit.Assert;
/**
* @author Bruno Aranda (latest modification by $Author$)
@@ -48,15 +49,6 @@
private HtmlSelectOneMenu selectOneMenu;
private HtmlSelectManyMenu selectManyMenu;
- public HtmlMenuRendererTest(String name)
- {
- super(name);
- }
-
- public static Test suite() {
- return new TestSuite(HtmlMenuRendererTest.class);
- }
-
public void setUp() throws Exception
{
super.setUp();
@@ -102,7 +94,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
selectOneMenu, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -121,7 +113,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
selectManyMenu, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -145,12 +137,12 @@
selectOneMenu.getChildren().add(item2);
selectOneMenu.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
- assertTrue(output.matches(".+id=\".+\".+"));
- assertTrue(output.matches(".+name=\".+\".+"));
+ Assert.assertTrue(output.matches(".+id=\".+\".+"));
+ Assert.assertTrue(output.matches(".+name=\".+\".+"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -175,12 +167,12 @@
selectManyMenu.getChildren().add(item2);
selectManyMenu.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
- assertTrue(output.matches(".+id=\".+\".+"));
- assertTrue(output.matches(".+name=\".+\".+"));
+ Assert.assertTrue(output.matches(".+id=\".+\".+"));
+ Assert.assertTrue(output.matches(".+name=\".+\".+"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
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 b5d9e03..bc77c80 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
@@ -31,6 +31,7 @@
import org.apache.myfaces.test.base.junit4.AbstractJsfConfigurableMockTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
+import org.junit.Assert;
import static org.junit.Assert.fail;
import org.junit.Test;
@@ -144,7 +145,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
message, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -177,7 +178,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
message, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
}
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlMessagesRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlMessagesRendererTest.java
index fced003..bb45b9a 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlMessagesRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlMessagesRendererTest.java
@@ -29,6 +29,7 @@
import org.apache.myfaces.test.base.junit4.AbstractJsfConfigurableMockTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
+import org.junit.Assert;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.Test;
@@ -127,7 +128,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
messages, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -138,8 +139,8 @@
messages.encodeEnd(facesContext);
facesContext.renderResponse();
String output = writer.getWriter().toString();
- assertTrue(output.contains("warnSumary"));
- assertTrue(!output.contains("span"));
+ Assert.assertTrue(output.contains("warnSumary"));
+ Assert.assertTrue(!output.contains("span"));
}
@Test
@@ -150,8 +151,8 @@
messages.encodeEnd(facesContext);
facesContext.renderResponse();
String output = writer.getWriter().toString();
- assertTrue(output.contains("warnSumary"));
- assertTrue(!output.contains("span"));
+ Assert.assertTrue(output.contains("warnSumary"));
+ Assert.assertTrue(!output.contains("span"));
}
@Test
@@ -162,8 +163,8 @@
messages.encodeEnd(facesContext);
facesContext.renderResponse();
String output = writer.getWriter().toString();
- assertTrue(output.contains("warnSumary"));
- assertTrue(!output.contains("span"));
+ Assert.assertTrue(output.contains("warnSumary"));
+ Assert.assertTrue(!output.contains("span"));
}
/**
@@ -179,9 +180,9 @@
messages.encodeEnd(facesContext);
facesContext.renderResponse();
String output = writer.getWriter().toString();
- assertTrue(output.contains("fatalSumary"));
- assertTrue(output.contains("li class=\"fatalClass\""));
- assertTrue(!output.contains("span"));
+ Assert.assertTrue(output.contains("fatalSumary"));
+ Assert.assertTrue(output.contains("li class=\"fatalClass\""));
+ Assert.assertTrue(!output.contains("span"));
}
/**
@@ -198,9 +199,9 @@
messages.encodeEnd(facesContext);
facesContext.renderResponse();
String output = writer.getWriter().toString();
- assertTrue(output.contains("fatalSumary"));
- assertTrue(output.contains("td class=\"fatalClass\""));
- assertTrue(!output.contains("span"));
+ Assert.assertTrue(output.contains("fatalSumary"));
+ Assert.assertTrue(output.contains("td class=\"fatalClass\""));
+ Assert.assertTrue(!output.contains("span"));
}
@Test
@@ -222,7 +223,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
messages, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
}
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 16dc8ad..e2d5691 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
@@ -31,9 +31,10 @@
import org.apache.myfaces.application.NavigationHandlerImpl;
import org.apache.myfaces.renderkit.html.util.JSFAttr;
import org.apache.myfaces.renderkit.html.util.HTML;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
+import org.junit.Assert;
/**
* Tests for HtmlOutcomeTargetButtonRenderer.
@@ -47,17 +48,7 @@
private MockResponseWriter writer;
private HtmlOutcomeTargetButton outcomeTargetButton;
private HtmlForm form;
-
- public HtmlOutcomeTargetButtonRendererTest(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(HtmlOutcomeTargetButtonRendererTest.class);
- }
-
+
public void setUp() throws Exception
{
super.setUp();
@@ -99,12 +90,12 @@
{
outcomeTargetButton.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
- assertTrue(output.matches(".+id=\".+\".+"));
- assertTrue(output.matches(".+name=\".+\".+"));
+ Assert.assertTrue(output.matches(".+id=\".+\".+"));
+ Assert.assertTrue(output.matches(".+name=\".+\".+"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -127,8 +118,8 @@
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
// make sure the parameters are rendered
- assertTrue(output.contains("param1=value1"));
- assertTrue(output.contains("param2=value2"));
+ Assert.assertTrue(output.contains("param1=value1"));
+ Assert.assertTrue(output.contains("param2=value2"));
}
/**
@@ -148,7 +139,7 @@
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
// make sure the fragment is rendered
- assertTrue(output.contains("param1=value1#" + fragment));
+ Assert.assertTrue(output.contains("param1=value1#" + fragment));
}
/**
@@ -167,11 +158,11 @@
{
outcomeTargetButton.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
- assertTrue(output.contains("myParameter=myValue"));
+ Assert.assertTrue(output.contains("myParameter=myValue"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -191,11 +182,11 @@
{
outcomeTargetButton.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
- assertFalse(output.contains("myNullParameter"));
+ Assert.assertFalse(output.contains("myNullParameter"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -211,12 +202,12 @@
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
// Assertions
- assertFalse(output.contains(HTML.ONCLICK_ATTR)); // the output must not contain onclick
- assertTrue(output.contains(HTML.DISABLED_ATTR)); // the ouput must contain disabled
+ Assert.assertFalse(output.contains(HTML.ONCLICK_ATTR)); // the output must not contain onclick
+ Assert.assertTrue(output.contains(HTML.DISABLED_ATTR)); // the ouput must contain disabled
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
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 4e119ed..335cd32 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
@@ -33,9 +33,10 @@
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
+import org.junit.Assert;
/**
* @author Bruno Aranda (latest modification by $Author$)
@@ -46,15 +47,6 @@
private MockResponseWriter writer ;
private HtmlSelectOneRadio selectOneRadio;
- public HtmlRadioRendererTest(String name)
- {
- super(name);
- }
-
- public static Test suite() {
- return new TestSuite(HtmlRadioRendererTest.class);
- }
-
public void setUp() throws Exception
{
super.setUp();
@@ -126,7 +118,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
selectOneRadio, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -150,12 +142,12 @@
selectOneRadio.getChildren().add(item2);
selectOneRadio.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
- assertTrue(output.matches(".+id=\".+\".+"));
- assertTrue(output.matches(".+name=\".+\".+"));
+ Assert.assertTrue(output.matches(".+id=\".+\".+"));
+ Assert.assertTrue(output.matches(".+name=\".+\".+"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
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 2f7a984..9a465f5 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
@@ -24,6 +24,7 @@
import javax.faces.render.ResponseStateManager;
import static junit.framework.TestCase.assertEquals;
import org.apache.myfaces.test.FacesTestCase;
+import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
@@ -41,7 +42,7 @@
map.put(ResponseStateManager.VIEW_STATE_PARAM, "seomthing");
Mockito.when(_externalContext.getRequestParameterMap()).thenReturn(map);
- assertEquals(true, hrsm.isPostback(_facesContext));
+ Assert.assertEquals(true, hrsm.isPostback(_facesContext));
}
@Test
@@ -53,6 +54,6 @@
HtmlResponseStateManager hrsm = Mockito.spy(HtmlResponseStateManager.class);
- assertEquals(false, hrsm.isPostback(_facesContext));
+ Assert.assertEquals(false, hrsm.isPostback(_facesContext));
}
}
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 e6e0926..c99c585 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
@@ -25,7 +25,8 @@
import org.apache.myfaces.util.CommentUtils;
import org.apache.myfaces.renderkit.html.util.HTML;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
+import org.junit.Assert;
/**
* Test class for HtmlResponseWriterImpl.
@@ -38,14 +39,9 @@
private StringWriter _stringWriter;
private HtmlResponseWriterImpl _writer;
-
- public HtmlResponseWriterImplTest(String name)
- {
- super(name);
- }
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
@@ -54,7 +50,7 @@
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
_writer = null;
_stringWriter = null;
@@ -84,25 +80,25 @@
_writer.startDocument();
_writer.startElement("head", null);
- assertFalse("We have not entered a script element yet, so _isInsideScript should be " +
+ Assert.assertFalse("We have not entered a script element yet, so _isInsideScript should be " +
"false (or null).", getFieldBooleanValue(insideScriptField, _writer, false));
_writer.startElement("script", null);
- assertTrue("We have now entered a script element, so _isInsideScript should be " +
+ Assert.assertTrue("We have now entered a script element, so _isInsideScript should be " +
"true.", getFieldBooleanValue(insideScriptField, _writer, false));
_writer.startElement("table", null);
_writer.startElement("tr", null);
_writer.startElement("td", null);
- assertTrue("We have now opened various elements inside a script element, "+
+ Assert.assertTrue("We have now opened various elements inside a script element, "+
"but _isInsideScript should still be true.",
getFieldBooleanValue(insideScriptField, _writer, false));
_writer.write("column value");
- assertTrue("We have now written some text inside a script element, "+
+ Assert.assertTrue("We have now written some text inside a script element, "+
"but _isInsideScript should still be true.",
getFieldBooleanValue(insideScriptField, _writer, false));
@@ -111,16 +107,16 @@
_writer.endElement("table");
_writer.endElement("script");
- assertFalse("We have now closed the script element, so _isInsideScript should be " +
+ Assert.assertFalse("We have now closed the script element, so _isInsideScript should be " +
"false (or null).", getFieldBooleanValue(insideScriptField, _writer, false));
_writer.endElement("head");
_writer.endDocument();
String output = _stringWriter.toString();
- assertTrue("A script start was rendered, so the output has to " +
+ Assert.assertTrue("A script start was rendered, so the output has to " +
"contain " + COMMENT_START, output.contains(COMMENT_START));
- assertTrue("A script end was rendered so the output has to " +
+ Assert.assertTrue("A script end was rendered so the output has to " +
"contain " + COMMENT_END, output.contains(COMMENT_END));
}
@@ -154,10 +150,10 @@
_writer.endDocument();
String output = _stringWriter.toString();
- assertNotNull(output);
- assertTrue("script does not contain body:" + innerScript, output.contains(innerScript));
- assertTrue("script does not have start comment <!-- ", output.contains(CommentUtils.COMMENT_SIMPLE_START));
- assertTrue("script does not have end comment --> ", output.contains("//"+CommentUtils.COMMENT_SIMPLE_END));
+ Assert.assertNotNull(output);
+ Assert.assertTrue("script does not contain body:" + innerScript, output.contains(innerScript));
+ Assert.assertTrue("script does not have start comment <!-- ", output.contains(CommentUtils.COMMENT_SIMPLE_START));
+ Assert.assertTrue("script does not have end comment --> ", output.contains("//"+CommentUtils.COMMENT_SIMPLE_END));
}
public void testScriptOnHtmlIsoEncodingAndNoScriptXhmlComments() throws IOException
@@ -171,10 +167,10 @@
_writer.endDocument();
String output = _stringWriter.toString();
- assertNotNull(output);
- assertTrue("script does not contain body:" + innerScript, output.contains(innerScript));
- assertFalse("script have start comment <!-- ", output.contains(CommentUtils.COMMENT_SIMPLE_START));
- assertFalse("script have end comment --> ", output.contains("//"+CommentUtils.COMMENT_SIMPLE_END));
+ Assert.assertNotNull(output);
+ Assert.assertTrue("script does not contain body:" + innerScript, output.contains(innerScript));
+ Assert.assertFalse("script have start comment <!-- ", output.contains(CommentUtils.COMMENT_SIMPLE_START));
+ Assert.assertFalse("script have end comment --> ", output.contains("//"+CommentUtils.COMMENT_SIMPLE_END));
}
public void testScriptOnHtmlUTF8AndScriptXhmlComments() throws IOException
@@ -188,10 +184,10 @@
_writer.endDocument();
String output = _stringWriter.toString();
- assertNotNull(output);
- assertTrue("script does not contain body:" + innerScript, output.contains(innerScript));
- assertTrue("script does not have start comment <!-- ", output.contains(CommentUtils.COMMENT_SIMPLE_START));
- assertTrue("script does not have end comment --> ", output.contains("//"+CommentUtils.COMMENT_SIMPLE_END));
+ Assert.assertNotNull(output);
+ Assert.assertTrue("script does not contain body:" + innerScript, output.contains(innerScript));
+ Assert.assertTrue("script does not have start comment <!-- ", output.contains(CommentUtils.COMMENT_SIMPLE_START));
+ Assert.assertTrue("script does not have end comment --> ", output.contains("//"+CommentUtils.COMMENT_SIMPLE_END));
}
public void testScriptOnHtmlUTF8AndNoScriptXhmlComments() throws IOException
@@ -205,10 +201,10 @@
_writer.endDocument();
String output = _stringWriter.toString();
- assertNotNull(output);
- assertTrue("script does not contain body:" + innerScript, output.contains(innerScript));
- assertFalse("script have start comment <!-- ", output.contains(CommentUtils.COMMENT_SIMPLE_START));
- assertFalse("script have end comment --> ", output.contains("//"+CommentUtils.COMMENT_SIMPLE_END));
+ Assert.assertNotNull(output);
+ Assert.assertTrue("script does not contain body:" + innerScript, output.contains(innerScript));
+ Assert.assertFalse("script have start comment <!-- ", output.contains(CommentUtils.COMMENT_SIMPLE_START));
+ Assert.assertFalse("script have end comment --> ", output.contains("//"+CommentUtils.COMMENT_SIMPLE_END));
}
public void testScriptOnXhtmlIsoEncoding() throws IOException
@@ -222,10 +218,10 @@
_writer.endDocument();
String output = _stringWriter.toString();
- assertNotNull(output);
- assertTrue("script does not contain body:" + innerScript, output.contains(innerScript));
- assertTrue("script does not have start <![CDATA[ ", output.contains(CommentUtils.INLINE_SCRIPT_COMMENT+CommentUtils.CDATA_SIMPLE_START));
- assertTrue("script does not have end ]]> ", output.contains(CommentUtils.INLINE_SCRIPT_COMMENT+CommentUtils.CDATA_SIMPLE_END));
+ Assert.assertNotNull(output);
+ Assert.assertTrue("script does not contain body:" + innerScript, output.contains(innerScript));
+ Assert.assertTrue("script does not have start <![CDATA[ ", output.contains(CommentUtils.INLINE_SCRIPT_COMMENT+CommentUtils.CDATA_SIMPLE_START));
+ Assert.assertTrue("script does not have end ]]> ", output.contains(CommentUtils.INLINE_SCRIPT_COMMENT+CommentUtils.CDATA_SIMPLE_END));
}
public void testScriptOnXhtmlUTF8Encoding() throws IOException
@@ -239,10 +235,10 @@
_writer.endDocument();
String output = _stringWriter.toString();
- assertNotNull(output);
- assertTrue("script does not contain body:" + innerScript, output.contains(innerScript));
- assertTrue("script does not have start <![CDATA[ ", output.contains(CommentUtils.INLINE_SCRIPT_COMMENT+CommentUtils.CDATA_SIMPLE_START));
- assertTrue("script does not have end ]]> ", output.contains(CommentUtils.INLINE_SCRIPT_COMMENT+CommentUtils.CDATA_SIMPLE_END));
+ Assert.assertNotNull(output);
+ Assert.assertTrue("script does not contain body:" + innerScript, output.contains(innerScript));
+ Assert.assertTrue("script does not have start <![CDATA[ ", output.contains(CommentUtils.INLINE_SCRIPT_COMMENT+CommentUtils.CDATA_SIMPLE_START));
+ Assert.assertTrue("script does not have end ]]> ", output.contains(CommentUtils.INLINE_SCRIPT_COMMENT+CommentUtils.CDATA_SIMPLE_END));
}
public void testStyleOnXhtmlIsoEncoding() throws IOException
@@ -256,10 +252,10 @@
_writer.endDocument();
String output = _stringWriter.toString();
- assertNotNull(output);
- assertTrue("script does not contain body:" + innerScript, output.contains(innerScript));
- assertTrue("script does not have start <![CDATA[ ", output.contains(CommentUtils.CDATA_SIMPLE_START));
- assertTrue("script does not have end ]]> ", output.contains(CommentUtils.CDATA_SIMPLE_END));
+ Assert.assertNotNull(output);
+ Assert.assertTrue("script does not contain body:" + innerScript, output.contains(innerScript));
+ Assert.assertTrue("script does not have start <![CDATA[ ", output.contains(CommentUtils.CDATA_SIMPLE_START));
+ Assert.assertTrue("script does not have end ]]> ", output.contains(CommentUtils.CDATA_SIMPLE_END));
}
public void testStyleOnXhtmlUTF8Encoding() throws IOException
@@ -273,10 +269,10 @@
_writer.endDocument();
String output = _stringWriter.toString();
- assertNotNull(output);
- assertTrue("script does not contain body:" + innerScript, output.contains(innerScript));
- assertTrue("script does not have start <![CDATA[ ", output.contains(CommentUtils.CDATA_SIMPLE_START));
- assertTrue("script does not have end ]]> ", output.contains(CommentUtils.CDATA_SIMPLE_END));
+ Assert.assertNotNull(output);
+ Assert.assertTrue("script does not contain body:" + innerScript, output.contains(innerScript));
+ Assert.assertTrue("script does not have start <![CDATA[ ", output.contains(CommentUtils.CDATA_SIMPLE_START));
+ Assert.assertTrue("script does not have end ]]> ", output.contains(CommentUtils.CDATA_SIMPLE_END));
}
/**
@@ -296,9 +292,9 @@
// the following should render <br />hello
String output = _stringWriter.toString();
- assertNotNull(output);
- assertTrue(output.contains("<br />"));
- assertFalse(output.contains("</br>"));
+ Assert.assertNotNull(output);
+ Assert.assertTrue(output.contains("<br />"));
+ Assert.assertFalse(output.contains("</br>"));
}
/**
@@ -320,9 +316,9 @@
// the following should render <br>hello</br>
String output = _stringWriter.toString();
- assertNotNull(output);
- assertTrue(output.contains("<br>"));
- assertTrue(output.contains("</br>"));
+ Assert.assertNotNull(output);
+ Assert.assertTrue(output.contains("<br>"));
+ Assert.assertTrue(output.contains("</br>"));
}
/**
@@ -342,9 +338,9 @@
// the following should render <br />hello
String output = _stringWriter.toString();
- assertNotNull(output);
- assertTrue(output.contains("<BR />"));
- assertFalse(output.contains("</BR>"));
+ Assert.assertNotNull(output);
+ Assert.assertTrue(output.contains("<BR />"));
+ Assert.assertFalse(output.contains("</BR>"));
}
/**
@@ -366,8 +362,8 @@
// the following should render <br>hello</br>
String output = _stringWriter.toString();
- assertNotNull(output);
- assertTrue(output.contains("<BR>"));
- assertTrue(output.contains("</BR>"));
+ Assert.assertNotNull(output);
+ Assert.assertTrue(output.contains("<BR>"));
+ Assert.assertTrue(output.contains("</BR>"));
}
}
\ No newline at end of file
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 197e8e8..fbd528f 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
@@ -28,9 +28,10 @@
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
+import org.junit.Assert;
/**
* @author Bruno Aranda (latest modification by $Author$)
@@ -41,15 +42,6 @@
private MockResponseWriter writer ;
private HtmlInputSecret inputText;
- public HtmlSecretRendererTest(String name)
- {
- super(name);
- }
-
- public static Test suite() {
- return new TestSuite(HtmlSecretRendererTest.class);
- }
-
public void setUp() throws Exception
{
super.setUp();
@@ -81,7 +73,7 @@
facesContext.renderResponse();
String output = writer.getWriter().toString();
- assertEquals("<input type=\"password\" name=\"j_id__v_0\"/>", output);
+ Assert.assertEquals("<input type=\"password\" name=\"j_id__v_0\"/>", output);
}
public void testHtmlPropertyPassTru() throws Exception
@@ -91,7 +83,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
inputText, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -105,12 +97,12 @@
{
inputText.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
- assertTrue(output.matches(".+id=\".+\".+"));
- assertTrue(output.matches(".+name=\".+\".+"));
+ Assert.assertTrue(output.matches(".+id=\".+\".+"));
+ Assert.assertTrue(output.matches(".+name=\".+\".+"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
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 0762f48..c2da493 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
@@ -31,11 +31,12 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.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;
/**
* @author Bruno Aranda (latest modification by $Author$)
@@ -46,15 +47,6 @@
private MockResponseWriter writer ;
private HtmlDataTable dataTable;
- public HtmlTableRendererTest(String name)
- {
- super(name);
- }
-
- public static Test suite() {
- return new TestSuite(HtmlTableRendererTest.class);
- }
-
public void setUp() throws Exception
{
super.setUp();
@@ -93,7 +85,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
dataTable, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -104,7 +96,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
dataTable, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -118,12 +110,12 @@
{
dataTable.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
- assertTrue(output.matches("(?s).+id=\".+\".+"));
- assertTrue(output.matches("(?s).+name=\".+\".+"));
+ Assert.assertTrue(output.matches("(?s).+id=\".+\".+"));
+ Assert.assertTrue(output.matches("(?s).+name=\".+\".+"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -170,7 +162,7 @@
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
dataTable.setValue(new ListDataModel<Person>(list));
@@ -184,20 +176,20 @@
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
- assertTrue(output2.contains("John"));
- assertTrue(output2.contains("Smith"));
- assertTrue(output2.contains("class1"));
- assertTrue(output2.contains("class2"));
+ Assert.assertTrue(output2.contains("John"));
+ Assert.assertTrue(output2.contains("Smith"));
+ Assert.assertTrue(output2.contains("class1"));
+ Assert.assertTrue(output2.contains("class2"));
- assertTrue(output1.contains("John"));
- assertTrue(output1.contains("Smith"));
- assertTrue(output1.contains("class1"));
- assertTrue(output1.contains("class2"));
+ Assert.assertTrue(output1.contains("John"));
+ Assert.assertTrue(output1.contains("Smith"));
+ Assert.assertTrue(output1.contains("class1"));
+ Assert.assertTrue(output1.contains("class2"));
- assertEquals(output2, output1);
+ Assert.assertEquals(output2, output1);
}
public class 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 3fa229d..80441dc 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
@@ -38,10 +38,11 @@
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
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;
/**
* @author Bruno Aranda (latest modification by $Author$)
@@ -50,20 +51,10 @@
public class HtmlTextRendererTest extends AbstractJsfTestCase
{
- public static Test suite()
- {
- return new TestSuite(HtmlTextRendererTest.class); // needed in maven
- }
-
private MockResponseWriter writer ;
private HtmlOutputText outputText;
private HtmlInputText inputText;
- public HtmlTextRendererTest(String name)
- {
- super(name);
- }
-
public void setUp() throws Exception
{
super.setUp();
@@ -107,8 +98,8 @@
String output = writer.getWriter().toString();
- assertEquals("<span class=\"myStyleClass\">Output</span>", output);
- assertNotSame("Output", output);
+ Assert.assertEquals("<span class=\"myStyleClass\">Output</span>", output);
+ Assert.assertNotSame("Output", output);
}
/**
@@ -125,7 +116,7 @@
String output = writer.getWriter().toString();
- assertEquals("Output", output);
+ Assert.assertEquals("Output", output);
}
public void testHtmlPropertyPassTru() throws Exception
@@ -136,7 +127,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
inputText, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -204,8 +195,8 @@
// 4) renderer calls getValue(); --> getValue() evaluates the
// value-binding, as the local-value is 'null', and I get the
// default-value of the bean shown again
- assertNotSame(expression.getValue(facesContext.getELContext()), inputText.getValue());
- assertNull(inputText.getValue());
+ Assert.assertNotSame(expression.getValue(facesContext.getELContext()), inputText.getValue());
+ Assert.assertNull(inputText.getValue());
}
/**
@@ -218,12 +209,12 @@
{
inputText.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
- assertTrue(output.matches("(?s).+id=\".+\".+"));
- assertTrue(output.matches("(?s).+name=\".+\".+"));
+ Assert.assertTrue(output.matches("(?s).+id=\".+\".+"));
+ Assert.assertTrue(output.matches("(?s).+name=\".+\".+"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -242,11 +233,11 @@
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
// onchange="jsf.util.chain(document.getElementById('j_id0'), event,
// 'alert(\'test\')');"
- assertTrue(output.contains("'alert(\\'test\\')'"));
+ Assert.assertTrue(output.contains("'alert(\\'test\\')'"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -264,11 +255,11 @@
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
// onchange="jsf.util.chain(document.getElementById('j_id0'), event,
// 'var test = \'a\\\'b\'; alert(test);');"
- assertTrue(output.contains("'var test = \\'a\\\\\\'b\\'; alert(test);'"));
+ Assert.assertTrue(output.contains("'var test = \\'a\\\\\\'b\\'; alert(test);'"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
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 de74c63..4c5c4e3 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
@@ -28,9 +28,10 @@
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
+import org.junit.Assert;
/**
* @author Bruno Aranda (latest modification by $Author$)
@@ -41,15 +42,6 @@
private MockResponseWriter writer ;
private HtmlInputTextarea inputTextarea;
- public HtmlTextareaRendererTest(String name)
- {
- super(name);
- }
-
- public static Test suite() {
- return new TestSuite(HtmlTextareaRendererTest.class);
- }
-
public void setUp() throws Exception
{
super.setUp();
@@ -80,7 +72,7 @@
facesContext.renderResponse();
String output = writer.getWriter().toString();
- assertEquals("<textarea name=\"j_id__v_0\"></textarea>", output);
+ Assert.assertEquals("<textarea name=\"j_id__v_0\"></textarea>", output);
}
public void testRenderColsRows() throws Exception
@@ -91,7 +83,7 @@
facesContext.renderResponse();
String output = writer.getWriter().toString();
- assertEquals("<textarea name=\"j_id__v_0\" cols=\"5\" rows=\"10\"></textarea>", output);
+ Assert.assertEquals("<textarea name=\"j_id__v_0\" cols=\"5\" rows=\"10\"></textarea>", output);
}
public void testHtmlPropertyPassTru() throws Exception
@@ -101,7 +93,7 @@
HtmlCheckAttributesUtil.checkRenderedAttributes(
inputTextarea, facesContext, writer, attrs);
if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ Assert.fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
}
}
@@ -115,12 +107,12 @@
{
inputTextarea.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
- assertTrue(output.matches("(?s).+id=\".+\".+"));
- assertTrue(output.matches("(?s).+name=\".+\".+"));
+ Assert.assertTrue(output.matches("(?s).+id=\".+\".+"));
+ Assert.assertTrue(output.matches("(?s).+name=\".+\".+"));
}
catch (Exception e)
{
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderTest.java
index 7770304..143a0cf 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderTest.java
@@ -20,7 +20,8 @@
import java.io.CharArrayWriter;
import java.io.IOException;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
+import org.junit.Assert;
/**
* <code>HTMLEncoderTest</code> tests <code>org.apache.myfaces.shared.renderkit.html.util.HTMLEncoder</code>.
@@ -40,47 +41,43 @@
private String stringBlanks = "<Hello this is MyFaces speaking!>";
private String stringBlanksEncoded = "<Hello this is MyFaces speaking!>";
- public HTMLEncoderTest(String name) {
- super(name);
- }
-
/**
* Test method for
* {@link org.apache.myfaces.shared.renderkit.html.util.HTMLEncoder#encode(String)}.
*/
public void testEncodeStringNoSpecialChars() {
String encodedStr = HTMLEncoder.encode(stringNoSpecialChars);
- assertEquals(stringNoSpecialCharsEncoded, encodedStr);
+ Assert.assertEquals(stringNoSpecialCharsEncoded, encodedStr);
}
public void testEncodeStringSpecialChars1() {
String encodedStr = HTMLEncoder.encode(stringSpecialChars1);
- assertEquals(stringSpecialChars1Encoded, encodedStr);
+ Assert.assertEquals(stringSpecialChars1Encoded, encodedStr);
}
public void testEncodeStringSpecialChars2() {
String encodedStr = HTMLEncoder.encode(stringSpecialChars2);
- assertEquals(stringSpecialChars2Encoded, encodedStr);
+ Assert.assertEquals(stringSpecialChars2Encoded, encodedStr);
}
public void testEncodeStringLineBreak1() {
String encodedStr = HTMLEncoder.encode(stringLineBreak, true);
- assertEquals(stringLineBreakEncoded1, encodedStr);
+ Assert.assertEquals(stringLineBreakEncoded1, encodedStr);
}
public void testEncodeStringLineBreak2() {
String encodedStr = HTMLEncoder.encode(stringLineBreak, false);
- assertEquals(stringLineBreakEncoded2, encodedStr);
+ Assert.assertEquals(stringLineBreakEncoded2, encodedStr);
}
public void testEncodeStringEmpty() {
String encodedStr = HTMLEncoder.encode("");
- assertEquals("", encodedStr);
+ Assert.assertEquals("", encodedStr);
}
public void testEncodeStringNull() {
String encodedStr = HTMLEncoder.encode(null);
- assertEquals("", encodedStr);
+ Assert.assertEquals("", encodedStr);
}
public void testEncodeArrayNoSpecialChars() {
@@ -88,9 +85,9 @@
CharArrayWriter writer = new CharArrayWriter();
char[] source = stringNoSpecialChars.toCharArray();
HTMLEncoder.encode(source, 0, source.length, writer);
- assertEquals(stringNoSpecialCharsEncoded.toCharArray(), writer.toCharArray());
+ assertCharArrayEquals(stringNoSpecialCharsEncoded.toCharArray(), writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -99,9 +96,9 @@
CharArrayWriter writer = new CharArrayWriter();
char[] source = stringNoSpecialChars.toCharArray();
HTMLEncoder.encode(source, 3, source.length - 5, writer);
- assertEquals(stringNoSpecialCharsEncodedPartial.toCharArray(), writer.toCharArray());
+ assertCharArrayEquals(stringNoSpecialCharsEncodedPartial.toCharArray(), writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -110,9 +107,9 @@
CharArrayWriter writer = new CharArrayWriter();
char[] source = stringSpecialChars1.toCharArray();
HTMLEncoder.encode(source, 0, source.length, writer);
- assertEquals(stringSpecialChars1Encoded.toCharArray(), writer.toCharArray());
+ assertCharArrayEquals(stringSpecialChars1Encoded.toCharArray(), writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -121,9 +118,9 @@
CharArrayWriter writer = new CharArrayWriter();
char[] source = stringSpecialChars2.toCharArray();
HTMLEncoder.encode(source, 0, source.length, writer);
- assertEquals(stringSpecialChars2Encoded.toCharArray(), writer.toCharArray());
+ assertCharArrayEquals(stringSpecialChars2Encoded.toCharArray(), writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -131,9 +128,9 @@
try {
CharArrayWriter writer = new CharArrayWriter();
HTMLEncoder.encode(new char[]{}, 0, 1, writer);
- assertEquals(new char[]{}, writer.toCharArray());
+ assertCharArrayEquals(new char[]{}, writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -141,9 +138,9 @@
try {
CharArrayWriter writer = new CharArrayWriter();
HTMLEncoder.encode(null, 0, 0, writer);
- assertEquals(new char[]{}, writer.toCharArray());
+ assertCharArrayEquals(new char[]{}, writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -152,9 +149,9 @@
CharArrayWriter writer = new CharArrayWriter();
char[] source = stringSpecialChars2.toCharArray();
HTMLEncoder.encode(source, 0, source.length - 100, writer);
- assertEquals(new char[]{}, writer.toCharArray());
+ assertCharArrayEquals(new char[]{}, writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -163,9 +160,9 @@
CharArrayWriter writer = new CharArrayWriter();
char[] source = stringSpecialChars2.toCharArray();
HTMLEncoder.encode(source, -100, source.length, writer);
- assertEquals(stringSpecialChars2Encoded.toCharArray(), writer.toCharArray());
+ assertCharArrayEquals(stringSpecialChars2Encoded.toCharArray(), writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -174,9 +171,9 @@
CharArrayWriter writer = new CharArrayWriter();
char[] source = stringSpecialChars2.toCharArray();
HTMLEncoder.encode(source, 100000, source.length, writer);
- assertEquals(new char[]{}, writer.toCharArray());
+ assertCharArrayEquals(new char[]{}, writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -185,9 +182,9 @@
CharArrayWriter writer = new CharArrayWriter();
char[] source = stringLineBreak.toCharArray();
HTMLEncoder.encode(source, 0, source.length, true, writer);
- assertEquals(stringLineBreakEncoded1.toCharArray(), writer.toCharArray());
+ assertCharArrayEquals(stringLineBreakEncoded1.toCharArray(), writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -196,9 +193,9 @@
CharArrayWriter writer = new CharArrayWriter();
char[] source = stringLineBreak.toCharArray();
HTMLEncoder.encode(source, 0, source.length, false, writer);
- assertEquals(stringLineBreakEncoded2.toCharArray(), writer.toCharArray());
+ assertCharArrayEquals(stringLineBreakEncoded2.toCharArray(), writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -207,9 +204,9 @@
CharArrayWriter writer = new CharArrayWriter();
char[] source = stringLineBreak.toCharArray();
HTMLEncoder.encode(source, 0, source.length + 5, false, writer);
- assertEquals(stringLineBreakEncoded2.toCharArray(), writer.toCharArray());
+ assertCharArrayEquals(stringLineBreakEncoded2.toCharArray(), writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -219,27 +216,18 @@
char[] source = stringLineBreak.toCharArray();
HTMLEncoder.encode(source, 4, source.length - 5, writer);
char[] expected = stringLineBreakEncoded2Partial.toCharArray();
- assertEquals(expected, writer.toCharArray());
+ assertCharArrayEquals(expected, writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
- private void assertEquals(char[] expected, char[] actual) {
- if ((expected == null ^ actual == null) || expected.length != actual.length) {
- fail();
- }
- for (int i = 0; i < expected.length; i++) {
- assertEquals(expected[i], actual[i]);
- }
- }
-
public void testSimpleWriteURIAttribute() throws Exception
{
String cad1 = "http://myfaces.apache.org/hello.jsf?key1=val&key2=val2#id";
String cad2 = "http://myfaces.apache.org/hello.jsf?key1=val&key2=val2#id";
String cad3 = HTMLEncoder.encodeURIAttribute(cad1,"UTF-8");
- assertEquals(cad2, cad3);
+ Assert.assertEquals(cad2, cad3);
}
public void testUsAsciiEscapedCharactersBeforeQuery() throws Exception
@@ -254,12 +242,12 @@
String cad1 = "?key=\"%<>\\`{|}^\n "; //Omit %
String cad2 = "?key=%22%25%3C%3E%5C%60%7B%7C%7D%5E%0A%20";
String cad3 = HTMLEncoder.encodeURIAttribute(cad1,"UTF-8");
- assertEquals(cad2, cad3);
+ Assert.assertEquals(cad2, cad3);
String cad4 = "\"%<>\\`{|}^\n ";
String cad5 = "%22%25%3C%3E%5C%60%7B%7C%7D%5E%0A%20";
String cad6 = HTMLEncoder.encodeURIAttribute(cad4,"UTF-8");
- assertEquals(cad5, cad6);
+ Assert.assertEquals(cad5, cad6);
}
@@ -276,12 +264,12 @@
String cad1 = "?key=\"%<>\\`{|}^\n "; //Omit %
String cad2 = "?key=%22%25%3c%3e%5c%60%7b%7c%7d%5e%0a%20";
String cad3 = HTMLEncoder.encodeURIAttribute(cad1,"UTF-8");
- assertEquals(cad2.substring(0,5) + cad2.substring(5).toUpperCase(), cad3);
+ Assert.assertEquals(cad2.substring(0,5) + cad2.substring(5).toUpperCase(), cad3);
String cad4 = "\"%<>\\`{|}^\n ";
String cad5 = "%22%25%3c%3e%5c%60%7b%7c%7d%5e%0a%20";
String cad6 = HTMLEncoder.encodeURIAttribute(cad4,"UTF-8");
- assertEquals(cad5.substring(0,5) + cad5.substring(5).toUpperCase(), cad6);
+ Assert.assertEquals(cad5.substring(0,5) + cad5.substring(5).toUpperCase(), cad6);
}
@@ -293,7 +281,7 @@
String cad1 = new String(array,"ISO-8859-1");//+(char)0xC3BC;//"http://myfaces.apache.org/heüll o.jsf?key=val#id";
String cad2 = "%C3%BC";//"http://myfaces.apache.org/he%FCll%20o.jsf?key=val#id";
String cad3 = HTMLEncoder.encodeURIAttribute(cad1,"UTF-8");
- assertEquals(cad2, cad3);
+ Assert.assertEquals(cad2, cad3);
}
@@ -309,11 +297,11 @@
String cad1 = "?key=:/[]@!$'()*+,;="; //Omit &
String cad2 = HTMLEncoder.encodeURIAttribute(cad1,"UTF-8");
- assertEquals(cad1, cad2);
+ Assert.assertEquals(cad1, cad2);
String cad7 = ":/[]@!$&'()*+,;=";
String cad8 = HTMLEncoder.encodeURIAttribute(cad7,"UTF-8");
- assertEquals(cad7, cad8);
+ Assert.assertEquals(cad7, cad8);
}
public void testNonEncodedCharactersOnURIAttribute() throws Exception
@@ -324,15 +312,15 @@
// producers...."
String cad1 = "?key=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~";
String cad2 = HTMLEncoder.encodeURIAttribute(cad1,"UTF-8");
- assertEquals(cad1, cad2);
+ Assert.assertEquals(cad1, cad2);
String cad3 = "#somefile?key=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~";
String cad4 = HTMLEncoder.encodeURIAttribute(cad3,"UTF-8");
- assertEquals(cad3, cad4);
+ Assert.assertEquals(cad3, cad4);
String cad5 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~";
String cad6 = HTMLEncoder.encodeURIAttribute(cad5,"UTF-8");
- assertEquals(cad5, cad6);
+ Assert.assertEquals(cad5, cad6);
}
public void testWriteURIAttribute() throws Exception
@@ -350,17 +338,26 @@
String cad12 = "%C2%A1%C2%A2%C2%A3%C2%A4%C2%A5%C2%A6%C2%A7%C2%A8%C2%A9%C2%AA%C2%AB%C2%AC%C2%AD"+
"%C2%AE%C2%AF%C2%B0%C2%B1%C3%BF%C4%80";
String cad13 = HTMLEncoder.encodeURIAttribute(cad11,"UTF-8");
- assertEquals(cad12, cad13);
+ Assert.assertEquals(cad12, cad13);
String cad1= "?key=" + new String(array11,"UTF-8")+((char)(0xFF))+((char)(0x100));
String cad2 = "?key=%C2%A1%C2%A2%C2%A3%C2%A4%C2%A5%C2%A6%C2%A7%C2%A8%C2%A9%C2%AA%C2%AB%C2%AC%C2%AD"+
"%C2%AE%C2%AF%C2%B0%C2%B1%C3%BF%C4%80";
String cad3 = HTMLEncoder.encodeURIAttribute(cad1,"UTF-8");
- assertEquals(cad2, cad3);
+ Assert.assertEquals(cad2, cad3);
//String cad14 = "http://myfaces.apache.org/page.jsf?key="+((char)0xFF)+((char)0x100);
//String cad15 = HTMLEncoder.encodeURIAttribute(cad14,false);
//assertEquals(cad14,cad15);
}
+ private void assertCharArrayEquals(char[] expected, char[] actual) {
+ if ((expected == null ^ actual == null) || expected.length != actual.length) {
+ Assert.fail();
+ }
+ for (int i = 0; i < expected.length; i++) {
+ assertEquals(expected[i], actual[i]);
+ }
+ }
+
}
\ No newline at end of file
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderWriterTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderWriterTest.java
index c41a1dd..7cc19e2 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderWriterTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderWriterTest.java
@@ -21,7 +21,8 @@
import java.io.IOException;
import java.io.StringWriter;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
+import org.junit.Assert;
/**
* <code>HTMLEncoderTest</code> tests <code>org.apache.myfaces.shared.renderkit.html.util.HTMLEncoder</code>.
@@ -42,19 +43,15 @@
private String stringBlanksEncoded = "<Hello this is MyFaces speaking!>";
private StringWriter sw;
-
- public HTMLEncoderWriterTest(String name) {
- super(name);
- }
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
sw = new StringWriter(40);
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
super.tearDown();
sw = null;
}
@@ -65,37 +62,37 @@
*/
public void testEncodeStringNoSpecialChars() throws Exception {
HTMLEncoder.encode(sw, stringNoSpecialChars);
- assertEquals(stringNoSpecialCharsEncoded, sw.toString());
+ Assert.assertEquals(stringNoSpecialCharsEncoded, sw.toString());
}
public void testEncodeStringSpecialChars1() throws Exception {
HTMLEncoder.encode(sw, stringSpecialChars1);
- assertEquals(stringSpecialChars1Encoded, sw.toString());
+ Assert.assertEquals(stringSpecialChars1Encoded, sw.toString());
}
public void testEncodeStringSpecialChars2() throws Exception {
HTMLEncoder.encode(sw, stringSpecialChars2);
- assertEquals(stringSpecialChars2Encoded, sw.toString());
+ Assert.assertEquals(stringSpecialChars2Encoded, sw.toString());
}
public void testEncodeStringLineBreak1() throws Exception {
HTMLEncoder.encode(sw, stringLineBreak, true);
- assertEquals(stringLineBreakEncoded1, sw.toString());
+ Assert.assertEquals(stringLineBreakEncoded1, sw.toString());
}
public void testEncodeStringLineBreak2() throws Exception {
HTMLEncoder.encode(sw, stringLineBreak, false);
- assertEquals(stringLineBreakEncoded2, sw.toString());
+ Assert.assertEquals(stringLineBreakEncoded2, sw.toString());
}
public void testEncodeStringEmpty() throws Exception {
HTMLEncoder.encode(sw, "");
- assertEquals("", sw.toString());
+ Assert.assertEquals("", sw.toString());
}
public void testEncodeStringNull() throws Exception {
HTMLEncoder.encode(sw, null);
- assertEquals("", sw.toString());
+ Assert.assertEquals("", sw.toString());
}
public void testEncodeArrayNoSpecialChars() throws Exception {
@@ -103,9 +100,9 @@
CharArrayWriter writer = new CharArrayWriter();
char[] source = stringNoSpecialChars.toCharArray();
HTMLEncoder.encode(source, 0, source.length, writer);
- assertEquals(stringNoSpecialCharsEncoded.toCharArray(), writer.toCharArray());
+ assertCharArrayEquals(stringNoSpecialCharsEncoded.toCharArray(), writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -114,9 +111,9 @@
CharArrayWriter writer = new CharArrayWriter();
char[] source = stringNoSpecialChars.toCharArray();
HTMLEncoder.encode(source, 3, source.length - 5, writer);
- assertEquals(stringNoSpecialCharsEncodedPartial.toCharArray(), writer.toCharArray());
+ assertCharArrayEquals(stringNoSpecialCharsEncodedPartial.toCharArray(), writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -125,9 +122,9 @@
CharArrayWriter writer = new CharArrayWriter();
char[] source = stringSpecialChars1.toCharArray();
HTMLEncoder.encode(source, 0, source.length, writer);
- assertEquals(stringSpecialChars1Encoded.toCharArray(), writer.toCharArray());
+ assertCharArrayEquals(stringSpecialChars1Encoded.toCharArray(), writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -136,9 +133,9 @@
CharArrayWriter writer = new CharArrayWriter();
char[] source = stringSpecialChars2.toCharArray();
HTMLEncoder.encode(source, 0, source.length, writer);
- assertEquals(stringSpecialChars2Encoded.toCharArray(), writer.toCharArray());
+ assertCharArrayEquals(stringSpecialChars2Encoded.toCharArray(), writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -146,9 +143,9 @@
try {
CharArrayWriter writer = new CharArrayWriter();
HTMLEncoder.encode(new char[]{}, 0, 1, writer);
- assertEquals(new char[]{}, writer.toCharArray());
+ assertCharArrayEquals(new char[]{}, writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -156,9 +153,9 @@
try {
CharArrayWriter writer = new CharArrayWriter();
HTMLEncoder.encode(null, 0, 0, writer);
- assertEquals(new char[]{}, writer.toCharArray());
+ assertCharArrayEquals(new char[]{}, writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -167,9 +164,9 @@
CharArrayWriter writer = new CharArrayWriter();
char[] source = stringSpecialChars2.toCharArray();
HTMLEncoder.encode(source, 0, source.length - 100, writer);
- assertEquals(new char[]{}, writer.toCharArray());
+ assertCharArrayEquals(new char[]{}, writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -178,9 +175,9 @@
CharArrayWriter writer = new CharArrayWriter();
char[] source = stringSpecialChars2.toCharArray();
HTMLEncoder.encode(source, -100, source.length, writer);
- assertEquals(stringSpecialChars2Encoded.toCharArray(), writer.toCharArray());
+ assertCharArrayEquals(stringSpecialChars2Encoded.toCharArray(), writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -189,9 +186,9 @@
CharArrayWriter writer = new CharArrayWriter();
char[] source = stringSpecialChars2.toCharArray();
HTMLEncoder.encode(source, 100000, source.length, writer);
- assertEquals(new char[]{}, writer.toCharArray());
+ assertCharArrayEquals(new char[]{}, writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -200,9 +197,9 @@
CharArrayWriter writer = new CharArrayWriter();
char[] source = stringLineBreak.toCharArray();
HTMLEncoder.encode(source, 0, source.length, true, writer);
- assertEquals(stringLineBreakEncoded1.toCharArray(), writer.toCharArray());
+ assertCharArrayEquals(stringLineBreakEncoded1.toCharArray(), writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -211,9 +208,9 @@
CharArrayWriter writer = new CharArrayWriter();
char[] source = stringLineBreak.toCharArray();
HTMLEncoder.encode(source, 0, source.length, false, writer);
- assertEquals(stringLineBreakEncoded2.toCharArray(), writer.toCharArray());
+ assertCharArrayEquals(stringLineBreakEncoded2.toCharArray(), writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -222,9 +219,9 @@
CharArrayWriter writer = new CharArrayWriter();
char[] source = stringLineBreak.toCharArray();
HTMLEncoder.encode(source, 0, source.length + 5, false, writer);
- assertEquals(stringLineBreakEncoded2.toCharArray(), writer.toCharArray());
+ assertCharArrayEquals(stringLineBreakEncoded2.toCharArray(), writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -234,28 +231,19 @@
char[] source = stringLineBreak.toCharArray();
HTMLEncoder.encode(source, 4, source.length - 5, writer);
char[] expected = stringLineBreakEncoded2Partial.toCharArray();
- assertEquals(expected, writer.toCharArray());
+ assertCharArrayEquals(expected, writer.toCharArray());
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
- private void assertEquals(char[] expected, char[] actual) {
- if ((expected == null ^ actual == null) || expected.length != actual.length) {
- fail();
- }
- for (int i = 0; i < expected.length; i++) {
- assertEquals(expected[i], actual[i]);
- }
- }
-
-; public void testSimpleWriteURIAttribute() throws Exception
+ public void testSimpleWriteURIAttribute() throws Exception
{
String cad1 = "http://myfaces.apache.org/hello.jsf?key1=val&key2=val2#id";
String cad2 = "http://myfaces.apache.org/hello.jsf?key1=val&key2=val2#id";
HTMLEncoder.encodeURIAttribute(sw, cad1,"UTF-8");
String cad3 = sw.toString();
- assertEquals(cad2, cad3);
+ Assert.assertEquals(cad2, cad3);
}
public void testUsAsciiEscapedCharactersBeforeQuery() throws Exception
@@ -271,14 +259,14 @@
String cad2 = "?key=%22%25%3C%3E%5C%60%7B%7C%7D%5E%0A%20";
HTMLEncoder.encodeURIAttribute(sw, cad1,"UTF-8");
String cad3 = sw.toString();
- assertEquals(cad2, cad3);
+ Assert.assertEquals(cad2, cad3);
String cad4 = "\"%<>\\`{|}^\n ";
String cad5 = "%22%25%3C%3E%5C%60%7B%7C%7D%5E%0A%20";
sw = new StringWriter();
HTMLEncoder.encodeURIAttribute(sw, cad4,"UTF-8");
String cad6 = sw.toString();
- assertEquals(cad5, cad6);
+ Assert.assertEquals(cad5, cad6);
}
@@ -292,7 +280,7 @@
String cad2 = "%C3%BC";//"http://myfaces.apache.org/he%FCll%20o.jsf?key=val#id";
HTMLEncoder.encodeURIAttribute(sw, cad1,"UTF-8");
String cad3 = sw.toString();
- assertEquals(cad2, cad3);
+ Assert.assertEquals(cad2, cad3);
}
@@ -309,13 +297,13 @@
String cad1 = "?key=:/[]@!$'()*+,;="; //Omit &
HTMLEncoder.encodeURIAttribute(sw, cad1,"UTF-8");
String cad2 = sw.toString();
- assertEquals(cad1, cad2);
+ Assert.assertEquals(cad1, cad2);
String cad7 = ":/[]@!$&'()*+,;=";
sw = new StringWriter(40);
HTMLEncoder.encodeURIAttribute(sw, cad7,"UTF-8");
String cad8 = sw.toString();
- assertEquals(cad7, cad8);
+ Assert.assertEquals(cad7, cad8);
}
public void testNonEncodedCharactersOnURIAttribute() throws Exception
@@ -327,19 +315,19 @@
String cad1 = "?key=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~";
HTMLEncoder.encodeURIAttribute(sw, cad1,"UTF-8");
String cad2 = sw.toString();
- assertEquals(cad1, cad2);
+ Assert.assertEquals(cad1, cad2);
String cad3 = "#somefile?key=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~";
sw = new StringWriter(40);
HTMLEncoder.encodeURIAttribute(sw, cad3,"UTF-8");
String cad4 = sw.toString();
- assertEquals(cad3, cad4);
+ Assert.assertEquals(cad3, cad4);
String cad5 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~";
sw = new StringWriter(40);
HTMLEncoder.encodeURIAttribute(sw, cad5,"UTF-8");
String cad6 = sw.toString();
- assertEquals(cad5, cad6);
+ Assert.assertEquals(cad5, cad6);
}
public void testWriteURIAttribute() throws Exception
@@ -358,7 +346,7 @@
"%C2%AE%C2%AF%C2%B0%C2%B1%C3%BF%C4%80";
HTMLEncoder.encodeURIAttribute(sw, cad11,"UTF-8");
String cad13 = sw.toString();
- assertEquals(cad12, cad13);
+ Assert.assertEquals(cad12, cad13);
String cad1= "?key=" + new String(array11,"UTF-8")+((char)(0xFF))+((char)(0x100));
String cad2 = "?key=%C2%A1%C2%A2%C2%A3%C2%A4%C2%A5%C2%A6%C2%A7%C2%A8%C2%A9%C2%AA%C2%AB%C2%AC%C2%AD"+
@@ -366,11 +354,19 @@
sw = new StringWriter(40);
HTMLEncoder.encodeURIAttribute(sw, cad1,"UTF-8");
String cad3 = sw.toString();
- assertEquals(cad2, cad3);
+ Assert.assertEquals(cad2, cad3);
//String cad14 = "http://myfaces.apache.org/page.jsf?key="+((char)0xFF)+((char)0x100);
//String cad15 = HTMLEncoder.encodeURIAttribute(cad14,false);
//assertEquals(cad14,cad15);
}
-
+
+ private void assertCharArrayEquals(char[] expected, char[] actual) {
+ if ((expected == null ^ actual == null) || expected.length != actual.length) {
+ Assert.fail();
+ }
+ for (int i = 0; i < expected.length; i++) {
+ assertEquals(expected[i], actual[i]);
+ }
+ }
}
\ No newline at end of file
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 0fdb59a..b25495d 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkits/OwnRenderkitTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkits/OwnRenderkitTest.java
@@ -27,9 +27,10 @@
import org.apache.myfaces.renderkit.html.HtmlTextRenderer;
import org.apache.myfaces.util.lang.ClassUtils;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockFacesContext12;
import org.apache.myfaces.test.mock.MockResponseWriter;
+import org.junit.Assert;
/**
* @author martin.haimberger
@@ -44,12 +45,7 @@
isOwnRenderKit = true;
}
-
- public OwnRenderkitTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
addRenderKit();
inputText = new HtmlInputText();
@@ -66,7 +62,7 @@
}
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
super.tearDown();
inputText = null;
writer = null;
@@ -78,7 +74,7 @@
inputText.encodeEnd(facesContext);
facesContext.renderResponse();
- assertTrue(isOwnRenderKit);
+ Assert.assertTrue(isOwnRenderKit);
}
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 a1f95d2..e3ab5b0 100644
--- a/impl/src/test/java/org/apache/myfaces/test/FacesTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/test/FacesTestCase.java
@@ -39,7 +39,7 @@
protected Application _application;
protected ELContext _elContext;
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
_externalContext = Mockito.mock(ExternalContext.class);
_facesContext = Mockito.mock(FacesContext.class);
@@ -49,7 +49,7 @@
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
MockFacesContext12.setCurrentInstance(null);
}
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 2289ec9..348cf76 100644
--- a/impl/src/test/java/org/apache/myfaces/util/MessageUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/util/MessageUtilsTest.java
@@ -21,26 +21,16 @@
import javax.faces.application.FacesMessage;
import org.apache.myfaces.util.MessageUtils;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
+import org.junit.Assert;
/**
* TestCase for MessageUtils
*/
public class MessageUtilsTest extends AbstractJsfTestCase
{
-
private static final String DEFAULT_BUNDLE = "javax.faces.Messages";
- public MessageUtilsTest(String name)
- {
- super(name);
- }
-
- // No longer necessary using junit 4 to run tests
- //public static Test suite() {
- // return null; // keep this method or maven won't run it
- //}
-
/**
* Test method for 'org.apache.myfaces.shared.util.MessageUtils.getMessage(Severity, String, Object)'
*/
@@ -50,14 +40,14 @@
FacesMessage msg = MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR,
"javax.faces.component.UIInput.CONVERSION", null);
- assertEquals("{0}: Conversion error occurred.", msg.getSummary());
+ Assert.assertEquals("{0}: Conversion error occurred.", msg.getSummary());
facesContext.getViewRoot().setLocale(Locale.GERMAN);
msg = MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR,
"javax.faces.component.UIInput.CONVERSION",
"blubb");
- assertEquals("blubb: Ein Konvertierungsfehler ist aufgetreten.", msg.getSummary());
+ Assert.assertEquals("blubb: Ein Konvertierungsfehler ist aufgetreten.", msg.getSummary());
}
/**
@@ -69,13 +59,13 @@
FacesMessage msg = MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR,
"javax.faces.component.UIInput.CONVERSION", null);
- assertEquals("{0}: Conversion error occurred.", msg.getSummary());
+ Assert.assertEquals("{0}: Conversion error occurred.", msg.getSummary());
facesContext.getViewRoot().setLocale(Locale.GERMAN);
msg = MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR,
"javax.faces.component.UIInput.CONVERSION", null);
- assertEquals("{0}: Ein Konvertierungsfehler ist aufgetreten.", msg.getSummary());
+ Assert.assertEquals("{0}: Ein Konvertierungsfehler ist aufgetreten.", msg.getSummary());
}
/**
@@ -87,14 +77,14 @@
FacesMessage msg = MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR,
"javax.faces.component.UIInput.CONVERSION", null, facesContext);
- assertEquals("{0}: Conversion error occurred.", msg.getSummary());
+ Assert.assertEquals("{0}: Conversion error occurred.", msg.getSummary());
facesContext.getViewRoot().setLocale(Locale.GERMAN);
msg = MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR,
"javax.faces.component.UIInput.CONVERSION", null,
facesContext);
- assertEquals("{0}: Ein Konvertierungsfehler ist aufgetreten.", msg.getSummary());
+ Assert.assertEquals("{0}: Ein Konvertierungsfehler ist aufgetreten.", msg.getSummary());
}
/**
@@ -106,11 +96,11 @@
FacesMessage msg = org.apache.myfaces.util.MessageUtils.getMessage(Locale.ENGLISH,
"javax.faces.component.UIInput.CONVERSION", null);
- assertEquals("{0}: Conversion error occurred.", msg.getSummary());
+ Assert.assertEquals("{0}: Conversion error occurred.", msg.getSummary());
msg = MessageUtils.getMessage(Locale.GERMAN,
"javax.faces.component.UIInput.CONVERSION", null);
- assertEquals("{0}: Ein Konvertierungsfehler ist aufgetreten.", msg.getSummary());
+ Assert.assertEquals("{0}: Ein Konvertierungsfehler ist aufgetreten.", msg.getSummary());
}
@@ -123,13 +113,13 @@
FacesMessage msg = MessageUtils.getMessage(facesContext,
"javax.faces.component.UIInput.CONVERSION");
- assertEquals("{0}: Conversion error occurred.", msg.getSummary());
+ Assert.assertEquals("{0}: Conversion error occurred.", msg.getSummary());
facesContext.getViewRoot().setLocale(Locale.GERMAN);
msg = MessageUtils.getMessage(facesContext,
"javax.faces.component.UIInput.CONVERSION");
- assertEquals("{0}: Ein Konvertierungsfehler ist aufgetreten.", msg.getSummary());
+ Assert.assertEquals("{0}: Ein Konvertierungsfehler ist aufgetreten.", msg.getSummary());
}
/**
@@ -141,13 +131,13 @@
FacesMessage msg = MessageUtils.getMessage(facesContext,
"javax.faces.component.UIInput.CONVERSION", null);
- assertEquals("{0}: Conversion error occurred.", msg.getSummary());
+ Assert.assertEquals("{0}: Conversion error occurred.", msg.getSummary());
facesContext.getViewRoot().setLocale(Locale.GERMAN);
msg = MessageUtils.getMessage(facesContext,
"javax.faces.component.UIInput.CONVERSION", null);
- assertEquals("{0}: Ein Konvertierungsfehler ist aufgetreten.", msg.getSummary());
+ Assert.assertEquals("{0}: Ein Konvertierungsfehler ist aufgetreten.", msg.getSummary());
}
/**
@@ -162,7 +152,7 @@
FacesMessage msg = MessageUtils.getMessage(bundle,
"javax.faces.component.UIInput.CONVERSION", null);
- assertEquals("{0}: Conversion error occurred.", msg.getSummary());
+ Assert.assertEquals("{0}: Conversion error occurred.", msg.getSummary());
}
/**
@@ -175,7 +165,7 @@
FacesMessage msg = MessageUtils.getMessage(DEFAULT_BUNDLE,
"javax.faces.component.UIInput.CONVERSION", null);
- assertEquals("{0}: Conversion error occurred.", msg.getSummary());
+ Assert.assertEquals("{0}: Conversion error occurred.", msg.getSummary());
}
/**
@@ -186,7 +176,7 @@
FacesMessage msg = MessageUtils.getMessage(DEFAULT_BUNDLE,
Locale.GERMAN, "javax.faces.component.UIInput.CONVERSION", null);
- assertEquals("{0}: Ein Konvertierungsfehler ist aufgetreten.", msg.getSummary());
+ Assert.assertEquals("{0}: Ein Konvertierungsfehler ist aufgetreten.", msg.getSummary());
}
/**
@@ -195,7 +185,7 @@
public void testSubstituteParamsWithDELocale() {
String paramString = MessageUtils.substituteParams(Locale.GERMANY, "currency {0,number,currency}", new Object[]{100});
- assertEquals("currency 100,00 \u20ac",paramString);
+ Assert.assertEquals("currency 100,00 \u20ac",paramString);
}
/**
@@ -205,7 +195,7 @@
String paramString = MessageUtils.substituteParams(Locale.UK, "currency {0,number,currency}", new Object[]{100});
System.out.println(paramString);
- assertEquals("currency \u00a3100.00",paramString);
+ Assert.assertEquals("currency \u00a3100.00",paramString);
}
}
diff --git a/impl/src/test/java/org/apache/myfaces/util/lang/LRULinkedHashMapTest.java b/impl/src/test/java/org/apache/myfaces/util/lang/LRULinkedHashMapTest.java
index 58a23dd..bd985c8 100644
--- a/impl/src/test/java/org/apache/myfaces/util/lang/LRULinkedHashMapTest.java
+++ b/impl/src/test/java/org/apache/myfaces/util/lang/LRULinkedHashMapTest.java
@@ -25,10 +25,6 @@
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
/**
* Tests were copied from org.apache.commons.collections4.map.LRUMapTest
@@ -46,46 +42,46 @@
Iterator<V> vit;
final LRULinkedHashMap<K, V> map = new LRULinkedHashMap<>(2);
- assertEquals(0, map.size());
+ org.junit.Assert.assertEquals(0, map.size());
map.put(keys[0], values[0]);
- assertEquals(1, map.size());
+ org.junit.Assert.assertEquals(1, map.size());
map.put(keys[1], values[1]);
- assertEquals(2, map.size());
+ org.junit.Assert.assertEquals(2, map.size());
kit = map.keySet().iterator();
- assertSame(keys[0], kit.next());
- assertSame(keys[1], kit.next());
+ org.junit.Assert.assertSame(keys[0], kit.next());
+ org.junit.Assert.assertSame(keys[1], kit.next());
vit = map.values().iterator();
- assertSame(values[0], vit.next());
- assertSame(values[1], vit.next());
+ org.junit.Assert.assertSame(values[0], vit.next());
+ org.junit.Assert.assertSame(values[1], vit.next());
map.put(keys[2], values[2]);
- assertEquals(2, map.size());
+ org.junit.Assert.assertEquals(2, map.size());
kit = map.keySet().iterator();
- assertSame(keys[1], kit.next());
- assertSame(keys[2], kit.next());
+ org.junit.Assert.assertSame(keys[1], kit.next());
+ org.junit.Assert.assertSame(keys[2], kit.next());
vit = map.values().iterator();
- assertSame(values[1], vit.next());
- assertSame(values[2], vit.next());
+ org.junit.Assert.assertSame(values[1], vit.next());
+ org.junit.Assert.assertSame(values[2], vit.next());
map.put(keys[2], values[0]);
- assertEquals(2, map.size());
+ org.junit.Assert.assertEquals(2, map.size());
kit = map.keySet().iterator();
- assertSame(keys[1], kit.next());
- assertSame(keys[2], kit.next());
+ org.junit.Assert.assertSame(keys[1], kit.next());
+ org.junit.Assert.assertSame(keys[2], kit.next());
vit = map.values().iterator();
- assertSame(values[1], vit.next());
- assertSame(values[0], vit.next());
+ org.junit.Assert.assertSame(values[1], vit.next());
+ org.junit.Assert.assertSame(values[0], vit.next());
map.put(keys[1], values[3]);
- assertEquals(2, map.size());
+ org.junit.Assert.assertEquals(2, map.size());
kit = map.keySet().iterator();
- assertSame(keys[2], kit.next());
- assertSame(keys[1], kit.next());
+ org.junit.Assert.assertSame(keys[2], kit.next());
+ org.junit.Assert.assertSame(keys[1], kit.next());
vit = map.values().iterator();
- assertSame(values[0], vit.next());
- assertSame(values[3], vit.next());
+ org.junit.Assert.assertSame(values[0], vit.next());
+ org.junit.Assert.assertSame(values[3], vit.next());
}
//-----------------------------------------------------------------------
@@ -100,65 +96,65 @@
map.put(keys[0], values[0]);
map.put(keys[1], values[1]);
kit = map.keySet().iterator();
- assertSame(keys[0], kit.next());
- assertSame(keys[1], kit.next());
+ org.junit.Assert.assertSame(keys[0], kit.next());
+ org.junit.Assert.assertSame(keys[1], kit.next());
vit = map.values().iterator();
- assertSame(values[0], vit.next());
- assertSame(values[1], vit.next());
+ org.junit.Assert.assertSame(values[0], vit.next());
+ org.junit.Assert.assertSame(values[1], vit.next());
// no change to order
map.put(keys[1], values[1]);
kit = map.keySet().iterator();
- assertSame(keys[0], kit.next());
- assertSame(keys[1], kit.next());
+ org.junit.Assert.assertSame(keys[0], kit.next());
+ org.junit.Assert.assertSame(keys[1], kit.next());
vit = map.values().iterator();
- assertSame(values[0], vit.next());
- assertSame(values[1], vit.next());
+ org.junit.Assert.assertSame(values[0], vit.next());
+ org.junit.Assert.assertSame(values[1], vit.next());
// no change to order
map.put(keys[1], values[2]);
kit = map.keySet().iterator();
- assertSame(keys[0], kit.next());
- assertSame(keys[1], kit.next());
+ org.junit.Assert.assertSame(keys[0], kit.next());
+ org.junit.Assert.assertSame(keys[1], kit.next());
vit = map.values().iterator();
- assertSame(values[0], vit.next());
- assertSame(values[2], vit.next());
+ org.junit.Assert.assertSame(values[0], vit.next());
+ org.junit.Assert.assertSame(values[2], vit.next());
// change to order
map.put(keys[0], values[3]);
kit = map.keySet().iterator();
- assertSame(keys[1], kit.next());
- assertSame(keys[0], kit.next());
+ org.junit.Assert.assertSame(keys[1], kit.next());
+ org.junit.Assert.assertSame(keys[0], kit.next());
vit = map.values().iterator();
- assertSame(values[2], vit.next());
- assertSame(values[3], vit.next());
+ org.junit.Assert.assertSame(values[2], vit.next());
+ org.junit.Assert.assertSame(values[3], vit.next());
// change to order
map.get(keys[1]);
kit = map.keySet().iterator();
- assertSame(keys[0], kit.next());
- assertSame(keys[1], kit.next());
+ org.junit.Assert.assertSame(keys[0], kit.next());
+ org.junit.Assert.assertSame(keys[1], kit.next());
vit = map.values().iterator();
- assertSame(values[3], vit.next());
- assertSame(values[2], vit.next());
+ org.junit.Assert.assertSame(values[3], vit.next());
+ org.junit.Assert.assertSame(values[2], vit.next());
// change to order
map.get(keys[0]);
kit = map.keySet().iterator();
- assertSame(keys[1], kit.next());
- assertSame(keys[0], kit.next());
+ org.junit.Assert.assertSame(keys[1], kit.next());
+ org.junit.Assert.assertSame(keys[0], kit.next());
vit = map.values().iterator();
- assertSame(values[2], vit.next());
- assertSame(values[3], vit.next());
+ org.junit.Assert.assertSame(values[2], vit.next());
+ org.junit.Assert.assertSame(values[3], vit.next());
// no change to order
map.get(keys[0]);
kit = map.keySet().iterator();
- assertSame(keys[1], kit.next());
- assertSame(keys[0], kit.next());
+ org.junit.Assert.assertSame(keys[1], kit.next());
+ org.junit.Assert.assertSame(keys[0], kit.next());
vit = map.values().iterator();
- assertSame(values[2], vit.next());
- assertSame(values[3], vit.next());
+ org.junit.Assert.assertSame(values[2], vit.next());
+ org.junit.Assert.assertSame(values[3], vit.next());
}
@SuppressWarnings("unchecked")
@@ -167,8 +163,8 @@
final LRULinkedHashMap<K, V> map = new LRULinkedHashMap<>(10);
map.put((K) "1", (V) "1");
final Map<K, V> cloned = (Map<K, V>) map.clone();
- assertEquals(map.size(), cloned.size());
- assertSame(map.get("1"), cloned.get("1"));
+ org.junit.Assert.assertEquals(map.size(), cloned.size());
+ org.junit.Assert.assertSame(map.get("1"), cloned.get("1"));
}
@Test
@@ -214,7 +210,7 @@
}
}
} catch (final InterruptedException e) {
- fail("Unexpected InterruptedException");
+ org.junit.Assert.fail("Unexpected InterruptedException");
}
if (i > 0) {
synchronized (counter) {
@@ -250,8 +246,8 @@
}
}
- assertEquals("Exceptions have been thrown: " + exceptions, 0, exceptions.size());
- assertTrue("Each thread should have put at least 1 element into the map, but only "
+ org.junit.Assert.assertEquals("Exceptions have been thrown: " + exceptions, 0, exceptions.size());
+ org.junit.Assert.assertTrue("Each thread should have put at least 1 element into the map, but only "
+ counter[0] + " did succeed", counter[0] >= threads.length);
}
@@ -298,7 +294,7 @@
}
}
} catch (final InterruptedException e) {
- fail("Unexpected InterruptedException");
+ org.junit.Assert.fail("Unexpected InterruptedException");
}
if (i > 0) {
synchronized (counter) {
@@ -334,8 +330,8 @@
}
}
- assertEquals("Exceptions have been thrown: " + exceptions, 0, exceptions.size());
- assertTrue("Each thread should have put at least 1 element into the map, but only "
+ org.junit.Assert.assertEquals("Exceptions have been thrown: " + exceptions, 0, exceptions.size());
+ org.junit.Assert.assertTrue("Each thread should have put at least 1 element into the map, but only "
+ counter[0] + " did succeed", counter[0] >= threads.length);
}
@@ -381,7 +377,7 @@
}
}
} catch (final InterruptedException e) {
- fail("Unexpected InterruptedException");
+ org.junit.Assert.fail("Unexpected InterruptedException");
}
if (i > 0) {
synchronized (counter) {
@@ -417,8 +413,8 @@
}
}
- assertEquals("Exceptions have been thrown: " + exceptions, 0, exceptions.size());
- assertTrue("Each thread should have put at least 1 element into the map, but only "
+ org.junit.Assert.assertEquals("Exceptions have been thrown: " + exceptions, 0, exceptions.size());
+ org.junit.Assert.assertTrue("Each thread should have put at least 1 element into the map, but only "
+ counter[0] + " did succeed", counter[0] >= threads.length);
}
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/TagLibraryTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/TagLibraryTestCase.java
index a817966..b10b6c2 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/TagLibraryTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/TagLibraryTestCase.java
@@ -78,9 +78,9 @@
try {
TagLibraryConfig.create(_invalidLibUrl);
- fail("IOException expected");
+ Assert.fail("IOException expected");
} catch (IOException ioe) {
- assertTrue(ioe.getCause() instanceof SAXException);
+ Assert.assertTrue(ioe.getCause() instanceof SAXException);
}
}
@@ -90,7 +90,7 @@
servletContext.addInitParameter(MyfacesConfig.INIT_PARAM_VALIDATE_XML, "false");
TagLibrary lib = TagLibraryConfig.create(_invalidLibUrl);
- assertTrue(lib.containsNamespace("http://myfaces.apache.org/testlib_invalid"));
+ Assert.assertTrue(lib.containsNamespace("http://myfaces.apache.org/testlib_invalid"));
}
public void testLoadInvalidOldLibraryWithValidation() throws Exception
@@ -99,9 +99,9 @@
try {
TagLibraryConfig.create(_invalidOldLibUrl);
- fail("IOException expected");
+ Assert.fail("IOException expected");
} catch (IOException ioe) {
- assertTrue(ioe.getCause() instanceof SAXException);
+ Assert.assertTrue(ioe.getCause() instanceof SAXException);
}
}
*/
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/UITestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/UITestCase.java
index f319fbf..c5abf6a 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/UITestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/UITestCase.java
@@ -130,8 +130,8 @@
UIViewRoot root = faces.getViewRoot();
at.apply(faces, root);
- assertEquals("4 children, the component", 4, root.getChildCount());
- assertNotNull("bound to map", map.get("c"));
+ Assert.assertEquals("4 children, the component", 4, root.getChildCount());
+ Assert.assertNotNull("bound to map", map.get("c"));
}*/
}
diff --git a/impl/src/test/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguageTest.java b/impl/src/test/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguageTest.java
index e61b689..5367354 100644
--- a/impl/src/test/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguageTest.java
+++ b/impl/src/test/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguageTest.java
@@ -23,7 +23,8 @@
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
+import org.junit.Assert;
/**
* Test class for JspViewDeclarationLanguage.
@@ -35,14 +36,9 @@
{
private TrackingJspViewDeclarationLanguage jspVdl;
-
- public JspViewDeclarationLanguageTest(String name)
- {
- super(name);
- }
-
+
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
@@ -50,7 +46,7 @@
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
jspVdl = null;
@@ -75,7 +71,7 @@
}
// assert that buildView() was implicitly called once (by renderView())
- assertEquals(1, jspVdl._buildViewCalled);
+ Assert.assertEquals(1, jspVdl._buildViewCalled);
}
/**
@@ -103,7 +99,7 @@
}
// assert that buildView() was only called once
- assertEquals(1, jspVdl._buildViewCalled);
+ Assert.assertEquals(1, jspVdl._buildViewCalled);
}
/**
@@ -145,7 +141,7 @@
// assert that buildView() was called twice:
// the first time directly by jspVdl.buildView() for firstView
// the second time implicitly by jspVdl.renderView() for secondView
- assertEquals(2, jspVdl._buildViewCalled);
+ Assert.assertEquals(2, jspVdl._buildViewCalled);
}
diff --git a/impl/src/test/java/org/apache/myfaces/webapp/JspFacesInitializerTest.java b/impl/src/test/java/org/apache/myfaces/webapp/JspFacesInitializerTest.java
index 5d79c6d..819fc77 100644
--- a/impl/src/test/java/org/apache/myfaces/webapp/JspFacesInitializerTest.java
+++ b/impl/src/test/java/org/apache/myfaces/webapp/JspFacesInitializerTest.java
@@ -32,7 +32,7 @@
import org.apache.myfaces.config.RuntimeConfig;
import org.apache.myfaces.el.resolver.FacesCompositeELResolver;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.easymock.IAnswer;
import org.easymock.classextension.EasyMock;
import org.easymock.classextension.IMocksControl;
@@ -43,12 +43,6 @@
*/
public class JspFacesInitializerTest extends AbstractJsfTestCase
{
-
- public JspFacesInitializerTest(String name)
- {
- super(name);
- }
-
/**
* Test method for {@link org.apache.myfaces.webapp.DefaultFacesInitializer#initFaces(javax.servlet.ServletContext)}.
* @throws Exception
diff --git a/test/src/main/java/org/apache/myfaces/test/base/AbstractJsfTestCase.java b/test/src/main/java/org/apache/myfaces/test/base/AbstractJsfTestCase.java
deleted file mode 100644
index 70d4794..0000000
--- a/test/src/main/java/org/apache/myfaces/test/base/AbstractJsfTestCase.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.test.base;
-
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import javax.faces.FactoryFinder;
-import javax.faces.application.ApplicationFactory;
-import javax.faces.component.UIViewRoot;
-import javax.faces.lifecycle.LifecycleFactory;
-import javax.faces.render.RenderKitFactory;
-
-import junit.framework.TestCase;
-
-import org.apache.myfaces.test.config.ResourceBundleVarNames;
-import org.apache.myfaces.test.mock.MockApplication;
-import org.apache.myfaces.test.mock.MockExternalContext;
-import org.apache.myfaces.test.mock.MockFacesContext;
-import org.apache.myfaces.test.mock.MockFacesContextFactory;
-import org.apache.myfaces.test.mock.MockHttpServletRequest;
-import org.apache.myfaces.test.mock.MockHttpServletResponse;
-import org.apache.myfaces.test.mock.MockHttpSession;
-import org.apache.myfaces.test.mock.MockRenderKit;
-import org.apache.myfaces.test.mock.MockServletConfig;
-import org.apache.myfaces.test.mock.MockServletContext;
-import org.apache.myfaces.test.mock.lifecycle.MockLifecycle;
-import org.apache.myfaces.test.mock.lifecycle.MockLifecycleFactory;
-
-/**
- * <p>Abstract JUnit test case base class, which sets up the JavaServer Faces
- * mock object environment for a particular simulated request. The following
- * protected variables are initialized in the <code>setUp()</code> method, and
- * cleaned up in the <code>tearDown()</code> method:</p>
- * <ul>
- * <li><code>application</code> (<code>MockApplication</code>)</li>
- * <li><code>config</code> (<code>MockServletConfig</code>)</li>
- * <li><code>externalContext</code> (<code>MockExternalContext</code>)</li>
- * <li><code>facesContext</code> (<code>MockFacesContext</code>)</li>
- * <li><code>lifecycle</code> (<code>MockLifecycle</code>)</li>
- * <li><code>request</code> (<code>MockHttpServletRequest</code></li>
- * <li><code>response</code> (<code>MockHttpServletResponse</code>)</li>
- * <li><code>servletContext</code> (<code>MockServletContext</code>)</li>
- * <li><code>session</code> (<code>MockHttpSession</code>)</li>
- * </ul>
- *
- * <p>In addition, appropriate factory classes will have been registered with
- * <code>javax.faces.FactoryFinder</code> for <code>Application</code> and
- * <code>RenderKit</code> instances. The created <code>FacesContext</code>
- * instance will also have been registered in the proper thread local
- * variable, to simulate what a servlet container would do.</p>
- *
- * <p><strong>WARNING</strong> - If you choose to subclass this class, be sure
- * your <code>setUp()</code> and <code>tearDown()</code> methods call
- * <code>super.setUp()</code> and <code>super.tearDown()</code> respectively,
- * and that you implement your own <code>suite()</code> method that exposes
- * the test methods for your test case.</p>
- *
- * @since 1.0.0
- */
-
-public abstract class AbstractJsfTestCase extends TestCase
-{
-
- // ------------------------------------------------------------ Constructors
-
- /**
- * <p>Construct a new instance of this test case.</p>
- *
- * @param name Name of this test case
- */
- public AbstractJsfTestCase(String name)
- {
- super(name);
- }
-
- // ---------------------------------------------------- Overall Test Methods
-
- /**
- * <p>Set up instance variables required by this test case.</p>
- */
- protected void setUp() throws Exception
- {
- // Set up a new thread context class loader
- setUpClassloader();
-
- // Set up Servlet API Objects
- setUpServletObjects();
-
- // Set up JSF API Objects
- FactoryFinder.releaseFactories();
-
- setFactories();
-
- setUpJSFObjects();
- }
-
- /**
- * Set up the thread context classloader. JSF uses the this classloader
- * in order to find related factory classes and other resources, but in
- * some selected cases, the default classloader cannot be properly set.
- *
- * @throws Exception
- */
- protected void setUpClassloader() throws Exception
- {
- threadContextClassLoader = Thread.currentThread()
- .getContextClassLoader();
- Thread.currentThread()
- .setContextClassLoader(
- new URLClassLoader(new URL[0], this.getClass()
- .getClassLoader()));
- classLoaderSet = true;
- }
-
- /**
- * <p>Setup JSF object used for the test. By default it calls to the following
- * methods in this order:</p>
- *
- * <ul>
- * <li><code>setUpExternalContext();</code></li>
- * <li><code>setUpLifecycle();</code></li>
- * <li><code>setUpFacesContext();</code></li>
- * <li><code>setUpView();</code></li>
- * <li><code>setUpApplication();</code></li>
- * <li><code>setUpRenderKit();</code></li>
- * </ul>
- *
- * @throws Exception
- */
- protected void setUpJSFObjects() throws Exception
- {
- setUpExternalContext();
- setUpLifecycle();
- setUpFacesContext();
- setUpView();
- setUpApplication();
- setUpRenderKit();
- }
-
- /**
- * <p>Setup servlet objects that will be used for the test:</p>
- *
- * <ul>
- * <li><code>config</code> (<code>MockServletConfig</code>)</li>
- * <li><code>servletContext</code> (<code>MockServletContext</code>)</li>
- * <li><code>request</code> (<code>MockHttpServletRequest</code></li>
- * <li><code>response</code> (<code>MockHttpServletResponse</code>)</li>
- * <li><code>session</code> (<code>MockHttpSession</code>)</li>
- * </ul>
- *
- * @throws Exception
- */
- protected void setUpServletObjects() throws Exception
- {
- servletContext = new MockServletContext();
- config = new MockServletConfig(servletContext);
- session = new MockHttpSession();
- session.setServletContext(servletContext);
- request = new MockHttpServletRequest(session);
- request.setServletContext(servletContext);
- response = new MockHttpServletResponse();
- }
-
- /**
- * <p>Set JSF factories using FactoryFinder method setFactory.</p>
- *
- * @throws Exception
- */
- protected void setFactories() throws Exception
- {
- FactoryFinder.setFactory(FactoryFinder.APPLICATION_FACTORY,
- "org.apache.myfaces.test.mock.MockApplicationFactory");
- FactoryFinder.setFactory(FactoryFinder.FACES_CONTEXT_FACTORY,
- "org.apache.myfaces.test.mock.MockFacesContextFactory");
- FactoryFinder.setFactory(FactoryFinder.LIFECYCLE_FACTORY,
- "org.apache.myfaces.test.mock.lifecycle.MockLifecycleFactory");
- FactoryFinder.setFactory(FactoryFinder.RENDER_KIT_FACTORY,
- "org.apache.myfaces.test.mock.MockRenderKitFactory");
- FactoryFinder.setFactory(FactoryFinder.EXCEPTION_HANDLER_FACTORY,
- "org.apache.myfaces.test.mock.MockExceptionHandlerFactory");
- FactoryFinder.setFactory(FactoryFinder.PARTIAL_VIEW_CONTEXT_FACTORY,
- "org.apache.myfaces.test.mock.MockPartialViewContextFactory");
- FactoryFinder.setFactory(FactoryFinder.VISIT_CONTEXT_FACTORY,
- "org.apache.myfaces.test.mock.visit.MockVisitContextFactory");
- FactoryFinder.setFactory(FactoryFinder.CLIENT_WINDOW_FACTORY,
- "org.apache.myfaces.test.mock.MockClientWindowFactory");
- }
-
- /**
- * Setup the <code>externalContext</code> variable, using the
- * servlet variables already initialized.
- *
- * @throws Exception
- */
- protected void setUpExternalContext() throws Exception
- {
- externalContext = new MockExternalContext(servletContext, request, response);
- }
-
- /**
- * Setup the <code>lifecycle</code> and <code>lifecycleFactory</code>
- * variables.
- *
- * @throws Exception
- */
- protected void setUpLifecycle() throws Exception
- {
- lifecycleFactory = (MockLifecycleFactory) FactoryFinder
- .getFactory(FactoryFinder.LIFECYCLE_FACTORY);
- lifecycle = (MockLifecycle) lifecycleFactory
- .getLifecycle(LifecycleFactory.DEFAULT_LIFECYCLE);
- }
-
- /**
- * Setup the <code>facesContextFactory</code> and <code>facesContext</code>
- * variable. Before end, by default it override <code>externalContext</code>
- * variable from the value retrieved from facesContext.getExternalContext(),
- * because sometimes it is possible facesContext overrides externalContext
- * internally.
- *
- * @throws Exception
- */
- protected void setUpFacesContext() throws Exception
- {
- facesContextFactory = (MockFacesContextFactory) FactoryFinder
- .getFactory(FactoryFinder.FACES_CONTEXT_FACTORY);
- facesContext = (MockFacesContext) facesContextFactory.getFacesContext(
- servletContext, request, response, lifecycle);
- if (facesContext.getExternalContext() != null)
- {
- externalContext = (MockExternalContext) facesContext
- .getExternalContext();
- }
- }
-
- /**
- * By default, create an instance of UIViewRoot, set its viewId as "/viewId"
- * and assign it to the current facesContext.
- *
- * @throws Exception
- */
- protected void setUpView() throws Exception
- {
- UIViewRoot root = new UIViewRoot();
- root.setViewId("/viewId");
- root.setRenderKitId(RenderKitFactory.HTML_BASIC_RENDER_KIT);
- facesContext.setViewRoot(root);
- }
-
- /**
- * Setup the <code>application</code> variable and before
- * the end by default it is assigned to the <code>facesContext</code>
- * variable, calling <code>facesContext.setApplication(application)</code>
- *
- * @throws Exception
- */
- protected void setUpApplication() throws Exception
- {
- ApplicationFactory applicationFactory = (ApplicationFactory) FactoryFinder
- .getFactory(FactoryFinder.APPLICATION_FACTORY);
- application = (MockApplication) applicationFactory.getApplication();
- facesContext.setApplication(application);
- }
-
- /**
- * Setup the <code>renderKit</code> variable. This is a good place to use
- * <code>ConfigParser</code> to register converters, validators, components
- * or renderkits.
- *
- * @throws Exception
- */
- protected void setUpRenderKit() throws Exception
- {
- RenderKitFactory renderKitFactory = (RenderKitFactory) FactoryFinder
- .getFactory(FactoryFinder.RENDER_KIT_FACTORY);
- renderKit = new MockRenderKit();
- renderKitFactory.addRenderKit(RenderKitFactory.HTML_BASIC_RENDER_KIT,
- renderKit);
- }
-
- /**
- * <p>Tear down instance variables required by this test case.</p>
- */
- protected void tearDown() throws Exception
- {
-
- application = null;
- config = null;
- externalContext = null;
- if (facesContext != null)
- {
- facesContext.release();
- }
- facesContext = null;
- lifecycle = null;
- lifecycleFactory = null;
- renderKit = null;
- request = null;
- response = null;
- servletContext = null;
- session = null;
- FactoryFinder.releaseFactories();
- ResourceBundleVarNames.resetNames();
-
- tearDownClassloader();
- }
-
- protected void tearDownClassloader() throws Exception
- {
- if (classLoaderSet)
- {
- Thread.currentThread().setContextClassLoader(threadContextClassLoader);
- threadContextClassLoader = null;
- classLoaderSet = false;
- }
- }
-
- // ------------------------------------------------------ Instance Variables
-
- // Mock object instances for our tests
- protected MockApplication application = null;
- protected MockServletConfig config = null;
- protected MockExternalContext externalContext = null;
- protected MockFacesContext facesContext = null;
- protected MockFacesContextFactory facesContextFactory = null;
- protected MockLifecycle lifecycle = null;
- protected MockLifecycleFactory lifecycleFactory = null;
- protected MockRenderKit renderKit = null;
- protected MockHttpServletRequest request = null;
- protected MockHttpServletResponse response = null;
- protected MockServletContext servletContext = null;
- protected MockHttpSession session = null;
-
- // Thread context class loader saved and restored after each test
- private ClassLoader threadContextClassLoader = null;
- private boolean classLoaderSet = false;
-
-}
diff --git a/test/src/main/java/org/apache/myfaces/test/base/AbstractViewControllerTestCase.java b/test/src/main/java/org/apache/myfaces/test/base/AbstractViewControllerTestCase.java
deleted file mode 100644
index aefc876..0000000
--- a/test/src/main/java/org/apache/myfaces/test/base/AbstractViewControllerTestCase.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.test.base;
-
-import java.util.Iterator;
-
-/**
- * <p>Abstract base class for testing <code>ViewController</code>
- * implementations.</p>
- *
- * <p><strong>WARNING</strong> - If you choose to subclass this class, be sure
- * your <code>setUp()</code> and <code>tearDown()</code> methods call
- * <code>super.setUp()</code> and <code>super.tearDown()</code> respectively,
- * and that you implement your own <code>suite()</code> method that exposes
- * the test methods for your test case.</p>
- *
- * @since 1.0.0
- */
-public abstract class AbstractViewControllerTestCase extends
- AbstractJsfTestCase
-{
-
- // ------------------------------------------------------------ Constructors
-
- /**
- * <p>Construct a new instance of this test case.</p>
- *
- * @param name Test case name
- */
- public AbstractViewControllerTestCase(String name)
- {
- super(name);
- }
-
- // ---------------------------------------------------- Overall Test Methods
-
- // ------------------------------------------------------ Instance Variables
-
- // ------------------------------------------------------- Protected Methods
-
- /**
- * <p>Test that the specified number of messages have been queued on the
- * <code>FacesContext</code> instance, without regard to matching a
- * particular client identifier.</p>
- *
- * @param expected The expected number of messages
- */
- protected void checkMessageCount(int expected)
- {
-
- int actual = 0;
- Iterator messages = facesContext.getMessages();
- while (messages.hasNext())
- {
- messages.next();
- actual++;
- }
- assertEquals("Complete message count", expected, actual);
-
- }
-
- /**
- * <p>Test that the specified number of messages have been queued on the
- * <code>FacesContext</code> instance, for the specified client id.</p>
- *
- * @param clientId Client identifier of the component for which to
- * count queued messages
- * @param expected The expected number of messages
- */
- protected void checkMessageCount(String clientId, int expected)
- {
-
- int actual = 0;
- Iterator messages = facesContext.getMessages(clientId);
- while (messages.hasNext())
- {
- messages.next();
- actual++;
- }
- assertEquals("Complete message count", expected, actual);
-
- }
-
-}
diff --git a/test/src/main/java/org/apache/myfaces/test/base/junit4/AbstractJsfConfigurableMockTestCase.java b/test/src/main/java/org/apache/myfaces/test/base/junit4/AbstractJsfConfigurableMockTestCase.java
index 2df932b..b939233 100644
--- a/test/src/main/java/org/apache/myfaces/test/base/junit4/AbstractJsfConfigurableMockTestCase.java
+++ b/test/src/main/java/org/apache/myfaces/test/base/junit4/AbstractJsfConfigurableMockTestCase.java
@@ -33,6 +33,7 @@
import javax.faces.lifecycle.LifecycleFactory;
import javax.faces.render.RenderKit;
import javax.faces.render.RenderKitFactory;
+import junit.framework.TestCase;
import org.apache.myfaces.test.config.ResourceBundleVarNames;
import org.apache.myfaces.test.mock.MockExternalContext;
@@ -78,7 +79,7 @@
* @since 1.0.0
*/
-public abstract class AbstractJsfConfigurableMockTestCase
+public abstract class AbstractJsfConfigurableMockTestCase extends TestCase
{
// ------------------------------------------------------------ Constructors
diff --git a/test/src/main/java/org/apache/myfaces/test/base/junit4/AbstractJsfConfigurableMultipleRequestsTestCase.java b/test/src/main/java/org/apache/myfaces/test/base/junit4/AbstractJsfConfigurableMultipleRequestsTestCase.java
index 8ea0507..203321d 100644
--- a/test/src/main/java/org/apache/myfaces/test/base/junit4/AbstractJsfConfigurableMultipleRequestsTestCase.java
+++ b/test/src/main/java/org/apache/myfaces/test/base/junit4/AbstractJsfConfigurableMultipleRequestsTestCase.java
@@ -33,6 +33,7 @@
import javax.faces.lifecycle.LifecycleFactory;
import javax.faces.render.RenderKit;
import javax.faces.render.RenderKitFactory;
+import junit.framework.TestCase;
import org.apache.myfaces.test.config.ResourceBundleVarNames;
import org.apache.myfaces.test.mock.MockExternalContext;
@@ -82,7 +83,7 @@
* @since 1.0.3
*/
-public abstract class AbstractJsfConfigurableMultipleRequestsTestCase
+public abstract class AbstractJsfConfigurableMultipleRequestsTestCase extends TestCase
{
// ------------------------------------------------------------ Constructors
diff --git a/test/src/main/java/org/apache/myfaces/test/base/junit4/AbstractJsfTestCase.java b/test/src/main/java/org/apache/myfaces/test/base/junit4/AbstractJsfTestCase.java
index e1c4bf0..21c40a2 100644
--- a/test/src/main/java/org/apache/myfaces/test/base/junit4/AbstractJsfTestCase.java
+++ b/test/src/main/java/org/apache/myfaces/test/base/junit4/AbstractJsfTestCase.java
@@ -27,6 +27,7 @@
import javax.faces.component.UIViewRoot;
import javax.faces.lifecycle.LifecycleFactory;
import javax.faces.render.RenderKitFactory;
+import junit.framework.TestCase;
import org.apache.myfaces.test.config.ResourceBundleVarNames;
import org.apache.myfaces.test.mock.MockApplication;
@@ -76,7 +77,7 @@
* @since 1.0.0
*/
-public abstract class AbstractJsfTestCase
+public abstract class AbstractJsfTestCase extends TestCase
{
// ------------------------------------------------------------ Constructors
diff --git a/test/src/main/java/org/apache/myfaces/test/htmlunit/AbstractHtmlUnitTestCase.java b/test/src/main/java/org/apache/myfaces/test/htmlunit/AbstractHtmlUnitTestCase.java
deleted file mode 100644
index 19541a4..0000000
--- a/test/src/main/java/org/apache/myfaces/test/htmlunit/AbstractHtmlUnitTestCase.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.test.htmlunit;
-
-import com.gargoylesoftware.htmlunit.ElementNotFoundException;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
-import com.gargoylesoftware.htmlunit.html.HtmlBody;
-import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlHead;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Iterator;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * <p>Abstract base class for system integration tests based on HtmlUnit.
- * These tests will expect a system property named <code>url</code> to be
- * present, which will define the URL (including the context path, but
- * without a trailing slash) of the application to be tested.</p>
- *
- * @since 1.0.0
- */
-public abstract class AbstractHtmlUnitTestCase extends TestCase
-{
-
- // ------------------------------------------------------------ Constructors
-
- /**
- * <p>Construct a new instance of this test case.</p>
- *
- * @param name Name of the new test case
- */
- public AbstractHtmlUnitTestCase(String name)
- {
-
- super(name);
-
- }
-
- // ------------------------------------------------------ Instance Variables
-
- /**
- * <p>The most recently retrieved page from the server.</p>
- */
- protected HtmlPage page = null;
-
- /**
- * <p>The calculated URL for the installed "systest" web application.
- * This value is based on a system property named <code>url</code>,
- * which must be defined as part of the command line that executes
- * each test case.</p>
- */
- protected URL url = null;
-
- /**
- * <p>The web client for this test case.</p>
- */
- protected WebClient webClient = null;
-
- // ------------------------------------------------------ Test Setup Methods
-
- /**
- * <p>Set up the instance variables required for this test case.</p>
- *
- * @exception Exception if an error occurs
- */
- protected void setUp() throws Exception
- {
-
- // Calculate the URL for the installed "systest" web application
- String url = System.getProperty("url");
- this.url = new URL(url + '/');
-
- // Initialize HtmlUnit constructs for this test case
- webClient = new WebClient();
-
- }
-
- /**
- * <p>Return the set of tests included in this test suite.</p>
- */
- public static Test suite()
- {
-
- return (new TestSuite(AbstractHtmlUnitTestCase.class));
-
- }
-
- /**
- * <p>Tear down instance variables required by this test case.</p>
- */
- protected void tearDown() throws Exception
- {
-
- page = null;
- url = null;
- webClient = null;
-
- }
-
- // ------------------------------------------------------- Protected Methods
-
- /**
- * <p>Return the body element for the most recently retrieved page.
- * If there is no such element, return <code>null</code>.</p>
- *
- * @exception Exception if an error occurs
- */
- protected HtmlBody body() throws Exception
- {
-
- Iterable<HtmlElement> elements = page.getHtmlElementDescendants();
- for (HtmlElement element : elements)
- {
- if (element instanceof HtmlBody)
- {
- return ((HtmlBody) element);
- }
- }
- return (null);
-
- }
-
- /**
- * <p>Return the HTML element with the specified <code>id</code> from the
- * most recently retrieved page. If there is no such element, return
- * <code>null</code>.</p>
- *
- * @param id Identifier of the requested element.
- *
- * @exception Exception if an error occurs
- */
- protected HtmlElement element(String id) throws Exception
- {
-
- try
- {
- return (page.getHtmlElementById(id));
- }
- catch (ElementNotFoundException e)
- {
- return (null);
- }
-
- }
-
- /**
- * <p>Return the form with the specified <code>id</code> from the most
- * recently retrieved page. If there is no such form, return
- * <code>null</code>.<p>
- *
- * @param id Identifier of the requested form.
- *
- * @exception Exception if an error occurs
- */
- protected HtmlForm form(String id) throws Exception
- {
-
- Iterator forms = page.getForms().iterator();
- while (forms.hasNext())
- {
- HtmlForm form = (HtmlForm) forms.next();
- if (id.equals(form.getAttribute("id")))
- {
- return (form);
- }
- }
- return (null);
-
- }
-
- /**
- * <p>Return the head element for the most recently retrieved page.
- * If there is no such element, return <code>null</code>.</p>
- *
- * @exception Exception if an error occurs
- */
- protected HtmlHead head() throws Exception
- {
-
- Iterable<HtmlElement> elements = page.getHtmlElementDescendants();
- for (HtmlElement element : elements)
- {
- if (element instanceof HtmlHead)
- {
- return ((HtmlHead) element);
- }
- }
- return (null);
-
- }
-
- /**
- * <p>Click the specified hyperlink, and retrieve the subsequent page,
- * saving a reference so that other utility methods may be used to
- * retrieve information from it.</p>
- *
- * @param anchor Anchor component to click
- *
- * @exception IOException if an input/output error occurs
- */
- protected HtmlPage link(HtmlAnchor anchor) throws IOException
- {
-
- HtmlPage page = (HtmlPage) anchor.click();
- this.page = page;
- return page;
-
- }
-
- /**
- * <p>Return the currently stored page reference.</p>
- */
- protected HtmlPage page()
- {
-
- return this.page;
-
- }
-
- /**
- * <p>Retrieve and return the page at the specified context relative path.
- * Save a reference to this page so that other utility methods may be used
- * to retrieve information from it.</p>
- *
- * @param path Context relative path
- *
- * @exception IllegalArgumentException if the context relative path
- * does not begin with a '/' character
- * @exception Exception if a different error occurs
- */
- protected HtmlPage page(String path) throws Exception
- {
-
- HtmlPage page = (HtmlPage) webClient.getPage(url(path));
- this.page = page;
- return (page);
-
- }
-
- /**
- * <p>Reset the stored page reference to the specified value. This is
- * useful for scenarios testing resubmit of the same page (simulating the
- * user pressing the back button and then submitting again).</p>
- *
- * @param page Previously saved page to which to reset
- */
- protected void reset(HtmlPage page)
- {
-
- this.page = page;
-
- }
-
- /**
- * <p>Submit the current page, using the specified component, and retrieve
- * the subsequent page, saving a reference so that other utility methods
- * may be used to retrieve information from it.</p>
- *
- * @param submit Submit button component to click
- *
- * @exception IOException if an input/output error occurs
- */
- protected HtmlPage submit(HtmlSubmitInput submit) throws IOException
- {
-
- HtmlPage page = (HtmlPage) submit.click();
- this.page = page;
- return page;
-
- }
-
- /**
- * <p>Return the page title from the most recently retrieved page.
- * Any leading and trailing whitespace will be trimmed.</p>
- *
- * @exception Exception if an error occurs
- */
- protected String title() throws Exception
- {
-
- return (page.getTitleText().trim());
-
- }
-
- /**
- * <p>Calculate and return an absolute URL for the specified context
- * relative path, which must begin with a '/' character.</p>
- *
- * @param path Context relative path
- *
- * @exception IllegalArgumentException if the context relative path
- * does not begin with a '/' character
- * @exception Exception if a different error ocurs
- */
- protected URL url(String path) throws Exception
- {
-
- if (path.charAt(0) != '/')
- {
- throw new IllegalArgumentException("Context path '" + path
- + "' does not start with '/'");
- }
- return new URL(url, path.substring(1));
-
- }
-
-}
diff --git a/test/src/main/java/org/apache/myfaces/test/jmock/AbstractJmockJsfTestCase.java b/test/src/main/java/org/apache/myfaces/test/jmock/AbstractJmockJsfTestCase.java
index e50c329..244943c 100644
--- a/test/src/main/java/org/apache/myfaces/test/jmock/AbstractJmockJsfTestCase.java
+++ b/test/src/main/java/org/apache/myfaces/test/jmock/AbstractJmockJsfTestCase.java
@@ -78,18 +78,6 @@
public abstract class AbstractJmockJsfTestCase extends MockObjectTestCase
{
- // ------------------------------------------------------------ Constructors
-
- /**
- * <p>Construct a new instance of this test case.</p>
- *
- * @param name Name of this test case
- */
- public AbstractJmockJsfTestCase(String name)
- {
- setName(name);
- }
-
// ---------------------------------------------------- Overall Test Methods
/**
