Refactor unit tests

pull/482/head
Mattia Iavarone 6 years ago
parent 318eabdf70
commit 75b417b88f
  1. 3
      cameraview/src/main/java/com/otaliastudios/cameraview/size/AspectRatio.java
  2. 7
      cameraview/src/test/java/com/otaliastudios/cameraview/frame/FrameManagerTest.java
  3. 6
      cameraview/src/test/java/com/otaliastudios/cameraview/frame/FrameTest.java
  4. 6
      cameraview/src/test/java/com/otaliastudios/cameraview/size/AspectRatioTest.java
  5. 8
      cameraview/src/test/java/com/otaliastudios/cameraview/size/SizeSelectorsTest.java
  6. 4
      cameraview/src/test/java/com/otaliastudios/cameraview/size/SizeTest.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<AspectRatio> {
private final static HashMap<String, AspectRatio> sCache = new HashMap<>(16);
@VisibleForTesting final static HashMap<String, AspectRatio> sCache = new HashMap<>(16);
/**
* Creates an aspect ratio for the given size.

@ -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;

@ -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;

@ -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;

@ -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;

@ -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.*;
Loading…
Cancel
Save