You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@openaz.apache.org by pd...@apache.org on 2015/04/13 17:38:18 UTC

[18/51] [partial] incubator-openaz git commit: Initial seed of merged of AT&T and JP Morgan code

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/94fcdd90/openaz-xacml-test/src/test/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionStringEqualIgnoreCaseTest.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionStringEqualIgnoreCaseTest.java b/openaz-xacml-test/src/test/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionStringEqualIgnoreCaseTest.java
new file mode 100755
index 0000000..81fc048
--- /dev/null
+++ b/openaz-xacml-test/src/test/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionStringEqualIgnoreCaseTest.java
@@ -0,0 +1,119 @@
+/*
+ *                        AT&T - PROPRIETARY
+ *          THIS FILE CONTAINS PROPRIETARY INFORMATION OF
+ *        AT&T AND IS NOT TO BE DISCLOSED OR USED EXCEPT IN
+ *             ACCORDANCE WITH APPLICABLE AGREEMENTS.
+ *
+ *          Copyright (c) 2013 AT&T Knowledge Ventures
+ *              Unpublished and Not for Publication
+ *                     All Rights Reserved
+ */
+package com.att.research.xacmlatt.pdp.std.functions;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.att.research.xacml.api.XACML3;
+import com.att.research.xacml.std.datatypes.DataTypes;
+import com.att.research.xacmlatt.pdp.policy.ExpressionResult;
+import com.att.research.xacmlatt.pdp.policy.FunctionArgument;
+import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;
+import com.att.research.xacmlatt.pdp.std.StdFunctions;
+
+/**
+ * Only one function to test here.  Code copy/pasted from FunctionDefinitionEqualityTest
+ * 
+ * TO RUN - use jUnit
+ * In Eclipse select this file or the enclosing directory, right-click and select Run As/JUnit Test
+ * 
+ * In the first implementation of XACML we had separate files for each XACML Function.
+ * This release combines multiple Functions in fewer files to minimize code duplication.
+ * This file supports the following XACML codes:
+ * 		string-equal-ignore-case
+ * 
+ * @author glenngriffin
+ *
+ */
+public class FunctionDefinitionStringEqualIgnoreCaseTest {
+
+	/*
+	 * variables useful in the following tests
+	 */
+	List<FunctionArgument> arguments = new ArrayList<FunctionArgument>();
+	
+	FunctionArgumentAttributeValue stringAttr1 = null;
+	FunctionArgumentAttributeValue stringAttr2 = null;
+	FunctionArgumentAttributeValue stringAttr3 = null;
+	FunctionArgumentAttributeValue stringAttr4 = null;
+	
+	FunctionArgumentAttributeValue intAttr1 = null;
+
+	public FunctionDefinitionStringEqualIgnoreCaseTest() {
+		try {
+			stringAttr1 = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue("abc"));
+			stringAttr2 = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue("abc"));
+			stringAttr3 = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue("ABC"));
+			stringAttr4 = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue("def"));
+			intAttr1 = new FunctionArgumentAttributeValue(DataTypes.DT_INTEGER.createAttributeValue(1));
+		} catch (Exception e) {
+			fail("creating attribute e="+ e);
+		}
+	}
+	
+	
+	/**
+	 * String match even when Case is different
+	 */
+	@Test
+	public void testFunctionDefinitionStringEqualIgnoreCase() {
+		
+		FunctionDefinitionEquality<?> fd = (FunctionDefinitionEquality<?>) StdFunctions.FD_STRING_EQUAL_IGNORE_CASE;
+		
+		// check identity and type of the thing created
+		assertEquals(XACML3.ID_FUNCTION_STRING_EQUAL_IGNORE_CASE, fd.getId());
+		assertEquals(DataTypes.DT_STRING.getId(), fd.getDataTypeArgs().getId());
+		
+		// just to be safe...  If tests take too long these can probably be eliminated
+		assertEquals(DataTypes.DT_BOOLEAN.getId(), fd.getDataTypeId());
+		assertFalse(fd.returnsBag());
+		assertEquals(new Integer(2), fd.getNumArgs());
+		
+
+		
+		// test normal equals and non-equals
+		// check "abc" with "abc"
+		arguments.add(stringAttr1);
+		arguments.add(stringAttr2);
+		ExpressionResult res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		Boolean resValue = (Boolean)res.getValue().getValue();
+		assertTrue(resValue);
+
+		// check "abc" with "ABC" (should be same)
+		arguments.clear();
+		arguments.add(stringAttr1);
+		arguments.add(stringAttr3);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		resValue = (Boolean)res.getValue().getValue();
+		assertTrue(resValue);
+		
+		// test bad args data types?  Not needed?
+		arguments.clear();
+		arguments.add(stringAttr1);
+		arguments.add(intAttr1);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+
+		
+//TODO - null in either first or 2nd arg => NullPointerException
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/94fcdd90/openaz-xacml-test/src/test/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionStringFunctionsTest.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionStringFunctionsTest.java b/openaz-xacml-test/src/test/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionStringFunctionsTest.java
new file mode 100755
index 0000000..7a3b1c5
--- /dev/null
+++ b/openaz-xacml-test/src/test/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionStringFunctionsTest.java
@@ -0,0 +1,1477 @@
+package com.att.research.xacmlatt.pdp.std.functions;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.att.research.xacml.api.XACML3;
+import com.att.research.xacml.std.datatypes.DataTypes;
+import com.att.research.xacmlatt.pdp.policy.ExpressionResult;
+import com.att.research.xacmlatt.pdp.policy.FunctionArgument;
+import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;
+import com.att.research.xacmlatt.pdp.std.StdFunctions;
+
+/**
+ * Test of PDP Functions (See XACML core spec section A.3)
+ * 
+ * TO RUN - use jUnit
+ * In Eclipse select this file or the enclosing directory, right-click and select Run As/JUnit Test
+ * 
+ * @author glenngriffin
+ *
+ */
+public class FunctionDefinitionStringFunctionsTest {
+
+
+	/*
+	 * variables useful in the following tests
+	 */
+	List<FunctionArgument> arguments = new ArrayList<FunctionArgument>();
+	
+	ExpressionResult res;
+
+	
+	@Test
+	public void testConcatenate() {
+		String v1 = new String("abc");
+		String v2 = new String("def");
+		
+		FunctionArgumentAttributeValue attrV1 = null;
+		FunctionArgumentAttributeValue attrV2 = null;
+		FunctionArgumentAttributeValue attrNull = null;
+		FunctionArgumentAttributeValue attrBlank = null;
+		FunctionArgumentAttributeValue attrInteger = null;
+		try {
+			attrV1 = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(v1));
+			attrV2 = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(v2));
+			attrBlank = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(""));
+			attrNull = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(null));
+			attrInteger = new FunctionArgumentAttributeValue(DataTypes.DT_INTEGER.createAttributeValue(1234));
+		} catch (Exception e) {
+			fail("creating attributes e="+ e);
+		}
+		
+		FunctionDefinitionStringFunctions<?,?> fd = (FunctionDefinitionStringFunctions<?,?>) StdFunctions.FD_STRING_CONCATENATE;
+
+		// check identity and type of the thing created
+		assertEquals(XACML3.ID_FUNCTION_STRING_CONCATENATE, fd.getId());
+		assertEquals(DataTypes.DT_STRING.getId(), fd.getDataTypeId());
+		
+		// just to be safe...  If tests take too long these can probably be eliminated
+		assertFalse(fd.returnsBag());
+
+		
+		// match
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrV2);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(String.class, res.getValue().getValue().getClass());
+		String resValue = (String)res.getValue().getValue();
+		assertEquals(v1 + v2, resValue);
+		
+		// empty non-null first arg
+		arguments.clear();
+		arguments.add(attrBlank);
+		arguments.add(attrV2);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(String.class, res.getValue().getValue().getClass());
+		resValue = (String)res.getValue().getValue();
+		assertEquals(v2, resValue);
+		
+		// empty non-null second arg
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrBlank);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(String.class, res.getValue().getValue().getClass());
+		resValue = (String)res.getValue().getValue();
+		assertEquals(v1, resValue);
+		
+		// two blanks
+		arguments.clear();
+		arguments.add(attrBlank);
+		arguments.add(attrBlank);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(String.class, res.getValue().getValue().getClass());
+		resValue = (String)res.getValue().getValue();
+		assertEquals("", resValue);
+		
+		// null firat arg
+		arguments.clear();
+		arguments.add(attrNull);
+		arguments.add(attrBlank);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:string-concatenate Got null attribute", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+			
+		
+		// null second arg
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrNull);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:string-concatenate Got null attribute", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		// bad arg type
+		arguments.clear();
+		arguments.add(attrInteger);
+		arguments.add(attrV2);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:string-concatenate Expected data type 'string' saw 'integer'", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		// null second arg
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrNull);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:string-concatenate Got null attribute", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+	}
+	
+	
+	
+	@Test
+	public void testStringStartsWith() {
+		String v1 = new String("abc");
+		String bigger = new String("abc some string");
+		String biggerNoMatch = new String(" abc some string");
+		String caps = new String("AbC");
+	
+		FunctionArgumentAttributeValue attrV1 = null;
+		FunctionArgumentAttributeValue attrBigger = null;
+		FunctionArgumentAttributeValue attrBiggerNoMatch = null;
+		FunctionArgumentAttributeValue attrCaps = null;
+		FunctionArgumentAttributeValue attrNull = null;
+		FunctionArgumentAttributeValue attrBlank = null;
+		FunctionArgumentAttributeValue attrInteger = null;
+		try {
+			attrV1 = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(v1));
+			attrBigger = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(bigger));
+			attrBiggerNoMatch = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(biggerNoMatch));
+			attrCaps = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(caps));
+			attrBlank = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(""));
+			attrNull = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(null));
+			attrInteger = new FunctionArgumentAttributeValue(DataTypes.DT_INTEGER.createAttributeValue(1234));
+		} catch (Exception e) {
+			fail("creating attributes e="+ e);
+		}
+		
+		FunctionDefinitionStringFunctions<?,?> fd = (FunctionDefinitionStringFunctions<?,?>) StdFunctions.FD_STRING_STARTS_WITH;
+
+		// check identity and type of the thing created
+		assertEquals(XACML3.ID_FUNCTION_STRING_STARTS_WITH, fd.getId());
+		assertEquals(DataTypes.DT_BOOLEAN.getId(), fd.getDataTypeId());
+		
+		// just to be safe...  If tests take too long these can probably be eliminated
+		assertFalse(fd.returnsBag());
+
+		
+		// match
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		Boolean resValue = (Boolean)res.getValue().getValue();
+		assertEquals(true, resValue);
+		
+		// no match
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrBiggerNoMatch);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(false, resValue);
+		
+		// caps no match
+		arguments.clear();
+		arguments.add(attrCaps);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(false, resValue);
+		
+		// bigger on the inside
+		arguments.clear();
+		arguments.add(attrBigger);
+		arguments.add(attrV1);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(false, resValue);
+		
+		// empty non-null first arg
+		arguments.clear();
+		arguments.add(attrBlank);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(true, resValue);
+		
+		// empty non-null second arg
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrBlank);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(false, resValue);
+		
+		// two blanks
+		arguments.clear();
+		arguments.add(attrBlank);
+		arguments.add(attrBlank);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(true, resValue);
+		
+		// null firat arg
+		arguments.clear();
+		arguments.add(attrNull);
+		arguments.add(attrBlank);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:string-starts-with Got null attribute", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		// null second arg
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrNull);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:string-starts-with Got null attribute", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+			
+		// illegal arg type
+		arguments.clear();
+		arguments.add(attrInteger);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:string-starts-with Expected data type 'string' saw 'integer'", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+			
+	}
+	
+	
+	@Test
+	public void testAnyuriStartsWith() {
+
+	
+		FunctionArgumentAttributeValue attrV1 = null;
+		FunctionArgumentAttributeValue attrBigger = null;
+		FunctionArgumentAttributeValue attrBiggerNoMatch = null;
+		FunctionArgumentAttributeValue attrCaps = null;
+		FunctionArgumentAttributeValue attrBigString = null;
+		FunctionArgumentAttributeValue attrNull = null;
+		FunctionArgumentAttributeValue attrBlankString = null;
+		FunctionArgumentAttributeValue attrBlankURI = null;
+		FunctionArgumentAttributeValue attrInteger = null;
+		try {
+			String v1 = new String("abc");
+			URI bigger = new URI("abc.some.string");
+			URI biggerNoMatch = new URI("Zabc.some.string");
+			String caps = new String("AbC");
+			String bigString = "thisIsSomeReallyBigStringToMatch";
+			
+			attrV1 = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(v1));
+			attrBigger = new FunctionArgumentAttributeValue(DataTypes.DT_ANYURI.createAttributeValue(bigger));
+			attrBiggerNoMatch = new FunctionArgumentAttributeValue(DataTypes.DT_ANYURI.createAttributeValue(biggerNoMatch));
+			attrCaps = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(caps));
+			attrBigString = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(bigString));
+			attrBlankString = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(""));
+			attrBlankURI = new FunctionArgumentAttributeValue(DataTypes.DT_ANYURI.createAttributeValue(""));
+			attrNull = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(null));
+			attrInteger = new FunctionArgumentAttributeValue(DataTypes.DT_INTEGER.createAttributeValue(1234));
+		} catch (Exception e) {
+			fail("creating attributes e="+ e);
+		}
+		
+		FunctionDefinitionStringFunctions<?,?> fd = (FunctionDefinitionStringFunctions<?,?>) StdFunctions.FD_ANYURI_STARTS_WITH;
+
+		// check identity and type of the thing created
+		assertEquals(XACML3.ID_FUNCTION_ANYURI_STARTS_WITH, fd.getId());
+		assertEquals(DataTypes.DT_BOOLEAN.getId(), fd.getDataTypeId());
+		
+		// just to be safe...  If tests take too long these can probably be eliminated
+		assertFalse(fd.returnsBag());
+
+		
+		// match
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		Boolean resValue = (Boolean)res.getValue().getValue();
+		assertEquals(true, resValue);
+		
+		// no match
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrBiggerNoMatch);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(false, resValue);
+		
+		// caps no match
+		arguments.clear();
+		arguments.add(attrCaps);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(false, resValue);
+		
+		// bigger on the inside
+		arguments.clear();
+		arguments.add(attrBigString);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(false, resValue);
+		
+		// empty non-null first arg
+		arguments.clear();
+		arguments.add(attrBlankString);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(true, resValue);
+		
+		// empty non-null second arg
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrBlankURI);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(false, resValue);
+		
+		
+		// two blanks
+		arguments.clear();
+		arguments.add(attrBlankString);
+		arguments.add(attrBlankURI);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(true, resValue);
+		
+		// arguments reversed
+		arguments.clear();
+		arguments.add(attrBigger);
+		arguments.add(attrV1);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:anyURI-starts-with Expected data type 'string' saw 'anyURI'", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		
+		// null firat arg
+		arguments.clear();
+		arguments.add(attrNull);
+		arguments.add(attrBlankURI);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:anyURI-starts-with Got null attribute", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		// null second arg
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrNull);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:anyURI-starts-with Got null attribute", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+			
+		// illegal arg type
+		arguments.clear();
+		arguments.add(attrInteger);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:anyURI-starts-with Expected data type 'string' saw 'integer'", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+			
+	}
+
+	
+	
+	
+	@Test
+	public void testStringEndsWith() {
+		String v1 = new String("abc");
+		String bigger = new String("abc some string abc");
+		String biggerNoMatch = new String(" abc some string abc ");
+		String caps = new String("AbC");
+	
+		FunctionArgumentAttributeValue attrV1 = null;
+		FunctionArgumentAttributeValue attrBigger = null;
+		FunctionArgumentAttributeValue attrBiggerNoMatch = null;
+		FunctionArgumentAttributeValue attrCaps = null;
+		FunctionArgumentAttributeValue attrNull = null;
+		FunctionArgumentAttributeValue attrBlank = null;
+		FunctionArgumentAttributeValue attrInteger = null;
+		try {
+			attrV1 = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(v1));
+			attrBigger = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(bigger));
+			attrBiggerNoMatch = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(biggerNoMatch));
+			attrCaps = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(caps));
+			attrBlank = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(""));
+			attrNull = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(null));
+			attrInteger = new FunctionArgumentAttributeValue(DataTypes.DT_INTEGER.createAttributeValue(1234));
+		} catch (Exception e) {
+			fail("creating attributes e="+ e);
+		}
+		
+		FunctionDefinitionStringFunctions<?,?> fd = (FunctionDefinitionStringFunctions<?,?>) StdFunctions.FD_STRING_ENDS_WITH;
+
+		// check identity and type of the thing created
+		assertEquals(XACML3.ID_FUNCTION_STRING_ENDS_WITH, fd.getId());
+		assertEquals(DataTypes.DT_BOOLEAN.getId(), fd.getDataTypeId());
+		
+		// just to be safe...  If tests take too long these can probably be eliminated
+		assertFalse(fd.returnsBag());
+
+		
+		// match
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		Boolean resValue = (Boolean)res.getValue().getValue();
+		assertEquals(true, resValue);
+		
+		// no match
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrBiggerNoMatch);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(false, resValue);
+		
+		// caps no match
+		arguments.clear();
+		arguments.add(attrCaps);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(false, resValue);
+		
+		// bigger on the inside
+		arguments.clear();
+		arguments.add(attrBigger);
+		arguments.add(attrV1);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(false, resValue);
+		
+		// empty non-null first arg
+		arguments.clear();
+		arguments.add(attrBlank);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(true, resValue);
+		
+		// empty non-null second arg
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrBlank);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(false, resValue);
+		
+		// two blanks
+		arguments.clear();
+		arguments.add(attrBlank);
+		arguments.add(attrBlank);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(true, resValue);
+		
+		// null firat arg
+		arguments.clear();
+		arguments.add(attrNull);
+		arguments.add(attrBlank);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:string-ends-with Got null attribute", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		// null second arg
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrNull);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:string-ends-with Got null attribute", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+			
+		// illegal arg type
+		arguments.clear();
+		arguments.add(attrInteger);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:string-ends-with Expected data type 'string' saw 'integer'", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+			
+	}
+	
+	
+	@Test
+	public void testAnyuriEndsWith() {
+
+	
+		FunctionArgumentAttributeValue attrV1 = null;
+		FunctionArgumentAttributeValue attrBigger = null;
+		FunctionArgumentAttributeValue attrBiggerNoMatch = null;
+		FunctionArgumentAttributeValue attrCaps = null;
+		FunctionArgumentAttributeValue attrBigString = null;
+		FunctionArgumentAttributeValue attrNull = null;
+		FunctionArgumentAttributeValue attrBlankString = null;
+		FunctionArgumentAttributeValue attrBlankURI = null;
+		FunctionArgumentAttributeValue attrInteger = null;
+		try {
+			String v1 = new String("abc");
+			URI bigger = new URI("abc.some.stringabc");
+			URI biggerNoMatch = new URI("Zabc.some.stringabcZ");
+			String caps = new String("AbC");
+			String bigString = "thisIsSomeReallyBigStringToMatch";
+			
+			attrV1 = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(v1));
+			attrBigger = new FunctionArgumentAttributeValue(DataTypes.DT_ANYURI.createAttributeValue(bigger));
+			attrBiggerNoMatch = new FunctionArgumentAttributeValue(DataTypes.DT_ANYURI.createAttributeValue(biggerNoMatch));
+			attrCaps = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(caps));
+			attrBigString = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(bigString));
+			attrBlankString = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(""));
+			attrBlankURI = new FunctionArgumentAttributeValue(DataTypes.DT_ANYURI.createAttributeValue(""));
+			attrNull = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(null));
+			attrInteger = new FunctionArgumentAttributeValue(DataTypes.DT_INTEGER.createAttributeValue(1234));
+		} catch (Exception e) {
+			fail("creating attributes e="+ e);
+		}
+		
+		FunctionDefinitionStringFunctions<?,?> fd = (FunctionDefinitionStringFunctions<?,?>) StdFunctions.FD_ANYURI_ENDS_WITH;
+
+		// check identity and type of the thing created
+		assertEquals(XACML3.ID_FUNCTION_ANYURI_ENDS_WITH, fd.getId());
+		assertEquals(DataTypes.DT_BOOLEAN.getId(), fd.getDataTypeId());
+		
+		// just to be safe...  If tests take too long these can probably be eliminated
+		assertFalse(fd.returnsBag());
+
+		
+		// match
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		Boolean resValue = (Boolean)res.getValue().getValue();
+		assertEquals(true, resValue);
+		
+		// no match
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrBiggerNoMatch);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(false, resValue);
+		
+		// caps no match
+		arguments.clear();
+		arguments.add(attrCaps);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(false, resValue);
+		
+		// bigger on the inside
+		arguments.clear();
+		arguments.add(attrBigString);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(false, resValue);
+		
+		// empty non-null first arg
+		arguments.clear();
+		arguments.add(attrBlankString);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(true, resValue);
+		
+		// empty non-null second arg
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrBlankURI);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(false, resValue);
+		
+		
+		// two blanks
+		arguments.clear();
+		arguments.add(attrBlankString);
+		arguments.add(attrBlankURI);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(true, resValue);
+		
+		// arguments reversed
+		arguments.clear();
+		arguments.add(attrBigger);
+		arguments.add(attrV1);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:anyURI-ends-with Expected data type 'string' saw 'anyURI'", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		
+		// null firat arg
+		arguments.clear();
+		arguments.add(attrNull);
+		arguments.add(attrBlankURI);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:anyURI-ends-with Got null attribute", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		// null second arg
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrNull);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:anyURI-ends-with Got null attribute", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		// illegal arg type
+		arguments.clear();
+		arguments.add(attrInteger);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:anyURI-ends-with Expected data type 'string' saw 'integer'", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+			
+	}
+	
+	
+	
+	
+	@Test
+	public void testStringSubstring() {
+		String bigString = new String("abc some string abc");
+
+		FunctionArgumentAttributeValue attrBigString = null;
+		FunctionArgumentAttributeValue attrNull = null;
+		FunctionArgumentAttributeValue attrBlank = null;
+		FunctionArgumentAttributeValue attrDouble = null;
+	
+		FunctionArgumentAttributeValue attrInteger0 = null;
+		FunctionArgumentAttributeValue attrInteger1 = null;
+		FunctionArgumentAttributeValue attrIntegerM1 = null;
+		FunctionArgumentAttributeValue attrInteger8 = null;
+		FunctionArgumentAttributeValue attrInteger19 = null;
+		FunctionArgumentAttributeValue attrInteger20 = null;
+
+		
+		
+		try {
+			attrBigString = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(bigString));
+			attrBlank = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(""));
+			attrNull = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(null));
+			attrInteger0 = new FunctionArgumentAttributeValue(DataTypes.DT_INTEGER.createAttributeValue(0));
+			attrInteger1 = new FunctionArgumentAttributeValue(DataTypes.DT_INTEGER.createAttributeValue(1));
+			attrIntegerM1 = new FunctionArgumentAttributeValue(DataTypes.DT_INTEGER.createAttributeValue(-1));
+			attrInteger8 = new FunctionArgumentAttributeValue(DataTypes.DT_INTEGER.createAttributeValue(8));
+			attrInteger19 = new FunctionArgumentAttributeValue(DataTypes.DT_INTEGER.createAttributeValue(19));
+			attrInteger20 = new FunctionArgumentAttributeValue(DataTypes.DT_INTEGER.createAttributeValue(20));
+			attrDouble = new FunctionArgumentAttributeValue(DataTypes.DT_DOUBLE.createAttributeValue(123.4));
+		} catch (Exception e) {
+			fail("creating attributes e="+ e);
+		}
+		
+		FunctionDefinitionStringFunctions<?,?> fd = (FunctionDefinitionStringFunctions<?,?>) StdFunctions.FD_STRING_SUBSTRING;
+
+		// check identity and type of the thing created
+		assertEquals(XACML3.ID_FUNCTION_STRING_SUBSTRING, fd.getId());
+		assertEquals(DataTypes.DT_STRING.getId(), fd.getDataTypeId());
+		
+		// just to be safe...  If tests take too long these can probably be eliminated
+		assertFalse(fd.returnsBag());
+
+		
+		// match
+		arguments.clear();
+		arguments.add(attrBigString);
+		arguments.add(attrInteger1);
+		arguments.add(attrInteger8);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(String.class, res.getValue().getValue().getClass());
+		String resValue = (String)res.getValue().getValue();
+		assertEquals("bc some", resValue);
+		
+		// edge: start
+		arguments.clear();
+		arguments.add(attrBigString);
+		arguments.add(attrInteger0);
+		arguments.add(attrInteger8);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(String.class, res.getValue().getValue().getClass());
+		resValue = (String)res.getValue().getValue();
+		assertEquals("abc some", resValue);
+		
+		// edge: end
+		arguments.clear();
+		arguments.add(attrBigString);
+		arguments.add(attrInteger8);
+		arguments.add(attrInteger19);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(String.class, res.getValue().getValue().getClass());
+		resValue = (String)res.getValue().getValue();
+		assertEquals(" string abc", resValue);
+		
+		// from index to end of string
+		arguments.clear();
+		arguments.add(attrBigString);
+		arguments.add(attrInteger8);
+		arguments.add(attrIntegerM1);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(String.class, res.getValue().getValue().getClass());
+		resValue = (String)res.getValue().getValue();
+		assertEquals(" string abc", resValue);
+		
+		// first index too low
+		arguments.clear();
+		arguments.add(attrBigString);
+		arguments.add(attrIntegerM1);
+		arguments.add(attrInteger8);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:string-substring Start point '-1' out of range 0-19 for string='abc some string abc'", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+			
+		
+		// second index too big
+		arguments.clear();
+		arguments.add(attrBigString);
+		arguments.add(attrInteger8);
+		arguments.add(attrInteger20);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:string-substring End point '20' out of range 0-19 for string='abc some string abc'", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+			
+		// indexes reversed
+		arguments.clear();
+		arguments.add(attrBigString);
+		arguments.add(attrInteger8);
+		arguments.add(attrInteger1);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:string-substring End point '1' less than start point 'null' for string='abc some string abc'", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		// indexes the same
+		arguments.clear();
+		arguments.add(attrBigString);
+		arguments.add(attrInteger8);
+		arguments.add(attrInteger8);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(String.class, res.getValue().getValue().getClass());
+		resValue = (String)res.getValue().getValue();
+		assertEquals("", resValue);
+		
+		// blank string with indexes both 0
+		arguments.clear();
+		arguments.add(attrBlank);
+		arguments.add(attrInteger0);
+		arguments.add(attrInteger0);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(String.class, res.getValue().getValue().getClass());
+		resValue = (String)res.getValue().getValue();
+		assertEquals("", resValue);
+		
+		// non-string first attribute
+		arguments.clear();
+		arguments.add(attrDouble);
+		arguments.add(attrInteger8);
+		arguments.add(attrInteger1);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:string-substring Expected data type 'string' saw 'double'", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		// non-integer 2nd attr
+		arguments.clear();
+		arguments.add(attrBigString);
+		arguments.add(attrDouble);
+		arguments.add(attrInteger1);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:string-substring Expected data type 'integer' saw 'double'", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		// non-integer 3rd attr
+		arguments.clear();
+		arguments.add(attrBigString);
+		arguments.add(attrInteger8);
+		arguments.add(attrDouble);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:string-substring Expected data type 'integer' saw 'double'", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		// 4 args
+		arguments.clear();
+		arguments.add(attrBigString);
+		arguments.add(attrInteger8);
+		arguments.add(attrInteger1);
+		arguments.add(attrInteger1);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:string-substring Expected 3 arguments, got 4", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		// 2 args
+		arguments.clear();
+		arguments.add(attrBigString);
+		arguments.add(attrInteger8);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:string-substring Expected 3 arguments, got 2", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		// null 1st arg
+		arguments.clear();
+		arguments.add(attrNull);
+		arguments.add(attrInteger8);
+		arguments.add(attrInteger1);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:string-substring Got null attribute", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		
+		// null 2nd arg
+		arguments.clear();
+		arguments.add(attrBigString);
+		arguments.add(attrNull);
+		arguments.add(attrInteger1);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:string-substring Got null attribute", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+
+	}
+	
+	
+	
+	
+	@Test
+	public void testAnyURISubstring() {
+		String bigString = new String("http://company.com:8080/this/is/some/long/uri");
+
+		FunctionArgumentAttributeValue attrURI = null;
+		FunctionArgumentAttributeValue attrNull = null;
+		FunctionArgumentAttributeValue attrBlank = null;
+		FunctionArgumentAttributeValue attrDouble = null;
+	
+		FunctionArgumentAttributeValue attrInteger0 = null;
+		FunctionArgumentAttributeValue attrInteger1 = null;
+		FunctionArgumentAttributeValue attrIntegerM1 = null;
+		FunctionArgumentAttributeValue attrInteger8 = null;
+		FunctionArgumentAttributeValue attrInteger45 = null;
+		FunctionArgumentAttributeValue attrInteger46 = null;
+
+		
+		
+		try {
+			attrURI = new FunctionArgumentAttributeValue(DataTypes.DT_ANYURI.createAttributeValue(bigString));
+			attrBlank = new FunctionArgumentAttributeValue(DataTypes.DT_ANYURI.createAttributeValue(""));
+			attrNull = new FunctionArgumentAttributeValue(DataTypes.DT_ANYURI.createAttributeValue(null));
+			attrInteger0 = new FunctionArgumentAttributeValue(DataTypes.DT_INTEGER.createAttributeValue(0));
+			attrInteger1 = new FunctionArgumentAttributeValue(DataTypes.DT_INTEGER.createAttributeValue(1));
+			attrIntegerM1 = new FunctionArgumentAttributeValue(DataTypes.DT_INTEGER.createAttributeValue(-1));
+			attrInteger8 = new FunctionArgumentAttributeValue(DataTypes.DT_INTEGER.createAttributeValue(8));
+			attrInteger45 = new FunctionArgumentAttributeValue(DataTypes.DT_INTEGER.createAttributeValue(45));
+			attrInteger46 = new FunctionArgumentAttributeValue(DataTypes.DT_INTEGER.createAttributeValue(46));
+			attrDouble = new FunctionArgumentAttributeValue(DataTypes.DT_DOUBLE.createAttributeValue(123.4));
+		} catch (Exception e) {
+			fail("creating attributes e="+ e);
+		}
+		
+		FunctionDefinitionStringFunctions<?,?> fd = (FunctionDefinitionStringFunctions<?,?>) StdFunctions.FD_ANYURI_SUBSTRING;
+
+		// check identity and type of the thing created
+		assertEquals(XACML3.ID_FUNCTION_ANYURI_SUBSTRING, fd.getId());
+		assertEquals(DataTypes.DT_STRING.getId(), fd.getDataTypeId());
+		
+		// just to be safe...  If tests take too long these can probably be eliminated
+		assertFalse(fd.returnsBag());
+
+		
+		// match
+		arguments.clear();
+		arguments.add(attrURI);
+		arguments.add(attrInteger1);
+		arguments.add(attrInteger8);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(String.class, res.getValue().getValue().getClass());
+		String resValue = (String)res.getValue().getValue();
+		assertEquals("ttp://c", resValue);
+		
+		// edge: start
+		arguments.clear();
+		arguments.add(attrURI);
+		arguments.add(attrInteger0);
+		arguments.add(attrInteger8);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(String.class, res.getValue().getValue().getClass());
+		resValue = (String)res.getValue().getValue();
+		assertEquals("http://c", resValue);
+
+		// edge: end
+		arguments.clear();
+		arguments.add(attrURI);
+		arguments.add(attrInteger8);
+		arguments.add(attrInteger45);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(String.class, res.getValue().getValue().getClass());
+		resValue = (String)res.getValue().getValue();
+		assertEquals("ompany.com:8080/this/is/some/long/uri", resValue);
+		
+		// from index to end of string
+		arguments.clear();
+		arguments.add(attrURI);
+		arguments.add(attrInteger8);
+		arguments.add(attrIntegerM1);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(String.class, res.getValue().getValue().getClass());
+		resValue = (String)res.getValue().getValue();
+		assertEquals("ompany.com:8080/this/is/some/long/uri", resValue);
+		
+		// first index too low
+		arguments.clear();
+		arguments.add(attrURI);
+		arguments.add(attrIntegerM1);
+		arguments.add(attrInteger8);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:anyURI-substring Start point '-1' out of range 0-45 for string='http://company.com:8080/this/is/some/long/uri'", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+			
+		
+		// second index too big
+		arguments.clear();
+		arguments.add(attrURI);
+		arguments.add(attrInteger8);
+		arguments.add(attrInteger46);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:anyURI-substring End point '46' out of range 0-45 for string='http://company.com:8080/this/is/some/long/uri'", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+			
+		// indexes reversed
+		arguments.clear();
+		arguments.add(attrURI);
+		arguments.add(attrInteger8);
+		arguments.add(attrInteger1);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:anyURI-substring End point '1' less than start point 'null' for string='http://company.com:8080/this/is/some/long/uri'", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		// indexes the same
+		arguments.clear();
+		arguments.add(attrURI);
+		arguments.add(attrInteger8);
+		arguments.add(attrInteger8);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(String.class, res.getValue().getValue().getClass());
+		resValue = (String)res.getValue().getValue();
+		assertEquals("", resValue);
+		
+		// blank string with indexes both 0
+		arguments.clear();
+		arguments.add(attrBlank);
+		arguments.add(attrInteger0);
+		arguments.add(attrInteger0);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(String.class, res.getValue().getValue().getClass());
+		resValue = (String)res.getValue().getValue();
+		assertEquals("", resValue);
+		
+		// non-string first attribute
+		arguments.clear();
+		arguments.add(attrDouble);
+		arguments.add(attrInteger8);
+		arguments.add(attrInteger1);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:anyURI-substring Expected data type 'anyURI' saw 'double'", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		// non-integer 2nd attr
+		arguments.clear();
+		arguments.add(attrURI);
+		arguments.add(attrDouble);
+		arguments.add(attrInteger1);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:anyURI-substring Expected data type 'integer' saw 'double'", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		// non-integer 3rd attr
+		arguments.clear();
+		arguments.add(attrURI);
+		arguments.add(attrInteger8);
+		arguments.add(attrDouble);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:anyURI-substring Expected data type 'integer' saw 'double'", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		// 4 args
+		arguments.clear();
+		arguments.add(attrURI);
+		arguments.add(attrInteger8);
+		arguments.add(attrInteger1);
+		arguments.add(attrInteger1);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:anyURI-substring Expected 3 arguments, got 4", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		// 2 args
+		arguments.clear();
+		arguments.add(attrURI);
+		arguments.add(attrInteger8);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:anyURI-substring Expected 3 arguments, got 2", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		// null 1st arg
+		arguments.clear();
+		arguments.add(attrNull);
+		arguments.add(attrInteger8);
+		arguments.add(attrInteger1);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:anyURI-substring Got null attribute", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		
+		// null 2nd arg
+		arguments.clear();
+		arguments.add(attrURI);
+		arguments.add(attrNull);
+		arguments.add(attrInteger1);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:anyURI-substring Got null attribute", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+	}
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	@Test
+	public void testStringContains() {
+		String v1 = new String("abc");
+		String bigger = new String("abc some string abc");
+		String biggerNoMatch = new String(" abc some string abc ");
+		String caps = new String("AbC");
+	
+		FunctionArgumentAttributeValue attrV1 = null;
+		FunctionArgumentAttributeValue attrBigger = null;
+		FunctionArgumentAttributeValue attrBiggerNoMatch = null;
+		FunctionArgumentAttributeValue attrCaps = null;
+		FunctionArgumentAttributeValue attrNull = null;
+		FunctionArgumentAttributeValue attrBlank = null;
+		FunctionArgumentAttributeValue attrInteger = null;
+		try {
+			attrV1 = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(v1));
+			attrBigger = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(bigger));
+			attrBiggerNoMatch = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(biggerNoMatch));
+			attrCaps = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(caps));
+			attrBlank = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(""));
+			attrNull = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(null));
+			attrInteger = new FunctionArgumentAttributeValue(DataTypes.DT_INTEGER.createAttributeValue(1234));
+		} catch (Exception e) {
+			fail("creating attributes e="+ e);
+		}
+		
+		FunctionDefinitionStringFunctions<?,?> fd = (FunctionDefinitionStringFunctions<?,?>) StdFunctions.FD_STRING_CONTAINS;
+
+		// check identity and type of the thing created
+		assertEquals(XACML3.ID_FUNCTION_STRING_CONTAINS, fd.getId());
+		assertEquals(DataTypes.DT_BOOLEAN.getId(), fd.getDataTypeId());
+		
+		// just to be safe...  If tests take too long these can probably be eliminated
+		assertFalse(fd.returnsBag());
+
+		
+		// match
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		Boolean resValue = (Boolean)res.getValue().getValue();
+		assertEquals(true, resValue);
+		
+		// no match
+		arguments.clear();
+		arguments.add(attrBiggerNoMatch);
+		arguments.add(attrV1);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(false, resValue);
+		
+		// caps no match
+		arguments.clear();
+		arguments.add(attrCaps);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(false, resValue);
+		
+		// bigger on the inside
+		arguments.clear();
+		arguments.add(attrBigger);
+		arguments.add(attrV1);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(false, resValue);
+		
+		// empty non-null first arg
+		arguments.clear();
+		arguments.add(attrBlank);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(true, resValue);
+		
+		// empty non-null second arg
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrBlank);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(false, resValue);
+		
+		// two blanks
+		arguments.clear();
+		arguments.add(attrBlank);
+		arguments.add(attrBlank);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(true, resValue);
+		
+		// null firat arg
+		arguments.clear();
+		arguments.add(attrNull);
+		arguments.add(attrBlank);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:string-contains Got null attribute", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		// null second arg
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrNull);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:string-contains Got null attribute", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+			
+		// illegal arg type
+		arguments.clear();
+		arguments.add(attrInteger);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:string-contains Expected data type 'string' saw 'integer'", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+			
+	}
+	
+	
+	@Test
+	public void testAnyuriContains() {
+
+	
+		FunctionArgumentAttributeValue attrV1 = null;
+		FunctionArgumentAttributeValue attrBigger = null;
+		FunctionArgumentAttributeValue attrBiggerNoMatch = null;
+		FunctionArgumentAttributeValue attrCaps = null;
+		FunctionArgumentAttributeValue attrBigString = null;
+		FunctionArgumentAttributeValue attrNull = null;
+		FunctionArgumentAttributeValue attrBlankString = null;
+		FunctionArgumentAttributeValue attrBlankURI = null;
+		FunctionArgumentAttributeValue attrInteger = null;
+		try {
+			String v1 = new String("abc");
+			URI bigger = new URI("abc.some.stringabc");
+			URI biggerNoMatch = new URI("Zabc.some.stringabcZ");
+			String caps = new String("AbC");
+			String bigString = "thisIsSomeReallyBigStringToMatch";
+			
+			attrV1 = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(v1));
+			attrBigger = new FunctionArgumentAttributeValue(DataTypes.DT_ANYURI.createAttributeValue(bigger));
+			attrBiggerNoMatch = new FunctionArgumentAttributeValue(DataTypes.DT_ANYURI.createAttributeValue(biggerNoMatch));
+			attrCaps = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(caps));
+			attrBigString = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(bigString));
+			attrBlankString = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(""));
+			attrBlankURI = new FunctionArgumentAttributeValue(DataTypes.DT_ANYURI.createAttributeValue(""));
+			attrNull = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(null));
+			attrInteger = new FunctionArgumentAttributeValue(DataTypes.DT_INTEGER.createAttributeValue(1234));
+		} catch (Exception e) {
+			fail("creating attributes e="+ e);
+		}
+		
+		FunctionDefinitionStringFunctions<?,?> fd = (FunctionDefinitionStringFunctions<?,?>) StdFunctions.FD_ANYURI_CONTAINS;
+
+		// check identity and type of the thing created
+		assertEquals(XACML3.ID_FUNCTION_ANYURI_CONTAINS, fd.getId());
+		assertEquals(DataTypes.DT_BOOLEAN.getId(), fd.getDataTypeId());
+		
+		// just to be safe...  If tests take too long these can probably be eliminated
+		assertFalse(fd.returnsBag());
+
+		
+		// match
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		Boolean resValue = (Boolean)res.getValue().getValue();
+		assertEquals(true, resValue);
+		
+		// no match
+		arguments.clear();
+		arguments.add(attrBigString);
+		arguments.add(attrBiggerNoMatch);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(false, resValue);
+		
+		// caps no match
+		arguments.clear();
+		arguments.add(attrCaps);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(false, resValue);
+		
+		// bigger on the inside
+		arguments.clear();
+		arguments.add(attrBigString);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(false, resValue);
+		
+		// empty non-null first arg
+		arguments.clear();
+		arguments.add(attrBlankString);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(true, resValue);
+		
+		// empty non-null second arg
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrBlankURI);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(false, resValue);
+		
+		
+		// two blanks
+		arguments.clear();
+		arguments.add(attrBlankString);
+		arguments.add(attrBlankURI);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(Boolean.class, res.getValue().getValue().getClass());
+		resValue = (Boolean)res.getValue().getValue();
+		assertEquals(true, resValue);
+		
+		// arguments reversed
+		arguments.clear();
+		arguments.add(attrBigger);
+		arguments.add(attrV1);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:anyURI-contains Expected data type 'string' saw 'anyURI'", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		
+		// null firat arg
+		arguments.clear();
+		arguments.add(attrNull);
+		arguments.add(attrBlankURI);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:anyURI-contains Got null attribute", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		// null second arg
+		arguments.clear();
+		arguments.add(attrV1);
+		arguments.add(attrNull);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:anyURI-contains Got null attribute", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		// illegal arg type
+		arguments.clear();
+		arguments.add(attrInteger);
+		arguments.add(attrBigger);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:anyURI-contains Expected data type 'string' saw 'integer'", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+			
+	}
+	
+	
+	
+}

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/94fcdd90/openaz-xacml-test/src/test/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionStringNormalizeTest.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionStringNormalizeTest.java b/openaz-xacml-test/src/test/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionStringNormalizeTest.java
new file mode 100755
index 0000000..a09a696
--- /dev/null
+++ b/openaz-xacml-test/src/test/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionStringNormalizeTest.java
@@ -0,0 +1,98 @@
+package com.att.research.xacmlatt.pdp.std.functions;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.att.research.xacml.api.XACML3;
+import com.att.research.xacml.std.datatypes.DataTypes;
+import com.att.research.xacmlatt.pdp.policy.ExpressionResult;
+import com.att.research.xacmlatt.pdp.policy.FunctionArgument;
+import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;
+import com.att.research.xacmlatt.pdp.std.StdFunctions;
+
+/**
+ * Test of PDP Functions (See XACML core spec section A.3)
+ * 
+ * TO RUN - use jUnit
+ * In Eclipse select this file or the enclosing directory, right-click and select Run As/JUnit Test
+ * 
+ * @author glenngriffin
+ *
+ */
+public class FunctionDefinitionStringNormalizeTest {
+	
+	/*
+	 * variables useful in the following tests
+	 */
+	List<FunctionArgument> arguments = new ArrayList<FunctionArgument>();
+	
+	@Test
+	public void testString_normalize_space() {
+		String initialString = "  First and last are whitespace 	";
+		FunctionArgumentAttributeValue attr1 = null;
+		try {
+			attr1 = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(initialString));
+		} catch (Exception e) {
+			fail("creating attribute e="+ e);
+		}
+		
+		FunctionDefinitionStringNormalize fd = (FunctionDefinitionStringNormalize) StdFunctions.FD_STRING_NORMALIZE_SPACE;
+		
+		// check identity and type of the thing created
+		assertEquals(XACML3.ID_FUNCTION_STRING_NORMALIZE_SPACE, fd.getId());
+		assertEquals(DataTypes.DT_STRING.getId(), fd.getDataTypeArgs().getId());
+		assertEquals(DataTypes.DT_STRING.getId(), fd.getDataTypeId());
+		
+		// just to be safe...  If tests take too long these can probably be eliminated
+		assertFalse(fd.returnsBag());
+		assertEquals(new Integer(1), fd.getNumArgs());
+		
+		
+		// test normal add
+		arguments.add(attr1);
+		ExpressionResult res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		String resValue = (String)res.getValue().getValue();
+		assertEquals(initialString.length() - 4, resValue.length());
+		assertTrue(initialString.trim().equals(resValue));
+	}
+
+	
+	@Test
+	public void testString_normalize_to_lower_case() {
+		String initialString = "  First and last are whitespace 	";
+		FunctionArgumentAttributeValue attr1 = null;
+		try {
+			attr1 = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue(initialString));
+		} catch (Exception e) {
+			fail("creating attribute e="+ e);
+		}
+		
+		FunctionDefinitionStringNormalize fd = (FunctionDefinitionStringNormalize) StdFunctions.FD_STRING_NORMALIZE_TO_LOWER_CASE;
+		
+		// check identity and type of the thing created
+		assertEquals(XACML3.ID_FUNCTION_STRING_NORMALIZE_TO_LOWER_CASE, fd.getId());
+		assertEquals(DataTypes.DT_STRING.getId(), fd.getDataTypeArgs().getId());
+		assertEquals(DataTypes.DT_STRING.getId(), fd.getDataTypeId());
+		
+		// just to be safe...  If tests take too long these can probably be eliminated
+		assertFalse(fd.returnsBag());
+		assertEquals(new Integer(1), fd.getNumArgs());
+		
+		
+		// test normal add
+		arguments.add(attr1);
+		ExpressionResult res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		String resValue = (String)res.getValue().getValue();
+		assertTrue(initialString.toLowerCase().equals(resValue));
+	}
+	
+}

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/94fcdd90/openaz-xacml-test/src/test/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionURIStringConcatenateTest.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionURIStringConcatenateTest.java b/openaz-xacml-test/src/test/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionURIStringConcatenateTest.java
new file mode 100755
index 0000000..9da1f13
--- /dev/null
+++ b/openaz-xacml-test/src/test/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionURIStringConcatenateTest.java
@@ -0,0 +1,165 @@
+package com.att.research.xacmlatt.pdp.std.functions;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.att.research.xacml.api.XACML2;
+import com.att.research.xacml.std.datatypes.DataTypes;
+import com.att.research.xacmlatt.pdp.policy.ExpressionResult;
+import com.att.research.xacmlatt.pdp.policy.FunctionArgument;
+import com.att.research.xacmlatt.pdp.policy.FunctionArgumentAttributeValue;
+import com.att.research.xacmlatt.pdp.std.StdFunctions;
+
+/**
+ * Test of PDP Functions (See XACML core spec section A.3)
+ * 
+ * TO RUN - use jUnit
+ * In Eclipse select this file or the enclosing directory, right-click and select Run As/JUnit Test
+ * 
+ * @author glenngriffin
+ *
+ */
+public class FunctionDefinitionURIStringConcatenateTest {
+
+	/*
+	 * THE FUNCTION BEING TESTED BY THIS CLASS IS DEPRECATED
+	 * uri-string-concatenate has been deprecated in XACML 3.0
+	 */
+
+	/*
+	 * variables useful in the following tests
+	 */
+	List<FunctionArgument> arguments = new ArrayList<FunctionArgument>();
+	
+
+	@SuppressWarnings("deprecation")
+	@Test
+	public void testURI_string_concatenate() {
+
+		// URI args
+		FunctionArgumentAttributeValue attrURI1 = null;
+
+		
+		FunctionArgumentAttributeValue attrStrAbc = null;
+		FunctionArgumentAttributeValue attrStrSlashMno = null;
+		FunctionArgumentAttributeValue attrStrSlashInMiddle = null;
+		FunctionArgumentAttributeValue attrStrWithSpace = null;
+
+		
+		try {
+			attrURI1 = new FunctionArgumentAttributeValue(DataTypes.DT_ANYURI.createAttributeValue("http://someplace"));
+		
+			
+			attrStrAbc = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue("Abc"));
+			attrStrSlashMno = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue("/Mno"));
+			attrStrSlashInMiddle = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue("hij/pqr"));
+			attrStrWithSpace = new FunctionArgumentAttributeValue(DataTypes.DT_STRING.createAttributeValue("x y z"));
+			
+
+		} catch (Exception e) {
+			fail("creating attributes e="+ e);
+		}
+		
+		// deprecation marking in the following line is correct - this function IS deprecated but still valid for XACML 3.0
+		FunctionDefinitionURIStringConcatenate fd = (FunctionDefinitionURIStringConcatenate) StdFunctions.FD_URI_STRING_CONCATENATE;
+
+		// check identity and type of the thing created
+		assertEquals(XACML2.ID_FUNCTION_URI_STRING_CONCATENATE, fd.getId());
+		assertEquals(DataTypes.DT_ANYURI.getId(), fd.getDataTypeId());
+		
+		// just to be safe...  If tests take too long these can probably be eliminated
+		assertFalse(fd.returnsBag());
+
+		
+		// add one string to uri
+		arguments.clear();
+		arguments.add(attrURI1);
+		arguments.add(attrStrAbc);
+		ExpressionResult res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(URI.class, res.getValue().getValue().getClass());
+		URI resValue = (URI)res.getValue().getValue();
+		assertEquals("http://someplaceAbc", resValue.toString());
+		
+		
+		// add 2 strings to uri
+		arguments.clear();
+		arguments.add(attrURI1);
+		arguments.add(attrStrAbc);
+		arguments.add(attrStrSlashMno);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(URI.class, res.getValue().getValue().getClass());
+		resValue = (URI)res.getValue().getValue();
+		assertEquals("http://someplaceAbc/Mno", resValue.toString());
+		
+		// slash in middle of string
+		arguments.clear();
+		arguments.add(attrURI1);
+		arguments.add(attrStrSlashInMiddle);
+		arguments.add(attrStrSlashMno);
+		res = fd.evaluate(null, arguments);
+		assertTrue(res.isOk());
+		assertEquals(URI.class, res.getValue().getValue().getClass());
+		resValue = (URI)res.getValue().getValue();
+		assertEquals("http://someplacehij/pqr/Mno", resValue.toString());
+		
+		// create bad uri
+		arguments.clear();
+		arguments.add(attrURI1);
+		arguments.add(attrStrWithSpace);
+		arguments.add(attrStrSlashMno);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:uri-string-concatenate Final string 'http://someplacex y z/Mno' not URI, Illegal character in authority at index 7: http://someplacex y z/Mno", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:syntax-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		// no args
+		arguments.clear();
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:uri-string-concatenate Expected 2 or more arguments, got 0", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		// one arg
+		arguments.clear();
+		arguments.add(attrURI1);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:uri-string-concatenate Expected 2 or more arguments, got 1", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		
+		// first arg not uri
+		arguments.clear();
+		arguments.add(attrStrAbc);
+		arguments.add(attrURI1);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:uri-string-concatenate Expected data type 'anyURI' saw 'string' at arg index 0", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+		
+		// 2nd arg not string
+		arguments.clear();
+		arguments.add(attrURI1);
+		arguments.add(attrURI1);
+		res = fd.evaluate(null, arguments);
+		assertFalse(res.isOk());
+		assertEquals("function:uri-string-concatenate Expected data type 'string' saw 'anyURI' at arg index 1", res.getStatus().getStatusMessage());
+		assertEquals("urn:oasis:names:tc:xacml:1.0:status:processing-error", res.getStatus().getStatusCode().getStatusCodeValue().stringValue());
+		
+	}
+	
+
+	
+
+}