You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by cj...@apache.org on 2010/01/28 13:32:55 UTC
svn commit: r904066 - in /myfaces/core/trunk/api/src:
main/java/javax/faces/component/UIComponentBase.java
test/java/javax/faces/component/_DeltaStateHelperTest.java
Author: cjhoward
Date: Thu Jan 28 12:32:55 2010
New Revision: 904066
URL: http://svn.apache.org/viewvc?rev=904066&view=rev
Log:
MYFACES-2508 - test fixes.
Modified:
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java
myfaces/core/trunk/api/src/test/java/javax/faces/component/_DeltaStateHelperTest.java
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java?rev=904066&r1=904065&r2=904066&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java Thu Jan 28 12:32:55 2010
@@ -1577,10 +1577,10 @@
if (state == null)
{
//Only happens if initialStateMarked return true
- //return;
- // Commenting the above out because Javadocs say that we need to
- // throw an NPE here.
+ if (initialStateMarked()) {
+ return;
+ }
throw new NullPointerException ("state");
}
Modified: myfaces/core/trunk/api/src/test/java/javax/faces/component/_DeltaStateHelperTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/test/java/javax/faces/component/_DeltaStateHelperTest.java?rev=904066&r1=904065&r2=904066&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/javax/faces/component/_DeltaStateHelperTest.java (original)
+++ myfaces/core/trunk/api/src/test/java/javax/faces/component/_DeltaStateHelperTest.java Thu Jan 28 12:32:55 2010
@@ -231,7 +231,7 @@
_setupGetTests();
//save stating does not need a facesContext for now!
- Object retVal = _instance.saveState(null);
+ Object retVal = _instance.saveState(facesContext);
assertTrue("retVal must be an array", retVal instanceof Object[]);
assertTrue("arraylength must be given", ((Object[]) retVal).length > 0);
@@ -257,19 +257,19 @@
{
_setupGetTests();
_instance.setInitialStateMarked(false);
- Object serializedState = _instance.saveState(null);
+ Object serializedState = _instance.saveState(facesContext);
_instance.restoreState(facesContext, serializedState);
assertStructure();
_setupGetTests();
_instance.setInitialStateMarked(true);
- serializedState = _instance.saveState(null);
+ serializedState = _instance.saveState(facesContext);
_instance.restoreState(facesContext, serializedState);
assertStructure();
_instance.setInitialStateMarked(true);
_setupGetTests();
- serializedState = _instance.saveState(null);
+ serializedState = _instance.saveState(facesContext);
_instance.restoreState(facesContext, serializedState);
assertStructure();
}