From acfb70c267055c60216508c45dbe6dcae9e0bc00 Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Sun, 6 Feb 2022 12:54:43 +0100
Subject: [PATCH] Move Yandex secret validation tests to a different folder

---
 .../beemdevelopment/aegis/otp/HotpInfoTest.java | 17 +++++++++++++++++
 .../otp/{OtpTest.java => TotpInfoTest.java}     | 15 +++------------
 .../YandexInfoTest.java}                        |  9 +++------
 3 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 app/src/test/java/com/beemdevelopment/aegis/otp/HotpInfoTest.java
 rename app/src/test/java/com/beemdevelopment/aegis/otp/{OtpTest.java => TotpInfoTest.java} (56%)
 rename app/src/test/java/com/beemdevelopment/aegis/{util/YandexUtilsTest.java => otp/YandexInfoTest.java} (81%)

diff --git a/app/src/test/java/com/beemdevelopment/aegis/otp/HotpInfoTest.java b/app/src/test/java/com/beemdevelopment/aegis/otp/HotpInfoTest.java
new file mode 100644
index 00000000..dd079536
--- /dev/null
+++ b/app/src/test/java/com/beemdevelopment/aegis/otp/HotpInfoTest.java
@@ -0,0 +1,17 @@
+package com.beemdevelopment.aegis.otp;
+
+import static org.junit.Assert.assertEquals;
+
+import com.beemdevelopment.aegis.crypto.otp.HOTPTest;
+
+import org.junit.Test;
+
+public class HotpInfoTest {
+    @Test
+    public void testHotpInfoOtp() throws OtpInfoException {
+        for (int i = 0; i < HOTPTest.VECTORS.length; i++) {
+            HotpInfo info = new HotpInfo(HOTPTest.SECRET, OtpInfo.DEFAULT_ALGORITHM, OtpInfo.DEFAULT_DIGITS, i);
+            assertEquals(HOTPTest.VECTORS[i], info.getOtp());
+        }
+    }
+}
diff --git a/app/src/test/java/com/beemdevelopment/aegis/otp/OtpTest.java b/app/src/test/java/com/beemdevelopment/aegis/otp/TotpInfoTest.java
similarity index 56%
rename from app/src/test/java/com/beemdevelopment/aegis/otp/OtpTest.java
rename to app/src/test/java/com/beemdevelopment/aegis/otp/TotpInfoTest.java
index c760e29f..cc20e646 100644
--- a/app/src/test/java/com/beemdevelopment/aegis/otp/OtpTest.java
+++ b/app/src/test/java/com/beemdevelopment/aegis/otp/TotpInfoTest.java
@@ -1,21 +1,12 @@
 package com.beemdevelopment.aegis.otp;
 
-import com.beemdevelopment.aegis.crypto.otp.HOTPTest;
+import static org.junit.Assert.assertEquals;
+
 import com.beemdevelopment.aegis.crypto.otp.TOTPTest;
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-
-public class OtpTest {
-    @Test
-    public void testHotpInfoOtp() throws OtpInfoException {
-        for (int i = 0; i < HOTPTest.VECTORS.length; i++) {
-            HotpInfo info = new HotpInfo(HOTPTest.SECRET, OtpInfo.DEFAULT_ALGORITHM, OtpInfo.DEFAULT_DIGITS, i);
-            assertEquals(HOTPTest.VECTORS[i], info.getOtp());
-        }
-    }
-
+public class TotpInfoTest {
     @Test
     public void testTotpInfoOtp() throws OtpInfoException {
         for (TOTPTest.Vector vector : TOTPTest.VECTORS) {
diff --git a/app/src/test/java/com/beemdevelopment/aegis/util/YandexUtilsTest.java b/app/src/test/java/com/beemdevelopment/aegis/otp/YandexInfoTest.java
similarity index 81%
rename from app/src/test/java/com/beemdevelopment/aegis/util/YandexUtilsTest.java
rename to app/src/test/java/com/beemdevelopment/aegis/otp/YandexInfoTest.java
index 27eab00e..39c41c5f 100644
--- a/app/src/test/java/com/beemdevelopment/aegis/util/YandexUtilsTest.java
+++ b/app/src/test/java/com/beemdevelopment/aegis/otp/YandexInfoTest.java
@@ -1,16 +1,13 @@
-package com.beemdevelopment.aegis.util;
+package com.beemdevelopment.aegis.otp;
 
 import static org.junit.Assert.assertThrows;
 
 import com.beemdevelopment.aegis.encoding.Base32;
 import com.beemdevelopment.aegis.encoding.EncodingException;
-import com.beemdevelopment.aegis.otp.OtpInfoException;
-import com.beemdevelopment.aegis.otp.YandexInfo;
 
 import org.junit.Test;
 
-public class YandexUtilsTest {
-
+public class YandexInfoTest {
     private static final String[] vectors = new String[]{
             "LA2V6KMCGYMWWVEW64RNP3JA3IAAAAAAHTSG4HRZPI", // correct
             "LA2V6KMCGYMWWVEW64RNP3JA3I",                 // secret from QR - no validation
@@ -19,7 +16,7 @@ public class YandexUtilsTest {
     };
 
     @Test(expected = Test.None.class)
-    public void testValidationOk() throws EncodingException, OtpInfoException {
+    public void testYandexSecretValidationOk() throws EncodingException, OtpInfoException {
         YandexInfo.validateSecret(getBase32Vector(0));
         YandexInfo.validateSecret(getBase32Vector(1));
     }