--- /dev/null	2014-08-29 09:45:19.000000000 -0700
+++ new/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFunctionResolverTest.java	2014-08-29 09:45:19.000000000 -0700
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package javax.xml.xpath.ptests;
+
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+import static jaxp.library.JAXPTestUtilities.failUnexpected;
+import static org.testng.Assert.assertEquals;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+/**
+ * Class containing the test cases for XPathFunctionResolver.
+ */
+public class XPathFunctionResolverTest {
+    /**
+     * A XPath for evaluation environment and expressions.
+     */
+    private XPath xpath;
+    
+    /**
+     * Create XPath object before every test. Make sure function resolver has
+     * been set for XPath object.
+     */
+    @BeforeTest
+    public void setup() {
+        xpath = XPathFactory.newInstance().newXPath();
+        if (xpath.getXPathFunctionResolver() == null) {
+            xpath.setXPathFunctionResolver((functionName,arity) -> null);
+        }
+    }
+    /**
+     * Test for resolveFunction(QName functionName,int arity). evaluate will 
+     * continue as long as functionName is meaningful.
+     */
+    @Test
+    public void testCheckXPathFunctionResolver01() {
+        try {
+            assertEquals(xpath.evaluate("round(1.7)", (Object)null), "2");
+        } catch (XPathExpressionException ex) {
+            failUnexpected(ex);
+        }
+    }
+
+    /**
+     * Test for resolveFunction(QName functionName,int arity); evaluate throws 
+     * NPE if functionName  is null.
+     */
+    @Test(expectedExceptions = NullPointerException.class)
+    public void testCheckXPathFunctionResolver02() {
+        try {
+            assertEquals(xpath.evaluate(null, "5"), "2");
+        } catch (XPathExpressionException ex) {
+            failUnexpected(ex);
+        }
+    }
+}