You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ni...@apache.org on 2015/08/19 20:00:32 UTC
svn commit: r1696638 - in /poi/trunk/src:
java/org/apache/poi/ss/format/CellFormatResult.java
testcases/org/apache/poi/ss/format/TestCellFormatResult.java
Author: nick
Date: Wed Aug 19 18:00:31 2015
New Revision: 1696638
URL: http://svn.apache.org/r1696638
Log:
Patch from Javen ONeal from bug #58254 - CellFormatResult.text should check for nulls as per the javadoc
Added:
poi/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormatResult.java
Modified:
poi/trunk/src/java/org/apache/poi/ss/format/CellFormatResult.java
Modified: poi/trunk/src/java/org/apache/poi/ss/format/CellFormatResult.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/format/CellFormatResult.java?rev=1696638&r1=1696637&r2=1696638&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/format/CellFormatResult.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/format/CellFormatResult.java Wed Aug 19 18:00:31 2015
@@ -16,7 +16,7 @@
==================================================================== */
package org.apache.poi.ss.format;
-import java.awt.*;
+import java.awt.Color;
/**
* This object contains the result of applying a cell format or cell format part
@@ -50,8 +50,10 @@ public class CellFormatResult {
* @param text The value for {@link #text}.
* @param textColor The value for {@link #textColor}.
*/
- public CellFormatResult(boolean applies, String text, Color textColor) {
+ public CellFormatResult(boolean applies, String text, Color textColor) throws IllegalArgumentException {
this.applies = applies;
+ if (text == null)
+ throw new IllegalArgumentException("CellFormatResult text may not be null");
this.text = text;
this.textColor = (applies ? textColor : null);
}
Added: poi/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormatResult.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormatResult.java?rev=1696638&view=auto
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormatResult.java (added)
+++ poi/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormatResult.java Wed Aug 19 18:00:31 2015
@@ -0,0 +1,37 @@
+/* ====================================================================
+ 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.poi.ss.format;
+
+import java.awt.Color;
+
+import junit.framework.TestCase;
+
+public class TestCellFormatResult extends TestCase {
+
+ public void testNullTextRaisesException() {
+ try {
+ final boolean applies = true;
+ final String text = null;
+ final Color textColor = Color.BLACK;
+ final CellFormatResult result = new CellFormatResult(applies, text, textColor);
+ fail("Cannot initialize CellFormatResult with null text parameter");
+ }
+ catch (IllegalArgumentException e) {
+ //Expected
+ }
+ }
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org