[Openutils-svn] SF.net SVN: openutils:[4272] magnoliamodules/branches/magnolia44/ openutils-mgnlutils/src

[<die...@us...>]

Revision: 4272
          http://openutils.svn.sourceforge.net/openutils/?rev=4272&view=rev
Author:   diego_schivo
Date:     2013-06-27 10:34:25 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
MGNLUTILS-35 unit-test + fix

Modified Paths:
--------------
    magnoliamodules/branches/magnolia44/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
    magnoliamodules/branches/magnolia44/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java

Modified: magnoliamodules/branches/magnolia44/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java	2013-06-27 09:50:51 UTC (rev 4271)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java	2013-06-27 10:34:25 UTC (rev 4272)
@@ -47,6 +47,7 @@
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -711,6 +712,10 @@
      */
     public static Collection<Content> contentChildrenOfType(Content content, String contentType)
     {
+        if (content == null)
+        {
+            return Collections.emptyList();
+        }
         return content.getChildren(contentType);
     }
 

Modified: magnoliamodules/branches/magnolia44/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java	2013-06-27 09:50:51 UTC (rev 4271)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java	2013-06-27 10:34:25 UTC (rev 4272)
@@ -20,6 +20,7 @@
 package it.openutils.mgnlutils.el;
 
 import info.magnolia.cms.beans.config.ServerConfiguration;
+import info.magnolia.cms.core.ItemType;
 import info.magnolia.cms.i18n.DefaultI18nContentSupport;
 import info.magnolia.cms.i18n.I18nContentSupportFactory;
 import info.magnolia.cms.i18n.LocaleDefinition;
@@ -130,4 +131,20 @@
 
     }
 
+    /*
+     * MGNLUTILS-35
+     */
+    @Test
+    public void testContentChildrenOfType() throws Exception
+    {
+        try
+        {
+            MgnlUtilsElFunctions.contentChildrenOfType(null, ItemType.CONTENTNODE.getSystemName());
+        }
+        catch (NullPointerException e)
+        {
+            Assert.fail();
+        }
+    }
+
 }
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.