diff options
| author | Brian S. O'Neill <bronee@gmail.com> | 2011-05-18 20:19:42 +0000 |
|---|---|---|
| committer | Brian S. O'Neill <bronee@gmail.com> | 2011-05-18 20:19:42 +0000 |
| commit | 8a5136a3a4101110f77d24f3090b1a7008ac97e2 (patch) | |
| tree | b430f28c303c2f09d8297f1995c5a03ee4985533 | |
| parent | 856bebd5f8bf46293edc083aa1a1e9fadab25e70 (diff) | |
Fix timeout tests.
3 files changed, 5 insertions, 5 deletions
diff --git a/src/test/java/com/amazon/carbonado/TestStorables.java b/src/test/java/com/amazon/carbonado/TestStorables.java index 20f640d..a10f1cf 100644 --- a/src/test/java/com/amazon/carbonado/TestStorables.java +++ b/src/test/java/com/amazon/carbonado/TestStorables.java @@ -3475,7 +3475,7 @@ public class TestStorables extends TestCase { // Use filter to bypass optimizations. storage.query("id >= ?").with(0).count(Query.Timeout.millis(1)); fail(); - } catch (FetchInterruptedException e) { + } catch (FetchTimeoutException e) { } } @@ -3509,7 +3509,7 @@ public class TestStorables extends TestCase { cursor.next(); } fail(); - } catch (FetchInterruptedException e) { + } catch (FetchTimeoutException e) { } } diff --git a/src/test/java/com/amazon/carbonado/cursor/TestCursors.java b/src/test/java/com/amazon/carbonado/cursor/TestCursors.java index 3b8b305..ddec150 100644 --- a/src/test/java/com/amazon/carbonado/cursor/TestCursors.java +++ b/src/test/java/com/amazon/carbonado/cursor/TestCursors.java @@ -28,7 +28,7 @@ import junit.framework.TestSuite; import com.amazon.carbonado.Cursor;
import com.amazon.carbonado.FetchException;
-import com.amazon.carbonado.FetchInterruptedException;
+import com.amazon.carbonado.FetchTimeoutException;
import com.amazon.carbonado.Query;
import com.amazon.carbonado.stored.Dummy;
@@ -457,7 +457,7 @@ public class TestCursors extends TestCase { cursor.next();
}
fail();
- } catch (FetchInterruptedException e) {
+ } catch (FetchTimeoutException e) {
long end = System.nanoTime();
assertTrue(inf.mClosed);
double duration = (end - start) / 1000000000.0d;
diff --git a/src/test/java/com/amazon/carbonado/cursor/TestMergeSortBuffer.java b/src/test/java/com/amazon/carbonado/cursor/TestMergeSortBuffer.java index 4c27f1f..664e2ae 100644 --- a/src/test/java/com/amazon/carbonado/cursor/TestMergeSortBuffer.java +++ b/src/test/java/com/amazon/carbonado/cursor/TestMergeSortBuffer.java @@ -155,7 +155,7 @@ public class TestMergeSortBuffer extends TestCase { testBuffer(null, HUGE_BUFFER_SIZE, Query.Timeout.millis(100));
fail();
} catch (UndeclaredThrowableException e) {
- assertTrue(e.getCause() instanceof FetchInterruptedException);
+ assertTrue(e.getCause() instanceof FetchTimeoutException);
}
}
|
