From 75b417b88f27670a68406a0024ad0034a7dc429d Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Fri, 21 Jun 2019 11:40:54 -0500 Subject: [PATCH] Refactor unit tests --- .../com/otaliastudios/cameraview/size/AspectRatio.java | 3 ++- .../cameraview/{ => frame}/FrameManagerTest.java | 7 +------ .../otaliastudios/cameraview/{ => frame}/FrameTest.java | 6 +----- .../cameraview/{ => size}/AspectRatioTest.java | 6 +----- .../cameraview/{ => size}/SizeSelectorsTest.java | 8 +------- .../com/otaliastudios/cameraview/{ => size}/SizeTest.java | 4 +--- 6 files changed, 7 insertions(+), 27 deletions(-) rename cameraview/src/test/java/com/otaliastudios/cameraview/{ => frame}/FrameManagerTest.java (93%) rename cameraview/src/test/java/com/otaliastudios/cameraview/{ => frame}/FrameTest.java (93%) rename cameraview/src/test/java/com/otaliastudios/cameraview/{ => size}/AspectRatioTest.java (93%) rename cameraview/src/test/java/com/otaliastudios/cameraview/{ => size}/SizeSelectorsTest.java (95%) rename cameraview/src/test/java/com/otaliastudios/cameraview/{ => size}/SizeTest.java (94%) diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/size/AspectRatio.java b/cameraview/src/main/java/com/otaliastudios/cameraview/size/AspectRatio.java index f16f0d6e..71a47572 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/size/AspectRatio.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/size/AspectRatio.java @@ -1,6 +1,7 @@ package com.otaliastudios.cameraview.size; import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; import java.util.HashMap; @@ -10,7 +11,7 @@ import java.util.HashMap; */ public class AspectRatio implements Comparable { - private final static HashMap sCache = new HashMap<>(16); + @VisibleForTesting final static HashMap sCache = new HashMap<>(16); /** * Creates an aspect ratio for the given size. diff --git a/cameraview/src/test/java/com/otaliastudios/cameraview/FrameManagerTest.java b/cameraview/src/test/java/com/otaliastudios/cameraview/frame/FrameManagerTest.java similarity index 93% rename from cameraview/src/test/java/com/otaliastudios/cameraview/FrameManagerTest.java rename to cameraview/src/test/java/com/otaliastudios/cameraview/frame/FrameManagerTest.java index 35b4594e..f5f94fbf 100644 --- a/cameraview/src/test/java/com/otaliastudios/cameraview/FrameManagerTest.java +++ b/cameraview/src/test/java/com/otaliastudios/cameraview/frame/FrameManagerTest.java @@ -1,19 +1,14 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.frame; -import com.otaliastudios.cameraview.frame.Frame; -import com.otaliastudios.cameraview.frame.FrameManager; import com.otaliastudios.cameraview.size.Size; import org.junit.After; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git a/cameraview/src/test/java/com/otaliastudios/cameraview/FrameTest.java b/cameraview/src/test/java/com/otaliastudios/cameraview/frame/FrameTest.java similarity index 93% rename from cameraview/src/test/java/com/otaliastudios/cameraview/FrameTest.java rename to cameraview/src/test/java/com/otaliastudios/cameraview/frame/FrameTest.java index 7060779d..b9fea96f 100644 --- a/cameraview/src/test/java/com/otaliastudios/cameraview/FrameTest.java +++ b/cameraview/src/test/java/com/otaliastudios/cameraview/frame/FrameTest.java @@ -1,10 +1,8 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.frame; import android.graphics.ImageFormat; -import com.otaliastudios.cameraview.frame.Frame; -import com.otaliastudios.cameraview.frame.FrameManager; import com.otaliastudios.cameraview.size.Size; import org.junit.After; @@ -14,10 +12,8 @@ import org.junit.Test; import static junit.framework.Assert.assertNotNull; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; diff --git a/cameraview/src/test/java/com/otaliastudios/cameraview/AspectRatioTest.java b/cameraview/src/test/java/com/otaliastudios/cameraview/size/AspectRatioTest.java similarity index 93% rename from cameraview/src/test/java/com/otaliastudios/cameraview/AspectRatioTest.java rename to cameraview/src/test/java/com/otaliastudios/cameraview/size/AspectRatioTest.java index 75973680..5c3cebfe 100644 --- a/cameraview/src/test/java/com/otaliastudios/cameraview/AspectRatioTest.java +++ b/cameraview/src/test/java/com/otaliastudios/cameraview/size/AspectRatioTest.java @@ -1,8 +1,4 @@ -package com.otaliastudios.cameraview; - - -import com.otaliastudios.cameraview.size.AspectRatio; -import com.otaliastudios.cameraview.size.Size; +package com.otaliastudios.cameraview.size; import org.junit.Test; diff --git a/cameraview/src/test/java/com/otaliastudios/cameraview/SizeSelectorsTest.java b/cameraview/src/test/java/com/otaliastudios/cameraview/size/SizeSelectorsTest.java similarity index 95% rename from cameraview/src/test/java/com/otaliastudios/cameraview/SizeSelectorsTest.java rename to cameraview/src/test/java/com/otaliastudios/cameraview/size/SizeSelectorsTest.java index f194f69b..93a4c519 100644 --- a/cameraview/src/test/java/com/otaliastudios/cameraview/SizeSelectorsTest.java +++ b/cameraview/src/test/java/com/otaliastudios/cameraview/size/SizeSelectorsTest.java @@ -1,10 +1,4 @@ -package com.otaliastudios.cameraview; - - -import com.otaliastudios.cameraview.size.AspectRatio; -import com.otaliastudios.cameraview.size.Size; -import com.otaliastudios.cameraview.size.SizeSelector; -import com.otaliastudios.cameraview.size.SizeSelectors; +package com.otaliastudios.cameraview.size; import androidx.annotation.NonNull; diff --git a/cameraview/src/test/java/com/otaliastudios/cameraview/SizeTest.java b/cameraview/src/test/java/com/otaliastudios/cameraview/size/SizeTest.java similarity index 94% rename from cameraview/src/test/java/com/otaliastudios/cameraview/SizeTest.java rename to cameraview/src/test/java/com/otaliastudios/cameraview/size/SizeTest.java index 9b24854d..5b27179e 100644 --- a/cameraview/src/test/java/com/otaliastudios/cameraview/SizeTest.java +++ b/cameraview/src/test/java/com/otaliastudios/cameraview/size/SizeTest.java @@ -1,8 +1,6 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.size; -import com.otaliastudios.cameraview.size.Size; - import org.junit.Test; import static org.junit.Assert.*;