svn commit: r1411490 - in /jena/trunk/jena-arq/src: main/java/com/hp/hpl/jena/sparql/function/user/UserDefinedFunctionDefinition.java test/java/com/hp/hpl/jena/sparql/function/user/TS_UserFunctions.java

[rv...@apache.org]

Author: rvesse
Date: Tue Nov 20 00:49:11 2012
New Revision: 1411490

URL: http://svn.apache.org/viewvc?rev=1411490&view=rev
Log:
Configure TS_UserFunctions to not log warnings during test suite runs

Modified:
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/function/user/UserDefinedFunctionDefinition.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TS_UserFunctions.java

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/function/user/UserDefinedFunctionDefinition.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/function/user/UserDefinedFunctionDefinition.java?rev=1411490&r1=1411489&r2=1411490&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/function/user/UserDefinedFunctionDefinition.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/function/user/UserDefinedFunctionDefinition.java Tue Nov 20 00:49:11 2012
@@ -37,6 +37,11 @@ import com.hp.hpl.jena.sparql.sse.builde
 public class UserDefinedFunctionDefinition {
 	
 	private static final Logger LOG = LoggerFactory.getLogger(UserDefinedFunctionDefinition.class);
+	
+	/**
+	 * Whether to log warnings for unused variables
+	 */
+	public static boolean warnOnUnusedVariable = true;
 
     private String uri;
     private Expr expr;
@@ -63,7 +68,7 @@ public class UserDefinedFunctionDefiniti
         //May have more arguments than used, however this only gives warning(s)
         if (mentioned.size() < this.argList.size()) {
         	for (Var v : this.argList) {
-        		if (!mentioned.contains(v)) LOG.warn("Function <" + uri + "> has argument " + v + " which is never used in the expression");
+        		if (!mentioned.contains(v) && warnOnUnusedVariable) LOG.warn("Function <" + uri + "> has argument " + v + " which is never used in the expression");
         	}
         }
     }

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TS_UserFunctions.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TS_UserFunctions.java?rev=1411490&r1=1411489&r2=1411490&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TS_UserFunctions.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TS_UserFunctions.java Tue Nov 20 00:49:11 2012
@@ -20,6 +20,8 @@ package com.hp.hpl.jena.sparql.function.
 
 import junit.framework.JUnit4TestAdapter;
 
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
@@ -34,6 +36,20 @@ import com.hp.hpl.jena.sparql.expr.TS_Ex
     TestUserFunctionsInSparql.class
 })
 public class TS_UserFunctions {
+	
+	//Expected warnings off
+	private static boolean bWarnOnUnusedVar;
+	
+	@BeforeClass
+	public static void setup() {
+		bWarnOnUnusedVar = UserDefinedFunctionDefinition.warnOnUnusedVariable;
+		UserDefinedFunctionDefinition.warnOnUnusedVariable = false;
+	}
+	
+	@AfterClass
+	public static void teardown() {
+		UserDefinedFunctionDefinition.warnOnUnusedVariable = bWarnOnUnusedVar;
+	}
     
     public static junit.framework.Test suite() {
         return new JUnit4TestAdapter(TS_Expr.class);