API clean-up.

This commit is contained in:
Harald Kuhr
2018-03-06 23:22:45 +01:00
parent 15e39bce3f
commit ee299ee577
6 changed files with 35 additions and 33 deletions

View File

@@ -110,9 +110,9 @@ public class EXIFThumbnailReaderTest extends AbstractThumbnailReaderTest {
createReader(listener, 42, 43, createStream("/jpeg/cmyk-sample-multiple-chunk-icc.jpg")).read();
InOrder order = inOrder(listener);
order.verify(listener).processThumbnailStarted(42, 43);
order.verify(listener, atLeastOnce()).processThumbnailProgress(100f);
order.verify(listener).processThumbnailComplete();
order.verify(listener).thumbnailStarted(42, 43);
order.verify(listener, atLeastOnce()).thumbnailProgress(100f);
order.verify(listener).thumbnailComplete();
}
@Test
@@ -122,8 +122,8 @@ public class EXIFThumbnailReaderTest extends AbstractThumbnailReaderTest {
createReader(listener, 0, 99, createStream("/jpeg/exif-rgb-thumbnail-sony-d700.jpg")).read();
InOrder order = inOrder(listener);
order.verify(listener).processThumbnailStarted(0, 99);
order.verify(listener, atLeastOnce()).processThumbnailProgress(100f);
order.verify(listener).processThumbnailComplete();
order.verify(listener).thumbnailStarted(0, 99);
order.verify(listener, atLeastOnce()).thumbnailProgress(100f);
order.verify(listener).thumbnailComplete();
}
}

View File

@@ -97,8 +97,8 @@ public class JFIFThumbnailReaderTest extends AbstractThumbnailReaderTest {
createReader(listener, 0, 99, createStream("/jpeg/jfif-jfif-and-exif-thumbnail-sharpshot-iphone.jpg")).read();
InOrder order = inOrder(listener);
order.verify(listener).processThumbnailStarted(0, 99);
order.verify(listener, atLeastOnce()).processThumbnailProgress(100f);
order.verify(listener).processThumbnailComplete();
order.verify(listener).thumbnailStarted(0, 99);
order.verify(listener, atLeastOnce()).thumbnailProgress(100f);
order.verify(listener).thumbnailComplete();
}
}

View File

@@ -41,12 +41,8 @@ import java.io.DataInputStream;
import java.io.IOException;
import java.util.List;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
/**
* JFXXThumbnailReaderTest
@@ -91,8 +87,8 @@ public class JFXXThumbnailReaderTest extends AbstractThumbnailReaderTest {
createReader(listener, 0, 99, createStream("/jpeg/jfif-jfxx-thumbnail-olympus-d320l.jpg")).read();
InOrder order = inOrder(listener);
order.verify(listener).processThumbnailStarted(0, 99);
order.verify(listener, atLeastOnce()).processThumbnailProgress(100f);
order.verify(listener).processThumbnailComplete();
order.verify(listener).thumbnailStarted(0, 99);
order.verify(listener, atLeastOnce()).thumbnailProgress(100f);
order.verify(listener).thumbnailComplete();
}
}