Adjust test to not fail if checks cause a slight delay

Also make toString() return the same information on repeated calls again
centic9 · Nov 11, 2022 · 0498f63 · 0498f63
1 parent 4783886
commit 0498f63
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/main/java/org/dstadler/audio/buffer/CountingSeekableRingBufferImpl.java b/src/main/java/org/dstadler/audio/buffer/CountingSeekableRingBufferImpl.java
@@ -223,9 +223,9 @@ private double getPerSecond(AtomicLong bytesWrittenOverall) {
 
     @Override
     public String toString() {
-        long time = System.currentTimeMillis() - start;
+        //long time = System.currentTimeMillis() - start;
         return
-                "Start: " + start + ", time: " + time + "/" + (double)time / 1000 + ", " +
+                "Start: " + start + /*", time: " + time + "/" + (double)time / 1000 +*/ ", " +
                 "Written: " + bytesWrittenOverall.get() + " bytes/" + chunksWrittenOverall.get() + " chunks, " +
 					String.format("%.2f", getPerSecond(bytesWrittenOverall)) + " bytes/s, " +
 					String.format("%.2f", getPerSecond(chunksWrittenOverall)) + " chunks/s" +

diff --git a/src/test/java/org/dstadler/audio/buffer/CountingSeekableRingBufferImplTest.java b/src/test/java/org/dstadler/audio/buffer/CountingSeekableRingBufferImplTest.java
@@ -67,13 +67,13 @@ public void testGetChunksReadPerSec() throws InterruptedException {
         getBuffer().add(new Chunk(new byte[] { 1 }, "", tms));
         getBuffer().add(new Chunk(new byte[] { 1 }, "", tms));
 
-        long start = System.currentTimeMillis();
-
         final double writtenPerSecond = getBuffer().getChunksWrittenPerSecond();
         assertTrue("Had: " + writtenPerSecond, Double.isInfinite(writtenPerSecond));
         assertEquals(0, getBuffer().getChunksReadPerSecond(), 0);
         assertEquals(DEFAULT_CHUNKS_PER_SECOND, getBuffer().getChunksPerSecond(), 0.01);
 
+        long start = System.currentTimeMillis();
+
         getBuffer().next();
         Thread.sleep(600);
         getBuffer().next();
@@ -86,6 +86,11 @@ public void testGetChunksReadPerSec() throws InterruptedException {
 
         assertTrue(Double.isInfinite(getBuffer().getChunksWrittenPerSecond()));
         final double expected = 4 / ((double) (end - start)) * 1000;
+        System.out.println(
+                "Having time: " + start + " - " + end + ": " + (end - start) + ": " + getBuffer() +
+                        "\n" + expected +
+                        "\n" + getBuffer().getChunksReadPerSecond());
+
         assertEquals("Having time: " + start + " - " + end + ": " + (end - start) + ": " + getBuffer(),
                 expected, getBuffer().getChunksReadPerSecond(), 0.01);
         assertEquals("Having time: " + start + " - " + end + ": " + (end - start) + ": " + getBuffer(),