svn commit: r1475927 - in /jena/trunk/jena-arq/src: main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionTimeout1.java

[andy]

Author: andy
Date: Thu Apr 25 19:41:17 2013
New Revision: 1475927

URL: http://svn.apache.org/r1475927
Log:
Timeout tests : adjust to clarified semantics, (hopefully) stabilize choice of 
timeout values in tests.

Modified:
    
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java
    
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionTimeout1.java

Modified: 
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java?rev=1475927&r1=1475926&r2=1475927&view=diff
==============================================================================
--- 
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java
 (original)
+++ 
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java
 Thu Apr 25 19:41:17 2013
@@ -77,10 +77,6 @@ public class QueryExecutionBase implemen
     private final Object        lockTimeout = new Object() ;     // 
synchronization.  
     private static final long   TIMEOUT_UNSET = -1 ;
     private static final long   TIMEOUT_INF = -2 ;
-    private static boolean isTimeoutSet(long x)
-    { 
-        return x >= 0 ;
-    }
     private long                timeout1 = TIMEOUT_UNSET ;
     private long                timeout2 = TIMEOUT_UNSET ;
     private final AlarmClock    alarmClock = AlarmClock.get() ;  
@@ -399,6 +395,11 @@ public class QueryExecutionBase implemen
     @Override
     public long getTimeout2() { return timeout2 ; }
     
+    private static boolean isTimeoutSet(long x)
+    { 
+        return x >= 0 ;
+    }
+
     class TimeoutCallback implements Runnable
     {
         @Override

Modified: 
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionTimeout1.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionTimeout1.java?rev=1475927&r1=1475926&r2=1475927&view=diff
==============================================================================
--- 
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionTimeout1.java
 (original)
+++ 
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionTimeout1.java
 Thu Apr 25 19:41:17 2013
@@ -77,9 +77,9 @@ public class TestQueryExecutionTimeout1 
     {
         String qs = prefix + "SELECT * { ?s ?p ?o }" ;
         QueryExecution qExec = QueryExecutionFactory.create(qs, ds) ;
-        qExec.setTimeout(10, TimeUnit.MILLISECONDS) ;
+        qExec.setTimeout(50, TimeUnit.MILLISECONDS) ;
         ResultSet rs = qExec.execSelect() ;
-        sleep(20) ;
+        sleep(100) ;
         exceptionExpected(rs) ; 
     }
 
@@ -201,7 +201,6 @@ public class TestQueryExecutionTimeout1 
         QueryExecution qExec = QueryExecutionFactory.create(qs, ds) ;
         qExec.setTimeout(-1, TimeUnit.MILLISECONDS, 100, 
TimeUnit.MILLISECONDS) ;
         ResultSet rs = qExec.execSelect() ;
-        sleep(200) ;
         rs.next() ; // First timeout does not go off. Resets timer.
         rs.next() ; // Second timeout does not go off
         sleep(200) ;