Testing refactor

app/build.gradle.kts

@@ -38,6 +38,7 @@ dependencies {
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("org.testng:testng:6.9.6")
     testImplementation("junit:junit:4.13.2")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.8.1")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
 }

app/src/main/java/com/example/seg2105_project/MainActivityTest.java → app/src/test/java/com/example/seg2105_project/MainActivityTest.java

@@ -1,23 +1,30 @@
 package com.example.seg2105_project;
 
-import org.testng.annotations.Test;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.assertFalse;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
 
 public class MainActivityTest {
 
     @Test
     public void testValidEmail() {
         assertTrue(MainActivity.validEmail("[email protected]"));
+    }
+
+    public void testInvalidEmail() {
         assertFalse(MainActivity.validEmail("invalid-email"));
     }
 
     @Test
     public void testValidPassword() {
         assertTrue(MainActivity.validPassword("Password123"));
+    }
+
+    @Test
+    public void testInvalidShortPassword() {
         assertFalse(MainActivity.validPassword("short"));
-        assertFalse(MainActivity.validPassword("nouppercase123"));
-        assertFalse(MainActivity.validPassword("NOLOWER123"));
         assertFalse(MainActivity.validPassword("noDigitUpperCase"));
     }
+
 }