#9 Fix broken tests due to the recently introduced onClose().

Author: vy

src/test/java/com/vlkan/rfos/RotatingFileOutputStreamTest.java

@@ -109,13 +109,26 @@ private void test_write_insensitive_policy(boolean compress) throws Exception {
         Mockito.verify(policy, Mockito.never()).acceptWrite(Mockito.anyLong());
 
         // Trigger rotation.
+        LOGGER.trace("triggering rotation");
         stream.rotate(policy, now);
 
+        // Close the stream.
+        LOGGER.trace("closing stream");
+        stream.close();
+
         // Verify the rotation trigger.
         inOrder
                 .verify(callback)
                 .onTrigger(Mockito.same(policy), Mockito.same(now));
 
+        // Verify the rotation file close.
+        inOrder
+                .verify(callback)
+                .onClose(
+                        Mockito.same(policy),
+                        Mockito.same(now),
+                        Mockito.any(OutputStream.class));
+
         // Verify the rotation file open.
         inOrder
                 .verify(callback)
@@ -137,6 +150,16 @@ private void test_write_insensitive_policy(boolean compress) throws Exception {
         assertThat(rotatedFileLength).isEqualTo(expectedRotatedFileLength);
         assertThat(file.length()).isEqualTo(0);
 
+        // Verify the stream close. (We cannot use InOrder here since we don't
+        // know whether the rotation background task or the user-invoked close()
+        // will finish earlier.)
+        Mockito
+                .verify(callback)
+                .onClose(
+                        Mockito.isNull(),
+                        Mockito.any(Instant.class),
+                        Mockito.any(OutputStream.class));
+
         // Verify no more interactions.
         Mockito.verifyNoMoreInteractions(callback);
         Mockito.verifyNoMoreInteractions(policy);
@@ -209,6 +232,14 @@ public void test_write_sensitive_policy() throws Exception {
                         Mockito.same(policy),
                         Mockito.any(Instant.class));
 
+        // Verify the rotation file close.
+        callbackInOrder
+                .verify(callback)
+                .onClose(
+                        Mockito.same(policy),
+                        Mockito.any(Instant.class),
+                        Mockito.any(OutputStream.class));
+
         // Verify the rotation file open.
         callbackInOrder
                 .verify(callback)
@@ -375,7 +406,7 @@ public void test_adding_file_header() throws IOException {
         stream.write(payload2);
 
         // Close the stream.
-        LOGGER.trace("closing");
+        LOGGER.trace("closing stream");
         stream.close();
 
         // Verify the rotation trigger.