Fix unit tests

2017-12-17 05:35:33 -08:00
parent 922eb8b202
commit b25e9a0905
6 changed files with 4 additions and 29 deletions
@@ -1,26 +0,0 @@
-package com.github.shadowsocks;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("com.github.shadowsocks", appContext.getPackageName());
-    }
-}
@@ -28,7 +28,6 @@ class AclTest {
        private const val INPUT1 = """[proxy_all]
 [bypass_list]
 1.0.1.0/24
-[proxy_list]
 (^|\.)4tern\.com${'$'}
 """
    }
@@ -0,0 +1,28 @@
+package com.github.shadowsocks.utils
+
+import org.junit.Assert
+import org.junit.Test
+import java.net.InetAddress
+
+class SubnetTest {
+    @Test
+    fun parsingAndEquals() {
+        Assert.assertEquals(Subnet(InetAddress.getByName("1.10.11.12"), 25), Subnet.fromString("1.10.11.12/25"))
+        Assert.assertEquals(Subnet(InetAddress.getByName("12.118.130.86"), 32), Subnet.fromString("12.118.130.86"))
+        Assert.assertEquals(Subnet(InetAddress.getByName("caec:cec6:c4ef:bb7b:1a78:d055:216d:3a78"), 96),
+                Subnet.fromString("caec:cec6:c4ef:bb7b:1a78:d055:216d:3a78/96"))
+        Assert.assertEquals(Subnet(InetAddress.getByName("be37:44bd:8630:7a0:2a3d:ff95:dd33:42f0"), 128),
+                Subnet.fromString("be37:44bd:8630:7a0:2a3d:ff95:dd33:42f0"))
+        Assert.assertNotEquals(Subnet.fromString("1.2.3.4/12"), Subnet.fromString("1.2.3.5/12"))
+    }
+
+    @Test
+    fun invalidParsings() {
+        Assert.assertEquals(null, Subnet.fromString("1.2.3.456"))
+        Assert.assertEquals(null, Subnet.fromString("ffff::f0000"))
+        Assert.assertEquals(null, Subnet.fromString("caec:cec6:c4ef:bb7b:1a78:d055:216d:3a78/129"))
+        Assert.assertEquals(null, Subnet.fromString("caec:cec6:c4ef:bb7b:1a78:d055:216d:3a78/129"))
+        Assert.assertEquals(null, Subnet.fromString("caec:cec6:c4ef:bb7b:1a78:d055:216d:3a78/-99"))
+        Assert.assertEquals(null, Subnet.fromString("caec:cec6:c4ef:bb7b:1a78:d055:216d:3a78/1/0"))
+    }
+}