You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by aw...@apache.org on 2006/07/14 21:09:31 UTC
svn commit: r422050 [2/3] - in /incubator/adffaces/trunk/adf-faces: ./
adf-faces-api/ adf-faces-api/src/test/java/org/apache/myfaces/adf/component/
adf-faces-api/src/test/java/org/apache/myfaces/adf/component/core/
adf-faces-api/src/test/java/org/apach...
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlCellFormatTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlCellFormatTest.java?rev=422050&r1=422049&r2=422050&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlCellFormatTest.java (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlCellFormatTest.java Fri Jul 14 14:09:28 2006
@@ -17,6 +17,9 @@
import java.io.IOException;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
import org.apache.myfaces.adf.component.UIComponentTestCase;
/**
@@ -35,6 +38,21 @@
String testName)
{
super(testName);
+ }
+
+ public void setUp()
+ {
+ super.setUp();
+ }
+
+ public void tearDown()
+ {
+ super.tearDown();
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite(HtmlCellFormatTest.class);
}
/**
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlFrameBorderLayoutTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlFrameBorderLayoutTest.java?rev=422050&r1=422049&r2=422050&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlFrameBorderLayoutTest.java (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlFrameBorderLayoutTest.java Fri Jul 14 14:09:28 2006
@@ -17,6 +17,9 @@
import java.io.IOException;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
import org.apache.myfaces.adf.component.UIComponentTestCase;
/**
@@ -35,6 +38,21 @@
String testName)
{
super(testName);
+ }
+
+ public void setUp()
+ {
+ super.setUp();
+ }
+
+ public void tearDown()
+ {
+ super.tearDown();
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite(HtmlFrameBorderLayoutTest.class);
}
/**
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlFrameTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlFrameTest.java?rev=422050&r1=422049&r2=422050&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlFrameTest.java (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlFrameTest.java Fri Jul 14 14:09:28 2006
@@ -17,6 +17,9 @@
import java.io.IOException;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
import org.apache.myfaces.adf.component.UIComponentTestCase;
/**
@@ -35,6 +38,21 @@
String testName)
{
super(testName);
+ }
+
+ public void setUp()
+ {
+ super.setUp();
+ }
+
+ public void tearDown()
+ {
+ super.tearDown();
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite(HtmlFrameTest.class);
}
/**
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlHtmlTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlHtmlTest.java?rev=422050&r1=422049&r2=422050&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlHtmlTest.java (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlHtmlTest.java Fri Jul 14 14:09:28 2006
@@ -17,6 +17,9 @@
import java.io.IOException;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
import org.apache.myfaces.adf.component.UIComponentTestCase;
/**
@@ -36,6 +39,21 @@
String testName)
{
super(testName);
+ }
+
+ public void setUp()
+ {
+ super.setUp();
+ }
+
+ public void tearDown()
+ {
+ super.tearDown();
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite(HtmlHtmlTest.class);
}
/**
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlRowLayoutTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlRowLayoutTest.java?rev=422050&r1=422049&r2=422050&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlRowLayoutTest.java (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlRowLayoutTest.java Fri Jul 14 14:09:28 2006
@@ -17,6 +17,9 @@
import java.io.IOException;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
import org.apache.myfaces.adf.component.UIComponentTestCase;
/**
@@ -35,6 +38,21 @@
String testName)
{
super(testName);
+ }
+
+ public void setUp()
+ {
+ super.setUp();
+ }
+
+ public void tearDown()
+ {
+ super.tearDown();
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite(HtmlRowLayoutTest.class);
}
/**
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlScriptTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlScriptTest.java?rev=422050&r1=422049&r2=422050&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlScriptTest.java (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlScriptTest.java Fri Jul 14 14:09:28 2006
@@ -17,6 +17,9 @@
import java.io.IOException;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
import org.apache.myfaces.adf.component.UIComponentTestCase;
/**
@@ -35,6 +38,21 @@
String testName)
{
super(testName);
+ }
+
+ public void setUp()
+ {
+ super.setUp();
+ }
+
+ public void tearDown()
+ {
+ super.tearDown();
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite(HtmlScriptTest.class);
}
/**
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlTableLayoutTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlTableLayoutTest.java?rev=422050&r1=422049&r2=422050&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlTableLayoutTest.java (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/component/html/HtmlTableLayoutTest.java Fri Jul 14 14:09:28 2006
@@ -17,6 +17,9 @@
import java.io.IOException;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
import org.apache.myfaces.adf.component.UIComponentTestCase;
/**
@@ -35,6 +38,21 @@
String testName)
{
super(testName);
+ }
+
+ public void setUp()
+ {
+ super.setUp();
+ }
+
+ public void tearDown()
+ {
+ super.tearDown();
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite(HtmlTableLayoutTest.class);
}
/**
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/AdfDateTimeConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/AdfDateTimeConverterTest.java?rev=422050&r1=422049&r2=422050&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/AdfDateTimeConverterTest.java (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/AdfDateTimeConverterTest.java Fri Jul 14 14:09:28 2006
@@ -21,17 +21,17 @@
import java.util.Locale;
import java.util.TimeZone;
-import javax.faces.component.UIViewRoot;
+import javax.faces.component.UIComponent;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
-import org.apache.myfaces.adf.context.AdfFacesContext;
-import org.apache.myfaces.adf.context.MockAdfFacesContext;
-
-import javax.faces.component.MockUIComponent;
-import javax.faces.context.MockFacesContext;
+import junit.framework.Test;
+import junit.framework.TestSuite;
-import org.apache.myfaces.adfbuild.test.MockUtils;
+import org.apache.myfaces.adf.context.MockAdfFacesContext;
+import org.apache.myfaces.adfbuild.test.MockUIComponentWrapper;
+import org.apache.shale.test.mock.MockFacesContext;
+import org.jmock.Mock;
public class AdfDateTimeConverterTest extends DateTimeConverterTestCase
{
@@ -39,6 +39,28 @@
{
super(name);
}
+
+
+ public void setUp()
+ {
+ super.setUp();
+ _mafct = new MockAdfFacesContext();
+ _mafct.setTwoDigitYearStart(1950);
+ _mafct.setTimeZone(DEFAULT_TIME_ZONE);
+ }
+
+ public void tearDown()
+ {
+ super.tearDown();
+ _mafct.release();
+ _mafct = null;
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite(AdfDateTimeConverterTest.class);
+ }
+
/**
* @todo move this to the parent class once JSF fixes the bug
@@ -59,20 +81,19 @@
Date date = gcal.getTime();
DateTimeConverter dtConv = new DateTimeConverter();
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = MockUtils.buildMockUIComponent();
+ Mock mock = buildMockUIComponent();
+ UIComponent component = (UIComponent) mock.proxy();
String inputValue = "6/4/2999";
dtConv.setDateStyle("shortish");
dtConv.setLocale(Locale.ENGLISH);
- Date dt = (Date) dtConv.getAsObject(context, component, inputValue);
+ Date dt = (Date) dtConv.getAsObject(facesContext, component, inputValue);
assertEquals(true, isEqual(date, dt));
- String exptectedStr = dtConv.getAsString(context, component, dt);
+ String exptectedStr = dtConv.getAsString(facesContext, component, dt);
assertEquals(inputValue, exptectedStr);
- context.verify();
- component.verify();
+ mock.verify();
}
public void testShortishDateStyle()
@@ -91,8 +112,8 @@
Date date = gcal.getTime();
DateTimeConverter dtConv = new DateTimeConverter();
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = MockUtils.buildMockUIComponent();
+ Mock mock = buildMockUIComponent();
+ UIComponent component = (UIComponent) mock.proxy();
String inputValue = "6/4/1600";
String secondaryPattern = "MM/d/yyyy";
@@ -101,12 +122,12 @@
dtConv.setType("Let us un set it");
dtConv.setSecondaryPattern(secondaryPattern);
// This should work fine
- Date dt = (Date) dtConv.getAsObject(context, component, inputValue);
+ Date dt = (Date) dtConv.getAsObject(facesContext, component, inputValue);
assertEquals(true, isEqual(date, dt));
try
{
- dtConv.getAsString(context, component, dt);
+ dtConv.getAsString(facesContext, component, dt);
fail("Use of secondary pattern in the above fashion is expected to fail here");
}
catch (RuntimeException ce)
@@ -119,11 +140,10 @@
// now we set date and type so this is expected to work fine.
- String expectedOut = dtConv.getAsString(context, component, date);
+ String expectedOut = dtConv.getAsString(facesContext, component, date);
assertEquals(inputValue, expectedOut);
- context.verify();
- component.verify();
+ mock.verify();
}
public void testLeniencyOnPrimaryPattern()
@@ -140,15 +160,6 @@
dotestLeniencyOnPattern(primaryPattern, secondaryPattern);
}
- private void _setupFacesContext(MockFacesContext context, int count)
- {
- UIViewRoot uiRoot = new UIViewRoot();
- uiRoot.setLocale(Locale.ENGLISH);
-
- for (int j = 0; j < count; j++)
- context.setupGetViewRoot(uiRoot);
- }
-
protected void dotestLeniencyOnPattern(
String primaryPattern,
String secondaryPatttern
@@ -173,11 +184,11 @@
GregorianCalendar cal = new GregorianCalendar(2004, Calendar.JUNE, 4);
cal.setTimeZone(DEFAULT_TIME_ZONE);
Date dt = cal.getTime();
- MockUIComponent component
- = MockUtils.buildMockUIComponent(iterations);
+ Mock mock = buildMockUIComponent(iterations);
+ UIComponent component = (UIComponent) mock.proxy();
+
for (int i = 0; i < validInputs.length; i++)
{
- MockFacesContext context = new MockFacesContext();
DateTimeConverter
dtConv = (DateTimeConverter) getDateTimeConverter();
dtConv.setLocale(Locale.ENGLISH);
@@ -186,13 +197,10 @@
dtConv.setTimeZone(DEFAULT_TIME_ZONE);
dtConv.setType("INVALID"); // make this type invalid
- _setupFacesContext(context, validInputs.length * 3);
-
- Date convDate = (Date) dtConv.getAsObject(context, component,
+ Date convDate = (Date) dtConv.getAsObject(facesContext, component,
validInputs[i]);
assertEquals(convDate, dt);
- context.verify();
- component.verify();
+ mock.verify();
}
}
@@ -214,15 +222,14 @@
fdtConv.setLocale((Locale)data[i][2]);
fdtConv.setTimeZone((TimeZone)data[i][3]);
- MockFacesContext context = new MockFacesContext();
- _setupFacesContext(context, 4);
- MockUIComponent component = MockUtils.buildMockUIComponent();
- Date dtConvDate = (Date)dtConv.getAsObject(context, component, inputValue);
- Date fdtConvDate = (Date)fdtConv.getAsObject(context, component, inputValue);
+ Mock mock = buildMockUIComponent();
+ UIComponent component = (UIComponent) mock.proxy();
+ Date dtConvDate = (Date)dtConv.getAsObject(facesContext, component, inputValue);
+ Date fdtConvDate = (Date)fdtConv.getAsObject(facesContext, component, inputValue);
// assertEquals(dtConvDate, fdtConvDate);
- String dtConvPattern = dtConv.getAsString(context, component, dtConvDate);
- String fdtConvPattern = fdtConv.getAsString(context, component, dtConvDate);
+ String dtConvPattern = dtConv.getAsString(facesContext, component, dtConvDate);
+ String fdtConvPattern = fdtConv.getAsString(facesContext, component, dtConvDate);
// assertEquals(dtConvPattern, fdtConvPattern);
}
}
@@ -244,10 +251,10 @@
Converter conv1,
Converter conv2,
MockFacesContext context,
- MockUIComponent component
+ MockUIComponentWrapper wrapper
)
{
- super.doTestStateHolderSaveRestore(conv1, conv2, context, component);
+ super.doTestStateHolderSaveRestore(conv1, conv2, context, wrapper);
}
public void testCustomMessageIsSet()
@@ -262,19 +269,16 @@
for (int i = 0; i < failingValues.length ; i++)
{
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = MockUtils.buildMockUIComponent(3 * 4);
+ Mock mock = buildMockUIComponent(3 * 4);
+ UIComponent component = (UIComponent) mock.proxy();
org.apache.myfaces.adf.convert.DateTimeConverter converter =
new org.apache.myfaces.adf.convert.DateTimeConverter();
- UIViewRoot root = new UIViewRoot();
- root.setLocale(Locale.US);
-
for (int j = 0; j < 3; j++)
{
for (int k = 0; k < 4; k++)
- context.setupGetViewRoot(root);
+ facesContext.getViewRoot().setLocale(Locale.US);
}
try
@@ -296,7 +300,7 @@
else
converter.setType(types[i]);
- Object obj = converter.getAsObject(context, component, failingValues[i]);
+ Object obj = converter.getAsObject(facesContext, component, failingValues[i]);
fail("Expected converter exception");
}
catch (ConverterException ce)
@@ -308,19 +312,6 @@
}
}
- protected void setUp()
- {
- _mafct = new MockAdfFacesContext();
- _mafct.setTwoDigitYearStart(1950);
- _mafct.setTimeZone(DEFAULT_TIME_ZONE);
- }
-
- protected void tearDown()
- {
- _mafct.release();
- _mafct = null;
- }
-
private Object[][] _getDataForPatterns()
{
// pattern, inputvalue,locale,timezone
@@ -347,5 +338,4 @@
private MockAdfFacesContext _mafct;
private static final TimeZone DEFAULT_TIME_ZONE = TimeZone.getDefault();
-}
-
+}
\ No newline at end of file
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/AdfNumberConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/AdfNumberConverterTest.java?rev=422050&r1=422049&r2=422050&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/AdfNumberConverterTest.java (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/AdfNumberConverterTest.java Fri Jul 14 14:09:28 2006
@@ -13,22 +13,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.myfaces.adf.convert;
+
import java.text.DecimalFormatSymbols;
import java.util.Locale;
-import javax.faces.component.UIViewRoot;
import javax.faces.convert.ConverterException;
import javax.faces.convert.NumberConverter;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIViewRoot;
-import org.apache.myfaces.adf.context.AdfFacesContext;
import org.apache.myfaces.adf.context.MockAdfFacesContext;
-import org.apache.myfaces.adfbuild.test.MockUtils;
+import org.apache.myfaces.adfbuild.test.MockUIComponentWrapper;
+import org.apache.shale.test.mock.MockFacesContext;
+import org.jmock.Mock;
-import javax.faces.component.MockUIComponent;
-import javax.faces.context.MockFacesContext;
+import junit.framework.Test;
+import junit.framework.TestSuite;
/**
* Test ADF NumberConverter
@@ -47,25 +49,31 @@
return new org.apache.myfaces.adf.convert.NumberConverter();
}
- protected void setUp()
+ public void setUp()
{
+ super.setUp();
_mafct = new MockAdfFacesContext();
_mafct.setDecimalSeparator('.');
_mafct.setNumberGroupingSeparator(',');
_mafct.setCurrencyCode(null);
}
- protected void tearDown()
+ public void tearDown()
{
-
- // AdfFacesContext uses a thread local variable to hold itself and has a
- // check in it. So you need to release, since all instances for tests
- // are created on the same thread by Junit.
+
+ // AdfFacesContext uses a thread local variable to hold itself and has a
+ // check in it. So you need to release, since all instances for tests
+ // are created on the same thread by Junit.
_mafct.release();
-
_mafct = null;
+ super.tearDown();
}
+ public static Test suite()
+ {
+ return new TestSuite(AdfNumberConverterTest.class);
+ }
+
public void testCurrencyCodeIsHonoured()
{
DecimalFormatSymbols symbols = new DecimalFormatSymbols(Locale.US);
@@ -76,41 +84,39 @@
public void testValueSetInAdfFacesContextIsHonoured()
{
- tearDown();
+ //ugly ?
+ _mafct.release();
+ _mafct = null;
_mafct = new MockAdfFacesContext();
_mafct.setDecimalSeparator('*');
_mafct.setNumberGroupingSeparator('!');
_mafct.setCurrencyCode(null);
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
NumberConverter conv = getNumberConverter();
conv.setLocale(Locale.US);
Number inputValue = new Double(8989.789);
- String out = conv.getAsString(context, component, inputValue);
+ String out = conv.getAsString(facesContext, component, inputValue);
assertEquals("8!989*789", out);
- context.verify();
- component.verify();
+ mock.verify();
}
protected void doTestStrictNess(
MockFacesContext context,
- MockUIComponent component,
+ MockUIComponentWrapper wrapper,
Locale locale,
String inputValue)
{
NumberConverter converter = getNumberConverter();
converter.setLocale(locale);
- UIViewRoot root = new UIViewRoot();
- root.setLocale(locale);
- context.setupGetViewRoot(root);
- context.setupGetViewRoot(root);
+ context.getViewRoot().setLocale(locale);
try
{
// ADF Converter is not lenient.
- Object obj = converter.getAsObject(context, component, inputValue);
+ Object obj = converter.getAsObject(context, wrapper.getUIComponent(), inputValue);
fail("Expected converter exception");
}
catch (ConverterException ce)
@@ -128,17 +134,21 @@
for (int i = 0; i < failingValues.length ; i++)
{
MockFacesContext context = new MockFacesContext();
- MockUIComponent component = MockUtils.buildMockUIComponent(3);
+ Mock mock = buildMockUIComponent(3);
+ UIComponent component = (UIComponent) mock.proxy();
+ MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
+
org.apache.myfaces.adf.convert.NumberConverter converter =
new org.apache.myfaces.adf.convert.NumberConverter();
- UIViewRoot root = new UIViewRoot();
+ UIViewRoot root = facesContext.getViewRoot();
root.setLocale(Locale.US);
+
for (int j = 0; j < 3; j++)
{
- context.setupGetViewRoot(root);
+ context.setViewRoot(root);
}
try
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/ColorConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/ColorConverterTest.java?rev=422050&r1=422049&r2=422050&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/ColorConverterTest.java (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/ColorConverterTest.java Fri Jul 14 14:09:28 2006
@@ -19,16 +19,21 @@
import java.awt.Color;
import java.util.ArrayList;
import java.util.List;
-import java.util.Locale;
-import javax.faces.component.UIViewRoot;
+
+import javax.faces.component.UIComponent;
import javax.faces.convert.ConverterException;
-import javax.faces.component.MockUIComponent;
-import javax.faces.context.MockFacesContext;;
+
+import org.apache.myfaces.adfbuild.test.MockUIComponentWrapper;
+import org.jmock.Mock;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
/**
* Unit tests for ColorConverter
* @version $Name: $ ($Revision: adfrt/faces/adf-faces-api/src/test/java/oracle/adf/view/faces/convert/ColorConverterTest.java#1 $) $Date: 16-aug-2005.15:12:23 $
* @author vijay venkataraman (vijay.venkataraman@oracle.com)
+ * @author Matthias Wessendorf
*/
public class ColorConverterTest extends ConverterTestCase
{
@@ -37,6 +42,21 @@
super(testName);
}
+ public void setUp()
+ {
+ super.setUp();
+ }
+
+ public void tearDown()
+ {
+ super.tearDown();
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite(ColorConverterTest.class);
+ }
+
/**
* Tests that null returns immediately.
*
@@ -44,11 +64,13 @@
*/
public void testNull() throws ConverterException
{
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
+ MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
+
ColorConverter converter = new ColorConverter();
- doTestNull(context, component, converter);
+ doTestNull(facesContext, wrapper, converter);
}
/**
@@ -56,18 +78,19 @@
*/
public void testNullContext()
{
- MockUIComponent component = new MockUIComponent();
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
+ MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
ColorConverter converter = new ColorConverter();
- doTestNullContext(component, converter);
+ doTestNullContext(wrapper, converter);
}
public void testNullComponent()
{
- MockFacesContext context = new MockFacesContext();
ColorConverter converter = new ColorConverter();
- doTestNullComponent(context, converter);
+ doTestNullComponent(facesContext, converter);
}
public void testEmptyValueConversion()
@@ -112,11 +135,12 @@
public void testDefaultColorPatternWorks()
{
ColorConverter converter = new ColorConverter();
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
+ MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
String value = "#FFFFFF";
Color expectedColor = new Color(255,255,255);
- doTestGetAsObject(converter, context, component, value, expectedColor);
+ doTestGetAsObject(converter, facesContext, wrapper, value, expectedColor);
}
/**
@@ -125,8 +149,9 @@
public void testStateHolderSaveRestore()
{
ColorConverter converter = new ColorConverter();
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
+ MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
String[] patterns = {"#RRGGBB","RR.GG.BB"};
converter.setPatterns(patterns);
@@ -134,9 +159,8 @@
ColorConverter restoreConverter = new ColorConverter();
doTestStateHolderSaveRestore(converter, restoreConverter,
- context, component);
- context.verify();
- component.verify();
+ facesContext, wrapper);
+ mock.verify();
}
/**
* Test ColorConverte's getAsObject(FacesContext, UIComponent, String) method
@@ -145,8 +169,9 @@
public void testGetAsObjectConversion()
{
ColorConverter converter = new ColorConverter();
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
+ MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
String[] patterns = { "#RRGGBB",
"RR.GG.BB",
@@ -174,10 +199,9 @@
converter.setPatterns(patterns);
for (int i = 0; i < values.length; i++)
{
- doTestGetAsObject(converter, context, component,values[i], matchColors[i]);
+ doTestGetAsObject(converter, facesContext, wrapper, values[i], matchColors[i]);
}
- context.verify();
- component.verify();
+ mock.verify();
}
/**
@@ -187,8 +211,9 @@
public void testGetAsString()
{
ColorConverter converter = new ColorConverter();
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
+ MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
Color[] colors = { new Color(255,2,4),
new Color(255,2,6),
@@ -215,11 +240,10 @@
{
String[] patterns = (String[]) patternsHoloder.get(i);
converter.setPatterns(patterns);
- doTestGetAsString(converter, context, component,
+ doTestGetAsString(converter, facesContext, wrapper,
colors[i], matchValues[i] );
}
- context.verify();
- component.verify();
+ mock.verify();
}
/**
@@ -228,9 +252,8 @@
public void testNullValueForPatterns()
{
ColorConverter converter = new ColorConverter();
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
-
+ Mock mock = mock(UIComponent.class);
+
try
{
converter.setPatterns(null);
@@ -240,29 +263,24 @@
{
// expected fine
}
- context.verify();
- component.verify();
+ mock.verify();
}
public void testGetAsObjectIllegalValue()
{
ColorConverter converter = new ColorConverter();
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
- UIViewRoot root = new UIViewRoot();
- root.setLocale(new Locale("xx","MOCK"));
- component.setupGetId("test");
- context.setupGetViewRoot(root);
- context.setupGetViewRoot(root);
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
+ mock.stubs().method("getId").will(returnValue("test"));
+ //component.setupGetId("test");
try
{
- converter.getAsString(context, component, new Integer(1));
+ converter.getAsString(facesContext, component, new Integer(1));
fail("Expected a converter exception");
} catch (IllegalArgumentException ex)
{
// expected
}
- context.verify();
- component.verify();
+ mock.verify();
}
-}
+}
\ No newline at end of file
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/ConverterTestCase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/ConverterTestCase.java?rev=422050&r1=422049&r2=422050&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/ConverterTestCase.java (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/ConverterTestCase.java Fri Jul 14 14:09:28 2006
@@ -18,14 +18,13 @@
import javax.faces.component.StateHolder;
import javax.faces.component.UIComponent;
-import javax.faces.component.UIViewRoot;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
-import junit.framework.TestCase;
-
-import javax.faces.component.MockUIComponent;
-import javax.faces.context.MockFacesContext;
+import org.apache.myfaces.adfbuild.test.AbstractBaseTestCase;
+import org.apache.myfaces.adfbuild.test.MockUIComponentWrapper;
+import org.apache.shale.test.mock.MockFacesContext;
+import org.jmock.Mock;
/**
* Base class for unit tests of Converters
@@ -34,7 +33,7 @@
* @author vijay venkatarman (vijay.venkataraman@oracle.com)
*
*/
-public abstract class ConverterTestCase extends TestCase
+public abstract class ConverterTestCase extends AbstractBaseTestCase
{
public ConverterTestCase(String testName)
{
@@ -52,28 +51,27 @@
*/
protected void doTestNull(
MockFacesContext context,
- MockUIComponent component,
+ MockUIComponentWrapper wrapper,
Converter converter
) throws ConverterException
{
- Object obj = converter.getAsObject(context, component, null);
+ Object obj = converter.getAsObject(context, wrapper.getUIComponent(), null);
assertEquals(null, obj);
- String str = converter.getAsString(context, component, null);
+ String str = converter.getAsString(context, wrapper.getUIComponent(), null);
assertEquals("",str);
- context.verify();
- component.verify();
+ wrapper.getMock().verify();
}
/**
* If contex or component = null then should throw NullPointerException
*/
protected void doTestNullContext(
- MockUIComponent component,
+ MockUIComponentWrapper wrapper,
Converter converter) throws NullPointerException
{
try
{
- converter.getAsObject(null, component , "dummy");
+ converter.getAsObject(null, wrapper.getUIComponent(), "dummy");
fail("Expected NullpointerException - if context or component is null");
}
catch (NullPointerException npe)
@@ -82,7 +80,7 @@
}
try
{
- converter.getAsString(null, component , "dummy");
+ converter.getAsString(null, wrapper.getUIComponent(), "dummy");
fail("Expected NullpointerException - if context or component is null");
}
catch (NullPointerException npe)
@@ -120,7 +118,8 @@
protected void doTestBlankValue(Converter converter)
{
MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
Object value = converter.getAsObject(context, component,"");
assertEquals(null, value);
}
@@ -137,16 +136,15 @@
protected void doTestGetAsObject(
Converter converter,
MockFacesContext context,
- MockUIComponent component,
+ MockUIComponentWrapper wrapper,
String value,
Object expectedValue
) throws ConverterException
{
- Object conv = converter.getAsObject(context, component, value);
+ Object conv = converter.getAsObject(context, wrapper.getUIComponent(), value);
assertEquals(expectedValue, conv);
- context.verify();
- component.verify();
+ wrapper.getMock().verify();
}
@@ -161,15 +159,14 @@
protected void doTestGetAsString(
Converter converter,
MockFacesContext context,
- MockUIComponent component,
+ MockUIComponentWrapper wrapper,
Object value,
String expectedValue
) throws ConverterException
{
- Object conv = converter.getAsString(context, component, value);
+ Object conv = converter.getAsString(context, wrapper.getUIComponent(), value);
assertEquals(conv, expectedValue);
- context.verify();
- component.verify();
+ wrapper.getMock().verify();
}
@@ -202,7 +199,7 @@
Converter thisConverter,
Converter otherConverter,
MockFacesContext context,
- MockUIComponent component
+ MockUIComponentWrapper wrapper
)
{
Object state = ((StateHolder)thisConverter).saveState(context);
@@ -210,8 +207,7 @@
((StateHolder)otherConverter).restoreState(context, state);
// do all actions of save and restore
doTestEquals(thisConverter, otherConverter, true);
- context.verify();
- component.verify();
+ wrapper.getMock().verify();
}
@@ -229,4 +225,4 @@
{
return ( o1 == o2 || (o1 != null && o1.equals(o2)));
}
-}
+}
\ No newline at end of file
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/DateTimeConverterTestCase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/DateTimeConverterTestCase.java?rev=422050&r1=422049&r2=422050&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/DateTimeConverterTestCase.java (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/DateTimeConverterTestCase.java Fri Jul 14 14:09:28 2006
@@ -15,21 +15,19 @@
*/
package org.apache.myfaces.adf.convert;
+
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.Locale;
import java.util.TimeZone;
-import javax.faces.component.UIViewRoot;
+import javax.faces.component.UIComponent;
import javax.faces.convert.ConverterException;
import org.apache.myfaces.adf.convert.ConverterTestCase;
-
-import javax.faces.component.MockUIComponent;
-import javax.faces.context.MockFacesContext;
-
-import org.apache.myfaces.adfbuild.test.MockUtils;
+import org.apache.myfaces.adfbuild.test.MockUIComponentWrapper;
+import org.jmock.Mock;
/**
* Test DateTimeConverter
@@ -42,7 +40,7 @@
{
super(testName);
}
-
+
/**
* @todo once all test case work fine - we can move all in to one method
*/
@@ -73,12 +71,13 @@
*/
protected void checkNullInputValue() throws ConverterException
{
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
+ MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
javax.faces.convert.DateTimeConverter converter = getDateTimeConverter();
- doTestNull(context, component, converter);
+ doTestNull(facesContext, wrapper, converter);
}
/**
@@ -86,18 +85,19 @@
*/
protected void checkNullContext()
{
- MockUIComponent component = new MockUIComponent();
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
+ MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
javax.faces.convert.DateTimeConverter converter = getDateTimeConverter();
- doTestNullContext(component, converter);
+ doTestNullContext(wrapper, converter);
}
protected void checkNullComponent()
{
- MockFacesContext context = new MockFacesContext();
javax.faces.convert.DateTimeConverter converter = getDateTimeConverter();
- doTestNullComponent(context, converter);
+ doTestNullComponent(facesContext, converter);
}
/**
@@ -168,8 +168,9 @@
{
javax.faces.convert.DateTimeConverter converter = getDateTimeConverter();
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
+ MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
javax.faces.convert.DateTimeConverter restoreConverter = getDateTimeConverter();
@@ -188,41 +189,40 @@
converter.setLocale(_LOCALES[i]);
restoreConverter.setLocale(_LOCALES[i]);
doTestStateHolderSaveRestore(converter, restoreConverter,
- context, component);
+ facesContext, wrapper);
converter.setPattern(_PATTERNS[i]);
restoreConverter.setPattern(_PATTERNS[i]);
doTestStateHolderSaveRestore(converter, restoreConverter,
- context, component);
+ facesContext, wrapper);
converter.setTimeStyle(_TIME_STYLES[i]);
restoreConverter.setTimeStyle(_TIME_STYLES[i]);
doTestStateHolderSaveRestore(converter, restoreConverter,
- context, component);
+ facesContext, wrapper);
converter.setTimeZone(_TIME_ZONES[i]);
restoreConverter.setTimeZone(_TIME_ZONES[i]);
doTestStateHolderSaveRestore(converter, restoreConverter,
- context, component);
+ facesContext, wrapper);
converter.setType(_TYPES[i]);
restoreConverter.setType(_TYPES[i]);
doTestStateHolderSaveRestore(converter, restoreConverter,
- context, component);
+ facesContext, wrapper);
String secPattern = _SECONDARY_PATTERNS[i];
setSecondaryPattern(converter, secPattern);
setSecondaryPattern(restoreConverter, secPattern);
doTestStateHolderSaveRestore(converter, restoreConverter,
- context, component);
+ facesContext, wrapper);
converter.setTransient(_TRANSIENT_VALUES[i]);
restoreConverter.setTransient(_TRANSIENT_VALUES[i]);
doTestStateHolderSaveRestore(converter, restoreConverter,
- context, component);
- context.verify();
- component.verify();
+ facesContext, wrapper);
+ mock.verify();
}
}
@@ -240,22 +240,22 @@
dtConv.setTimeZone(_STIME_ZONES[i]);
dtConv.setType(_STYPES[i]);
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
+ MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
- MockUtils.setFacesContext(context);
+ setFacesContext(facesContext);
try
{
- Date obj = (Date)dtConv.getAsObject(context, component, _SINPUT_VALUES[i]);
+ Date obj = (Date)dtConv.getAsObject(facesContext, component, _SINPUT_VALUES[i]);
assertEquals(true, isEqual(obj,_SEXPECTED_DATES[i]));
}
finally
{
- MockUtils.setFacesContext(null);
+ setFacesContext(null);
}
- context.verify();
- component.verify();
+ mock.verify();
}
}
@@ -269,12 +269,11 @@
dtConv.setTimeZone(null);
dtConv.setPattern(pattern);
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
+ MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
- UIViewRoot uiRoot = new UIViewRoot();
- uiRoot.setLocale(Locale.ENGLISH);
- context.setupGetViewRoot(uiRoot);
+ facesContext.getViewRoot().setLocale(Locale.ENGLISH);
TimeZone tz = TimeZone.getDefault();
TimeZone.setDefault(getTzone("UTC"));
@@ -282,16 +281,16 @@
GregorianCalendar gcal = new GregorianCalendar(getTzone("UTC"));
gcal.set(2001,6,4,12,8,56);
- MockUtils.setFacesContext(context);
+ setFacesContext(facesContext);
try
{
- Date dt = (Date) dtConv.getAsObject(context, component, inputValue);
+ Date dt = (Date) dtConv.getAsObject(facesContext, component, inputValue);
Date expectedDt = gcal.getTime();
assertEquals(true, isEqual(dt, expectedDt));
}
finally
{
- MockUtils.setFacesContext(null);
+ setFacesContext(null);
}
}
@@ -324,8 +323,9 @@
for (int i = 0; i < patternBasedValues.length; i++)
{
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
+ MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
javax.faces.convert.DateTimeConverter fdtConv
= getDateTimeConverter();
@@ -339,20 +339,17 @@
// locale is indeed picked up from the view root
if (loc == null)
{
- UIViewRoot uiRoot = new UIViewRoot();
- uiRoot.setLocale(Locale.GERMAN);
- context.setupGetViewRoot(uiRoot);
- context.setupGetViewRoot(uiRoot);
+ facesContext.getViewRoot().setLocale(Locale.GERMAN);
}
- MockUtils.setFacesContext(context);
+ setFacesContext(facesContext);
try
{
- String fobtPattern = fdtConv.getAsString(context, component, date);
+ String fobtPattern = fdtConv.getAsString(facesContext, component, date);
assertEquals(patternBasedValues[i][3], fobtPattern);
- Date fdt = (Date)fdtConv.getAsObject(context, component, fobtPattern);
+ Date fdt = (Date)fdtConv.getAsObject(facesContext, component, fobtPattern);
/**
* @todo to find - why we get this millisecond difference
@@ -361,11 +358,9 @@
}
finally
{
- MockUtils.setFacesContext(null);
+ setFacesContext(null);
}
-
- context.verify();
- component.verify();
+ mock.verify();
}
}
@@ -389,30 +384,30 @@
// by default dateStyle is shortish and type is date
javax.faces.convert.DateTimeConverter dtConv = getDateTimeConverter();
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
+ MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
_setStyleOnConverter(dtConv, styleType, styles[i]);
dtConv.setLocale(Locale.ENGLISH);
- MockUtils.setFacesContext(context);
+ setFacesContext(facesContext);
try
{
- String out = dtConv.getAsString(context, component, dt);
+ String out = dtConv.getAsString(facesContext, component, dt);
assertEquals(true, (out != null));
}
finally
{
- MockUtils.setFacesContext(null);
+ setFacesContext(null);
}
- context.verify();
- component.verify();
+ mock.verify();
- MockFacesContext ctx = new MockFacesContext();
- MockUIComponent cmp = new MockUIComponent();
+ Mock mok = mock(UIComponent.class);
+ UIComponent cmp = (UIComponent) mok.proxy();
- MockUtils.setFacesContext(ctx);
+ setFacesContext(facesContext);
try
{
try
@@ -420,7 +415,7 @@
javax.faces.convert.DateTimeConverter extDtConv = getDateTimeConverter();
extDtConv.setLocale(Locale.ENGLISH);
_setStyleOnConverter(extDtConv, styleType, styles[i].toUpperCase());
- String outPut = extDtConv.getAsString(context, component, dt);
+ String outPut = extDtConv.getAsString(facesContext, cmp, dt);
fail("Upper case not accepted for styles");
}
catch (RuntimeException ce)
@@ -430,15 +425,13 @@
}
finally
{
- MockUtils.setFacesContext(null);
+ setFacesContext(null);
}
- ctx.verify();
- cmp.verify();
+ mok.verify();
}
}
-
protected abstract javax.faces.convert.DateTimeConverter getDateTimeConverter();
protected abstract void setSecondaryPattern(
@@ -726,59 +719,4 @@
private static Date[] _SEXPECTED_DATES
= _getDates(_SLOCALES,_STIME_ZONES, _DAYS,_MONTHS, _YEARS, _HOURS, _MINS, _SECS);
-}
-
-
- /*
- public void testPrintValues()
- {
- System.out.println("\n<TR>\n");
- System.out.println("<TD>");System.out.print("Date Style\n");
- System.out.println("<TD>");System.out.print("Locale\n");
- System.out.println("<TD>");System.out.print("Pattern\n");
- System.out.println("<TD>");System.out.print("TimeStyle\n");
- System.out.println("<TD>");System.out.print("TimeZone\n");
- System.out.println("<TD>");System.out.print("Type\n");
- System.out.println("<TD>");System.out.print("SecondaryPattern\n");
- System.out.println("<TD>");System.out.print("getAsObject()\n");
- System.out.println("<TD>");System.out.print("getAsString()\n");
- System.out.println("</TR>");
- for (int i = 0; i < _DATE_STYLES.length; i++)
- {
- System.out.println("<TR>");
- System.out.println("<TD>");
- System.out.print(_DATE_STYLES[i]+"\n");
- //System.out.print("\t");
-
- System.out.print("<TD>");
- System.out.print(_LOCALES[i]+"\n");
- //System.out.print("\t");
-
- System.out.println("<TD>");
- System.out.print(_PATTERNS[i]+"\n");
- //System.out.print("\t");
-
- System.out.print("<TD>");
- System.out.print(_TIME_STYLES[i]+"\n");
- //System.out.print("\t");
-
- System.out.print("<TD>");
- System.out.print(_TIME_ZONES[i].getID()+"\n");
- //System.out.print("\t");
-
- System.out.print("<TD>");
- System.out.print(_TYPES[i]+"\n");
- //System.out.print("\t");
-
- System.out.print("<TD>");
- System.out.print(_SECONDARY_PATTERNS[i]+"\n");
- //System.out.print("\t\n");
- System.out.print("<TD>");
- System.out.println(" \n");
-
- System.out.print("<TD>");
- System.out.println(" \n");
- System.out.println("</TR>");
-
- } */
-
+}
\ No newline at end of file
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/JsfDateTimeConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/JsfDateTimeConverterTest.java?rev=422050&r1=422049&r2=422050&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/JsfDateTimeConverterTest.java (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/JsfDateTimeConverterTest.java Fri Jul 14 14:09:28 2006
@@ -15,29 +15,48 @@
*/
package org.apache.myfaces.adf.convert;
-import javax.faces.component.MockUIComponent;
import javax.faces.component.StateHolder;
-import javax.faces.context.MockFacesContext;
import javax.faces.convert.Converter;
import javax.faces.convert.DateTimeConverter;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.myfaces.adfbuild.test.MockUIComponentWrapper;
+import org.apache.shale.test.mock.MockFacesContext;
public class JsfDateTimeConverterTest extends DateTimeConverterTestCase
{
public JsfDateTimeConverterTest(String name)
{
super(name);
- }
-
+ }
+
+ public void setUp()
+ {
+ super.setUp();
+ }
+
+ public void tearDown()
+ {
+ super.tearDown();
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite(JsfDateTimeConverterTest.class);
+ }
+
protected void doTestStateHolderSaveRestore(
Converter conv1,
Converter conv2,
MockFacesContext context,
- MockUIComponent component
+ MockUIComponentWrapper wrapper
)
{
- javax.faces.convert.DateTimeConverter dtConv1, dtConv2;
- dtConv1 = (javax.faces.convert.DateTimeConverter)conv1;
- dtConv2 = (javax.faces.convert.DateTimeConverter)conv2;
+ DateTimeConverter dtConv1, dtConv2;
+ dtConv1 = (DateTimeConverter)conv1;
+ dtConv2 = (DateTimeConverter)conv2;
Object state = ((StateHolder)conv1).saveState(context);
@@ -46,8 +65,7 @@
boolean isEqual = _isConvertersEqual(dtConv1, dtConv2);
assertEquals(true, isEqual);
- context.verify();
- component.verify();
+ wrapper.getMock().verify();
}
protected void doTestEquals(
@@ -56,21 +74,21 @@
boolean expectedOutCome
)
{
- javax.faces.convert.DateTimeConverter dtConv1, dtConv2;
- dtConv1 = (javax.faces.convert.DateTimeConverter)conv1;
- dtConv2 = (javax.faces.convert.DateTimeConverter)conv2;
+ DateTimeConverter dtConv1, dtConv2;
+ dtConv1 = (DateTimeConverter)conv1;
+ dtConv2 = (DateTimeConverter)conv2;
boolean isEqual = _isConvertersEqual(dtConv1, dtConv2);
assertEquals(expectedOutCome, isEqual);
}
protected DateTimeConverter getDateTimeConverter()
{
- return new javax.faces.convert.DateTimeConverter();
+ return new DateTimeConverter();
}
protected void setSecondaryPattern(
- javax.faces.convert.DateTimeConverter converter,
+ DateTimeConverter converter,
String secondaryPattern
)
{
@@ -87,8 +105,8 @@
}
private boolean _isConvertersEqual(
- javax.faces.convert.DateTimeConverter conv1,
- javax.faces.convert.DateTimeConverter conv2
+ DateTimeConverter conv1,
+ DateTimeConverter conv2
)
{
return
@@ -102,4 +120,4 @@
);
}
-}
+}
\ No newline at end of file
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/JsfNumberConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/JsfNumberConverterTest.java?rev=422050&r1=422049&r2=422050&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/JsfNumberConverterTest.java (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/JsfNumberConverterTest.java Fri Jul 14 14:09:28 2006
@@ -22,8 +22,11 @@
import javax.faces.convert.Converter;
import javax.faces.convert.NumberConverter;
-import javax.faces.component.MockUIComponent;
-import javax.faces.context.MockFacesContext;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.myfaces.adfbuild.test.MockUIComponentWrapper;
+import org.apache.shale.test.mock.MockFacesContext;
/**
* Test JSF NumberConverter
@@ -37,6 +40,21 @@
super(name);
}
+ public void setUp()
+ {
+ super.setUp();
+ }
+
+ public void tearDown()
+ {
+ super.tearDown();
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite(JsfNumberConverterTest.class);
+ }
+
protected NumberConverter getNumberConverter()
{
return new NumberConverter();
@@ -46,7 +64,7 @@
Converter conv1,
Converter conv2,
MockFacesContext context,
- MockUIComponent component
+ MockUIComponentWrapper wrapper
)
{
Object state = ((StateHolder)conv1).saveState(context);
@@ -57,8 +75,7 @@
(NumberConverter)conv2);
assertEquals(true, isEqual);
- context.verify();
- component.verify();
+ wrapper.getMock().verify();
}
// This is a bad equals comparison. But this is max we can do.
@@ -98,15 +115,15 @@
protected void doTestStrictNess(
MockFacesContext context,
- MockUIComponent component,
+ MockUIComponentWrapper wrapper,
Locale locale,
String inputValue)
{
NumberConverter converter = getNumberConverter();
converter.setLocale(locale);
- Object obj = converter.getAsObject(context, component, inputValue);
+ Object obj = converter.getAsObject(context, wrapper.getUIComponent(), inputValue);
// JSF Converter is lenient - so it will get parsed to a valid object
assertEquals(true, (obj != null));
};
-}
+}
\ No newline at end of file
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/NumberConverterTestCase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/NumberConverterTestCase.java?rev=422050&r1=422049&r2=422050&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/NumberConverterTestCase.java (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/convert/NumberConverterTestCase.java Fri Jul 14 14:09:28 2006
@@ -17,17 +17,14 @@
package org.apache.myfaces.adf.convert;
import java.util.Locale;
-import javax.faces.component.UIViewRoot;
import javax.faces.convert.ConverterException;
import javax.faces.convert.NumberConverter;
+import javax.faces.component.UIComponent;
import org.apache.myfaces.adf.convert.ConverterTestCase;
-import org.apache.myfaces.adfbuild.test.MockUtils;
-
-import javax.faces.application.MockApplication;
-import javax.faces.component.MockUIComponent;
-import javax.faces.context.MockExternalContext;
-import javax.faces.context.MockFacesContext;
+import org.apache.myfaces.adfbuild.test.MockUIComponentWrapper;
+import org.apache.shale.test.mock.MockFacesContext;
+import org.jmock.Mock;
/**
* Test NumberConverter
@@ -46,18 +43,19 @@
*/
public void testNullContext()
{
- MockUIComponent component = new MockUIComponent();
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
+ MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
NumberConverter converter = getNumberConverter();
- doTestNullContext(component, converter);
+ doTestNullContext(wrapper, converter);
}
public void testNullComponent()
{
- MockFacesContext context = new MockFacesContext();
NumberConverter converter = getNumberConverter();
- doTestNullComponent(context, converter);
+ doTestNullComponent(facesContext, converter);
}
/**
@@ -67,12 +65,12 @@
*/
public void testNullInputValue() throws ConverterException
{
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
-
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
+ MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
NumberConverter converter = getNumberConverter();
- doTestNull(context, component, converter);
+ doTestNull(facesContext, wrapper, converter);
}
public void testEmptyValueConversion()
@@ -82,32 +80,25 @@
public void testValueType()
{
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
- UIViewRoot root = new UIViewRoot();
- root.setLocale(Locale.US);
- context.setupGetViewRoot(root);
- context.setupGetViewRoot(root);
-
- MockUtils.setFacesContext(context);
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
+ setFacesContext(facesContext);
try
{
String input = "123";
NumberConverter converter = getNumberConverter();
- Object number = converter.getAsObject(context, component, input);
+ Object number = converter.getAsObject(facesContext, component, input);
assertEquals(true, number instanceof Number);
assertEquals(true, (((Number)number).intValue() == 123));
- String outVal = converter.getAsString(context, component, number);
+ String outVal = converter.getAsString(facesContext, component, number);
assertEquals(input, outVal);
}
finally
{
- MockUtils.setFacesContext(null);
+ setFacesContext(null);
}
-
- context.verify();
- component.verify();
+ mock.verify();
}
public void testAppropriateFormatsArePicked()
@@ -130,88 +121,84 @@
for (int i = 0; i < patterns.length; i++)
{
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
-
- MockUtils.setFacesContext(context);
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
+
+ setFacesContext(facesContext);
try
{
nconv.setPattern(patterns[i]);
nconv.setType(types[i]);
nconv.setLocale(locales[i]);
- Object convValue = nconv.getAsObject(context, component, inputValues[i]);
+ Object convValue = nconv.getAsObject(facesContext, component, inputValues[i]);
assertEquals(expectedValues[i], convValue);
- String outValue = nconv.getAsString(context, component, expectedValues[i]);
+ String outValue = nconv.getAsString(facesContext, component, expectedValues[i]);
assertEquals(expectedStringValues[i], outValue);
}
finally
{
- MockUtils.setFacesContext(null);
+ setFacesContext(null);
}
-
- context.verify();
- component.verify();
+ mock.verify();
}
}
public void testStateHolderSaveRestore()
{
NumberConverter converter = getNumberConverter();
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
NumberConverter restoreConverter = getNumberConverter();
- MockFacesContext ctx = new MockFacesContext();
- MockUIComponent comp = new MockUIComponent();
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
+ MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
for (int i = 0; i < _LOCALES.length; i++)
{
converter.setLocale(_LOCALES[i]);
restoreConverter.setLocale(_LOCALES[i]);
- doTestStateHolderSaveRestore(converter, restoreConverter, ctx, comp);
+ doTestStateHolderSaveRestore(converter, restoreConverter, facesContext, wrapper);
converter.setCurrencyCode( _CURRENCY_CODES[i]);
restoreConverter.setCurrencyCode( _CURRENCY_CODES[i]);
- doTestStateHolderSaveRestore(converter, restoreConverter, ctx, comp);
+ doTestStateHolderSaveRestore(converter, restoreConverter, facesContext, wrapper);
converter.setCurrencySymbol(_CURRENCY_SYMBOLS[i]);
restoreConverter.setCurrencySymbol(_CURRENCY_SYMBOLS[i]);
- doTestStateHolderSaveRestore(converter, restoreConverter, ctx, comp);
-
+ doTestStateHolderSaveRestore(converter, restoreConverter, facesContext, wrapper);
converter.setIntegerOnly(_INTEGER_ONLY[1]);
restoreConverter.setIntegerOnly(_INTEGER_ONLY[1]);
- doTestStateHolderSaveRestore(converter, restoreConverter, ctx, comp);
+ doTestStateHolderSaveRestore(converter, restoreConverter, facesContext, wrapper);
converter.setMaxFractionDigits(_MAX_FRACTION_DIGITS[i]);
restoreConverter.setMaxFractionDigits(_MAX_FRACTION_DIGITS[i]);
- doTestStateHolderSaveRestore(converter, restoreConverter, ctx, comp);
+ doTestStateHolderSaveRestore(converter, restoreConverter, facesContext, wrapper);
converter.setMaxIntegerDigits(_MAX_INT_DIGITS[i]);
restoreConverter.setMaxIntegerDigits(_MAX_INT_DIGITS[i]);
- doTestStateHolderSaveRestore(converter, restoreConverter, ctx, comp);
+ doTestStateHolderSaveRestore(converter, restoreConverter, facesContext, wrapper);
converter.setMinFractionDigits(_MIN_FRACT_DIGITS[i]);
restoreConverter.setMinFractionDigits(_MIN_FRACT_DIGITS[i]);
- doTestStateHolderSaveRestore(converter, restoreConverter, ctx, comp);
+ doTestStateHolderSaveRestore(converter, restoreConverter, facesContext, wrapper);
converter.setMinIntegerDigits(_MIN_INT_DIGITS[i]);
restoreConverter.setMinIntegerDigits(_MIN_INT_DIGITS[i]);
- doTestStateHolderSaveRestore(converter, restoreConverter, ctx, comp);
+ doTestStateHolderSaveRestore(converter, restoreConverter, facesContext, wrapper);
converter.setPattern( _PATTTERNS[i]);
restoreConverter.setPattern(_PATTTERNS[i]);
- doTestStateHolderSaveRestore(converter, restoreConverter, ctx, comp);
+ doTestStateHolderSaveRestore(converter, restoreConverter, facesContext, wrapper);
converter.setTransient(_TRANSIENT[i]);
restoreConverter.setTransient(_TRANSIENT[i]);
- doTestStateHolderSaveRestore(converter, restoreConverter, ctx, comp);
+ doTestStateHolderSaveRestore(converter, restoreConverter, facesContext, wrapper);
converter.setType(_TYPES[i]);
- doTestStateHolderSaveRestore(converter, restoreConverter, ctx, comp);
+ doTestStateHolderSaveRestore(converter, restoreConverter, facesContext, wrapper);
}
}
@@ -219,50 +206,46 @@
public void testCurrencyCodeIsHonoured()
{
NumberConverter converter = getNumberConverter();
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
+
converter.setLocale(Locale.US);
converter.setType("currency");
Double value = new Double(99);
- MockUtils.setFacesContext(context);
+ setFacesContext(facesContext);
try
{
- String outPut = converter.getAsString(context, component, value);
+ String outPut = converter.getAsString(facesContext, component, value);
assertEquals("$99.00", outPut);
//Locale is US. By general convention the output prefix would be '$'
// since we set the currency code to 'DEM' value should be DEM[value]
converter.setCurrencyCode("DEM");
- outPut = converter.getAsString(context, component, value);
+ outPut = converter.getAsString(facesContext, component, value);
assertEquals("DEM99.00", outPut);
}
finally
{
- MockUtils.setFacesContext(null);
+ setFacesContext(null);
}
- context.verify();
- component.verify();
+ mock.verify();
}
public void testCurrencyCodeIsHonouredWhenCurrencyCodeAndCurrencySymbolIsSet()
{
NumberConverter converter = getNumberConverter();
- MockFacesContext context = new MockFacesContext();
- MockApplication application = new MockApplication();
- context.setupGetApplication(application);
- application.setupGetMessageBundle(null);
+ Mock mock = buildMockUIComponent(2);
+ UIComponent component = (UIComponent) mock.proxy();
- MockUIComponent component = MockUtils.buildMockUIComponent(2);
-
converter.setLocale(Locale.US);
converter.setType("currency");
- Double value = new Double(99);
+ Double value = new Double(99);
- MockUtils.setFacesContext(context);
+ setFacesContext(facesContext);
try
{
- String outPut = converter.getAsString(context, component, value);
+ String outPut = converter.getAsString(facesContext, component, value);
assertEquals("$99.00", outPut);
//Locale is US. By general convention the output prefix would be '$'
// since we set the currency code to 'DEM' value should be DEM[value]
@@ -272,18 +255,11 @@
// code is set.
converter.setCurrencySymbol("*");
- outPut = converter.getAsString(context, component, value);
+ outPut = converter.getAsString(facesContext, component, value);
assertEquals("DEM99.00", outPut);
try
{
- UIViewRoot root = new UIViewRoot();
- root.setLocale(Locale.US);
- context.setupGetViewRoot(root);
- context.setupGetViewRoot(root);
- MockExternalContext external = new MockExternalContext();
- context.setupGetExternalContext(external);
-
- Number outValue = (Number)converter.getAsObject(context, component, "DEM99.00");
+ Number outValue = (Number)converter.getAsObject(facesContext, component, "DEM99.00");
fail("Exception should occur - since currency should not be considered while formatting");
}
catch(Exception e)
@@ -293,18 +269,16 @@
}
finally
{
- MockUtils.setFacesContext(null);
+ setFacesContext(null);
}
-
- context.verify();
- component.verify();
+ mock.verify();
}
public void testCurrencySymbolIsHonoured()
{
NumberConverter converter = getNumberConverter();
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
converter.setLocale(Locale.US);
converter.setType("currency");
Double value = new Double(99);
@@ -312,49 +286,45 @@
// since we set currency symbol to '*' we should get the value to be *99.00
converter.setCurrencySymbol("*");
- MockUtils.setFacesContext(context);
+ setFacesContext(facesContext);
try
{
- String outPut = converter.getAsString(context, component, value);
+ String outPut = converter.getAsString(facesContext, component, value);
assertEquals("*99.00", outPut);
}
finally
{
- MockUtils.setFacesContext(null);
+ setFacesContext(null);
}
-
- context.verify();
- component.verify();
+ mock.verify();
}
public void testIntegerOnlyIsHonoured()
{
// integerOnly is used only while parsing to create number objects
NumberConverter converter = getNumberConverter();
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
converter.setLocale(Locale.US);
String[] inputs = {"23.10", "44.90876", "11111", "67859.0001"};
Number[] expectedValues = {new Long(23), new Long(44), new Long(11111), new Long(67859)};
- MockUtils.setFacesContext(context);
+ setFacesContext(facesContext);
try
{
for (int i = 0; i < inputs.length; i++)
{
converter.setIntegerOnly(true);
- Number num = (Number) converter.getAsObject(context, component, inputs[i]);
+ Number num = (Number) converter.getAsObject(facesContext, component, inputs[i]);
assertEquals(expectedValues[i], num);
}
}
finally
{
- MockUtils.setFacesContext(null);
+ setFacesContext(null);
}
-
- context.verify();
- component.verify();
+ mock.verify();
}
@@ -362,14 +332,14 @@
{
// integerOnly is used only while parsing to create number objects
NumberConverter converter = getNumberConverter();
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
converter.setLocale(Locale.US);
String[] inputs = {"23.10", "44.90876", "11111", "67859.0001"};
Number[] expectedValues = {new Long(23), new Long(44), new Long(11111), new Long(67859)};
- MockUtils.setFacesContext(context);
+ setFacesContext(facesContext);
try
{
for (int i = 0; i < inputs.length; i++)
@@ -382,44 +352,39 @@
// this should be taken care by the parsing code
converter.setIntegerOnly(true);
- Number num = (Number) converter.getAsObject(context, component, inputs[i]);
+ Number num = (Number) converter.getAsObject(facesContext, component, inputs[i]);
assertEquals(expectedValues[i], num);
}
}
finally
{
- MockUtils.setFacesContext(null);
+ setFacesContext(null);
}
-
- context.verify();
- component.verify();
+ mock.verify();
}
public void testLocaleIsPickedUpFromViewRoot()
{
NumberConverter converter = getNumberConverter();
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
- UIViewRoot root = new UIViewRoot();
- root.setLocale(Locale.US);
- context.setupGetViewRoot(root);
- context.setupGetViewRoot(root);
+ facesContext.getViewRoot().setLocale(Locale.US);
String input = "1234.56";
- MockUtils.setFacesContext(context);
+ setFacesContext(facesContext);
try
{
// if we get a valid object, implies locale was indeed picked up.
// otherwise we would have got a null pointer exception or other exception
- Object value = converter.getAsObject(context, component, input);
+ Object value = converter.getAsObject(facesContext, component, input);
assertEquals(new Double(1234.56), value);
}
finally
{
- MockUtils.setFacesContext(null);
+ setFacesContext(null);
}
}
@@ -430,41 +395,38 @@
String[] expectedValues = {"9,999", "99", "0.99", "99999.567", "9999"};
NumberConverter converter = getNumberConverter();
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
converter.setLocale(Locale.US);
- MockUtils.setFacesContext(context);
+ setFacesContext(facesContext);
try
{
for (int i = 0; i < inputValues.length; i++)
{
converter.setGroupingUsed(isGroupingUsed[i]);
- String out = converter.getAsString(context, component, inputValues[i]);
+ String out = converter.getAsString(facesContext, component, inputValues[i]);
assertEquals(expectedValues[i], out);
}
}
finally
{
- MockUtils.setFacesContext(null);
+ setFacesContext(null);
}
-
- context.verify();
- component.verify();
+ mock.verify();
}
public void testStrictnessOfConversion()
{
String[] inputValues = {"123ABC", "22.22.2" };
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component
- = MockUtils.buildMockUIComponent(inputValues.length * 3);
+ Mock mock = buildMockUIComponent(inputValues.length * 3);
+ UIComponent component = (UIComponent) mock.proxy();
+ MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
for (int i = 0; i < inputValues.length; i++)
{
- doTestStrictNess(context, component, Locale.US, inputValues[i]);
+ doTestStrictNess(facesContext, wrapper, Locale.US, inputValues[i]);
}
- context.verify();
- component.verify();
+ mock.verify();
}
public void testSettingFractDigitsAndSettingMinDigitsAreHononured()
@@ -478,10 +440,10 @@
int[] minFractDigits = {0, 2, 0, 2};
NumberConverter converter = getNumberConverter();
- MockFacesContext context = new MockFacesContext();
- MockUIComponent component = new MockUIComponent();
+ Mock mock = mock(UIComponent.class);
+ UIComponent component = (UIComponent) mock.proxy();
- MockUtils.setFacesContext(context);
+ setFacesContext(facesContext);
try
{
converter.setLocale(Locale.US);
@@ -492,23 +454,22 @@
converter.setMinFractionDigits(minFractDigits[i]);
converter.setMinIntegerDigits(minIntDigits[i]);
- String out = converter.getAsString(context, component, inputValues[i]);
+ String out = converter.getAsString(facesContext, component, inputValues[i]);
assertEquals(expectedValues[i], out);
}
}
finally
{
- MockUtils.setFacesContext(null);
+ setFacesContext(null);
}
- context.verify();
- component.verify();
+ mock.verify();
}
protected abstract NumberConverter getNumberConverter();
protected abstract void doTestStrictNess(
MockFacesContext context,
- MockUIComponent component,
+ MockUIComponentWrapper wrapper,
Locale locale,
String inputValue);
@@ -576,4 +537,4 @@
// Pattern tested
// Type tested
// GroupingUsed tested
-// IntegerOnly tested // only while parsing
+// IntegerOnly tested // only while parsing
\ No newline at end of file
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/ChildPropertyTreeModelTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/ChildPropertyTreeModelTest.java?rev=422050&r1=422049&r2=422050&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/ChildPropertyTreeModelTest.java (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/ChildPropertyTreeModelTest.java Fri Jul 14 14:09:28 2006
@@ -21,30 +21,32 @@
import java.util.Collections;
import java.util.List;
-import junit.framework.TestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-import org.apache.myfaces.adfbuild.test.MockFContext;
+import org.apache.shale.test.base.AbstractJsfTestCase;
-public class ChildPropertyTreeModelTest extends TestCase
+public class ChildPropertyTreeModelTest extends AbstractJsfTestCase
{
public ChildPropertyTreeModelTest(String name)
{
super(name);
}
- protected void setUp() throws Exception
- {
- super.setUp();
- new MockFContext();
- }
-
- protected void tearDown() throws Exception
- {
- MockFContext.clearContext();
- super.tearDown();
- }
-
+ public void setUp()
+ {
+ super.setUp();
+ }
+
+ public void tearDown()
+ {
+ super.tearDown();
+ }
+ public static Test suite()
+ {
+ return new TestSuite(ChildPropertyTreeModelTest.class);
+ }
+
public void testInitialState() throws IntrospectionException
{
TreeModel model = createModel();
@@ -167,19 +169,6 @@
{
TreeModel model = new ChildPropertyTreeModel(_ROOTS, "kids");
return model;
- }
-
- public static void main(String[] args)
- {
- TestRunner.run(ChildPropertyTreeModelTest.class);
-// try
-// {
-// new ChildPropertyTreeModelTest("test").testGetPath();
-// } catch (Exception ex)
-// {
-// ex.printStackTrace();
-// }
-
}
private static final List _ROOTS = _createTree();
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/RowKeySetImplTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/RowKeySetImplTest.java?rev=422050&r1=422049&r2=422050&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/RowKeySetImplTest.java (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/RowKeySetImplTest.java Fri Jul 14 14:09:28 2006
@@ -29,39 +29,36 @@
import java.util.Set;
import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-import org.apache.myfaces.adfbuild.test.MockFContext;
+import org.apache.shale.test.base.AbstractJsfTestCase;
/**
* Test for the RowKeySetImpl class.
* @author Arjuna Wijeyekoon
*/
-public final class RowKeySetImplTest extends TestCase
+public final class RowKeySetImplTest extends AbstractJsfTestCase
{
public RowKeySetImplTest(String testName)
{
super(testName);
}
- protected void setUp() throws Exception
+ public void setUp()
{
super.setUp();
- new MockFContext();
}
- protected void tearDown() throws Exception
+ public void tearDown()
{
- MockFContext.clearContext();
super.tearDown();
}
-
- public static void main(String[] args)
+ public static Test suite()
{
- TestRunner.run(RowKeySetImplTest.class);
+ return new TestSuite(RowKeySetImplTest.class);
}
-
+
public void testInitialyEmpty()
{
RowKeySetImpl set = _createKeySet(false);
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/RowKeySetTreeImplTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/RowKeySetTreeImplTest.java?rev=422050&r1=422049&r2=422050&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/RowKeySetTreeImplTest.java (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/RowKeySetTreeImplTest.java Fri Jul 14 14:09:28 2006
@@ -13,7 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.adf.model;
+package org.apache.myfaces.adf.model;
+
import java.beans.IntrospectionException;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -24,17 +25,33 @@
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import junit.framework.TestCase;
-import junit.textui.TestRunner;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
-import org.apache.myfaces.adfbuild.test.MockFContext;
+import org.apache.shale.test.base.AbstractJsfTestCase;
-public class RowKeySetTreeImplTest extends TestCase
+public class RowKeySetTreeImplTest extends AbstractJsfTestCase
{
public RowKeySetTreeImplTest(String name)
{
super(name);
+ }
+
+ public void setUp()
+ {
+ super.setUp();
+ }
+
+ public void tearDown()
+ {
+ super.tearDown();
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite(RowKeySetTreeImplTest.class);
}
public void testInitialState() throws IntrospectionException
@@ -45,8 +62,6 @@
public void testIterator() throws IntrospectionException
{
- // PropertyResolver needed when iteration with ChildPropertyTreeModel:
- new MockFContext();
TestPathSet pathSet = new TestPathSet();
_add(pathSet, _0, _011, _20);
@@ -58,7 +73,6 @@
assertEquals(_011, iter.next());
assertEquals(_20, iter.next());
assertFalse(iter.hasNext());
- MockFContext.clearContext();
}
public void testInitialAddAll() throws IntrospectionException
@@ -202,9 +216,6 @@
_add(set, _2, _20, _0, _011);
assertEquals("size", 4, set.size());
- // PropertyResolver needed when iteration with ChildPropertyTreeModel:
- new MockFContext();
-
set = new RowKeySetTreeImpl(true);
TreeModel model = ChildPropertyTreeModelTest.createModel();
set.setCollectionModel(model);
@@ -217,7 +228,6 @@
set.removeAll();
assertEquals("addAll:size", 10, set.size());
- MockFContext.clearContext();
}
public void testClear() throws IntrospectionException
@@ -274,11 +284,6 @@
// test state:
_testNotInSet(pathSet, _0, _011, _20);
assertTrue("is contained", pathSet.contains(_2));
- }
-
- public static void main(String[] args)
- {
- TestRunner.run(RowKeySetTreeImplTest.class);
}
private void _testInSet(RowKeySet set, Object ... keys)
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/SortableModelTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/SortableModelTest.java?rev=422050&r1=422049&r2=422050&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/SortableModelTest.java (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/SortableModelTest.java Fri Jul 14 14:09:28 2006
@@ -20,31 +20,35 @@
import java.util.List;
import javax.faces.model.DataModel;
import javax.faces.model.ListDataModel;
-import junit.framework.TestCase;
-import junit.textui.TestRunner;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
import org.apache.myfaces.adf.model.SortCriterion;
-import org.apache.myfaces.adfbuild.test.MockFContext;
+import org.apache.shale.test.base.AbstractJsfTestCase;
/**
* @author Arjuna Wijeyekoon
*/
-public class SortableModelTest extends TestCase
+public class SortableModelTest extends AbstractJsfTestCase
{
public SortableModelTest(String name)
{
super(name);
}
- protected void setUp() throws Exception
+ public void setUp()
{
super.setUp();
- new MockFContext();
}
- protected void tearDown() throws Exception
+ public void tearDown()
{
- MockFContext.clearContext();
super.tearDown();
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite(SortableModelTest.class);
}
public void testInitialSort()
@@ -161,11 +165,6 @@
assertTrue(dModel.getRowIndex() == 0);
sModel.setRowIndex(2); //Anne
assertTrue(dModel.getRowIndex() == 1);
- }
-
- public static void main(String[] args)
- {
- TestRunner.run(SortableModelTest.class);
}
private DataModel _createTestDataModel()
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/util/Base64InputStreamTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/util/Base64InputStreamTest.java?rev=422050&r1=422049&r2=422050&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/util/Base64InputStreamTest.java (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/util/Base64InputStreamTest.java Fri Jul 14 14:09:28 2006
@@ -19,6 +19,9 @@
import java.io.IOException;
import java.io.StringReader;
import java.io.BufferedReader;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
import org.apache.myfaces.adfbuild.test.FacesTestCase;
@@ -39,7 +42,22 @@
public Base64InputStreamTest(String testName)
{
super(testName);
- }
+ }
+
+ public void setUp()
+ {
+ super.setUp();
+ }
+
+ public void tearDown()
+ {
+ super.tearDown();
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite(Base64InputStreamTest.class);
+ }
/**
* Tests decoding of stream that contains no trailing padding characters.