Patch from Javen ONeal from bug #58254 - CellFormatResult.text should check for nulls...

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1696638 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/poi/ss/format/CellFormatResult.java b/src/java/org/apache/poi/ss/format/CellFormatResult.java
index 3c45de3de6bbced043af8dd457d389dc9ac7d121..a22f77c27749774e311e556e23e5a0456ee5fcd7 100644 (file)
--- a/src/java/org/apache/poi/ss/format/CellFormatResult.java
+++ b/src/java/org/apache/poi/ss/format/CellFormatResult.java
@@ -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);
     }

diff --git a/src/testcases/org/apache/poi/ss/format/TestCellFormatResult.java b/src/testcases/org/apache/poi/ss/format/TestCellFormatResult.java
new file mode 100644 (file)
index 0000000..6e77df2
--- /dev/null
+++ b/src/testcases/org/apache/poi/ss/format/TestCellFormatResult.java
@@ -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