Merge "Fix TimeoutInputStreamTest, TimeoutOutputStreamTest assertions"

org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/TimeoutInputStreamTest.java

 /*
- * Copyright (C) 2009, Google Inc.
+ * Copyright (C) 2009-2010, Google Inc.
  * and other copyright owners as documented in the project's IP log.
  *
  * This program and the accompanying materials are made available
@@ -170,7 +170,7 @@ private void assertTimeout() {
 		// 50 ms of the expected timeout.
 		//
 		final long wait = now() - start;
-		assertTrue(Math.abs(wait - timeout) < 50);
+		assertTrue("waited only " + wait + " ms", timeout - wait < 50);
 	}
 
 	private static List<Thread> active() {

org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/TimeoutOutputStreamTest.java

 /*
- * Copyright (C) 2009, Google Inc.
+ * Copyright (C) 2009-2010, Google Inc.
  * and other copyright owners as documented in the project's IP log.
  *
  * This program and the accompanying materials are made available
@@ -251,7 +251,7 @@ private void assertTimeout() {
 		// 50 ms of the expected timeout.
 		//
 		final long wait = now() - start;
-		assertTrue(Math.abs(wait - timeout) < 50);
+		assertTrue("waited only " + wait + " ms", timeout - wait < 50);
 	}
 
 	private static List<Thread> active() {