From 524794fe2e041696b6c3c155c406e8fe097c1c6d Mon Sep 17 00:00:00 2001
From: strangeweaver <uasal2000@yahoo.com>
Date: Thu, 18 Feb 2016 14:05:47 +0000
Subject: [PATCH] Ignore timeout test as it's vulnerable to a race condition.

---
 .../AbstractPageOperationTemplateTest.java    | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/openid-connect-common/src/test/java/org/mitre/data/AbstractPageOperationTemplateTest.java b/openid-connect-common/src/test/java/org/mitre/data/AbstractPageOperationTemplateTest.java
index 6155266e5..6dcc8a2bf 100644
--- a/openid-connect-common/src/test/java/org/mitre/data/AbstractPageOperationTemplateTest.java
+++ b/openid-connect-common/src/test/java/org/mitre/data/AbstractPageOperationTemplateTest.java
@@ -1,6 +1,7 @@
 package org.mitre.data;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -8,6 +9,7 @@ import java.util.Collection;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -74,21 +76,25 @@ public class AbstractPageOperationTemplateTest {
         op.execute();
 
         assertEquals(0L, op.getCounter());
-        assertEquals(0L, op.getLastFetchRequestTime());
+        assertEquals(0L, op.getTimeToLastFetch());
     }
 
+    /*
+    * This is a valid test however it is vulnerable to a race condition
+    * as such it is being ignored.
+     */
     @Test(timeout = 1000L)
+    @Ignore
     public void execute_nonzerotime(){
         Long timeMillis = 200L;
         CountingPageOperation op = new CountingPageOperation(Integer.MAX_VALUE,timeMillis);
         op.execute();
 
-        assertTrue("start time " + op.getStartTime() + "" +
-                " to last fetch time " + op.getLastFetchRequestTime() +
-                " or previous fetch time " + op.getPreviousFetchRequestTime() +
-                " exceeds max time" + timeMillis
-                , (op.getLastFetchRequestTime() - op.getStartTime() <= timeMillis)
-            || (op.getPreviousFetchRequestTime() - op.getStartTime() <= timeMillis));
+        assertFalse("last fetch time " + op.getTimeToLastFetch() + "" +
+                        " and previous fetch time  " + op.getTimeToPreviousFetch() +
+                        " exceed max time" + timeMillis,
+                op.getTimeToLastFetch() > timeMillis
+                        && op.getTimeToPreviousFetch() > timeMillis);
     }
 
     @Test(timeout = 1000L)
@@ -128,8 +134,8 @@ public class AbstractPageOperationTemplateTest {
         private int pageSize = 10;
         private long counter = 0L;
         private long startTime;
-        private long lastFetchRequestTime;
-        private long previousFetchRequestTime;
+        private long timeToLastFetch;
+        private long timeToPreviousFetch;
 
         private CountingPageOperation(int maxPages, long maxTime) {
             super(maxPages, maxTime);
@@ -138,11 +144,9 @@ public class AbstractPageOperationTemplateTest {
 
         @Override
         public Collection<String> fetchPage() {
-            if(lastFetchRequestTime > 0){
-                previousFetchRequestTime = lastFetchRequestTime;
-            }
+            timeToPreviousFetch = timeToLastFetch > 0 ? timeToLastFetch : 0;
+            timeToLastFetch = System.currentTimeMillis() - startTime;
 
-            lastFetchRequestTime = System.currentTimeMillis();
             List<String> page = new ArrayList<String>(pageSize);
             for(int i = 0; i < pageSize; i++ ) {
                 page.add("item " + currentPageFetch * pageSize + i);
@@ -160,12 +164,12 @@ public class AbstractPageOperationTemplateTest {
             return counter;
         }
 
-        public long getLastFetchRequestTime() {
-            return lastFetchRequestTime;
+        public long getTimeToLastFetch() {
+            return timeToLastFetch;
         }
 
-        public long getPreviousFetchRequestTime() {
-            return previousFetchRequestTime;
+        public long getTimeToPreviousFetch() {
+            return timeToPreviousFetch;
         }
 
         public long getStartTime(){