add instrumented tests

Author: jdqm

app/build.gradle

@@ -31,9 +31,13 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support.constraint:constraint-layout:1.1.2'
     testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support:support-annotations:27.1.1'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test:rules:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     // Optional -- Mockito framework
-    testImplementation 'org.mockito:mockito-core:2.19.0'
+    testImplementation 'org.mockito:mockito-core:2.19.1'
+
+
 
 }

app/src/androidTest/java/com/jdqm/androidunittest/LogHistoryAndroidUnitTest.java

@@ -0,0 +1,54 @@
+package com.jdqm.androidunittest;
+
+import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Pair;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+/**
+ * Created by Jdqm on 2018/7/14.
+ */
+// @RunWith 只在混合使用 JUnit3 和 JUnit4 需要，若只使用JUnit4，可省略
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class LogHistoryAndroidUnitTest {
+
+    public static final String TEST_STRING = "This is a string";
+    public static final long TEST_LONG = 12345678L;
+    private LogHistory mLogHistory;
+
+    @Before
+    public void setUp() {
+        mLogHistory = new LogHistory();
+    }
+
+    @Test
+    public void logHistory_ParcelableWriteRead() {
+        mLogHistory.addEntry(TEST_STRING, TEST_LONG);
+
+        // 写数据
+        Parcel parcel = Parcel.obtain();
+        mLogHistory.writeToParcel(parcel, mLogHistory.describeContents());
+
+        // 为接下来的读操作，写完数据后需要重置parcel
+        parcel.setDataPosition(0);
+
+        // 读数据
+        LogHistory createdFromParcel = LogHistory.CREATOR.createFromParcel(parcel);
+        List<Pair<String, Long>> createdFromParcelData = createdFromParcel.getData();
+
+        // 验证接收到的数据是否正确
+        assertThat(createdFromParcelData.size(), is(1));
+        assertThat(createdFromParcelData.get(0).first, is(TEST_STRING));
+        assertThat(createdFromParcelData.get(0).second, is(TEST_LONG));
+    }
+}

app/src/main/java/com/jdqm/androidunittest/Calculate.java

@@ -1,17 +1,52 @@
 package com.jdqm.androidunittest;
 
-import java.util.regex.Matcher;
+import android.text.Editable;
+import android.text.TextWatcher;
+
 import java.util.regex.Pattern;
 
 /**
  * Created by Jdqm on 2018-7-13.
  */
-public class EmailValidator {
+public class EmailValidator implements TextWatcher {
+
+    /**
+     * Email validation pattern.
+     */
+    public static final Pattern EMAIL_PATTERN = Pattern.compile(
+            "[a-zA-Z0-9\\+\\.\\_\\%\\-\\+]{1,256}" +
+                    "\\@" +
+                    "[a-zA-Z0-9][a-zA-Z0-9\\-]{0,64}" +
+                    "(" +
+                    "\\." +
+                    "[a-zA-Z0-9][a-zA-Z0-9\\-]{0,25}" +
+                    ")+"
+    );
+
+    private boolean mIsValid = false;
+
+    public boolean isValid() {
+        return mIsValid;
+    }
 
-    public boolean isValidEmail(String email) {
-        String regex = "^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$";
-        Pattern pattern =Pattern.compile(regex);
-        Matcher matcher = pattern.matcher(email);
-        return  matcher.matches();
+    /**
+     * Validates if the given input is a valid email address.
+     *
+     * @param email        The email to validate.
+     * @return {@code true} if the input is a valid email. {@code false} otherwise.
+     */
+    public static boolean isValidEmail(CharSequence email) {
+        return email != null && EMAIL_PATTERN.matcher(email).matches();
     }
+
+    @Override
+    final public void afterTextChanged(Editable editableText) {
+        mIsValid = isValidEmail(editableText);
+    }
+
+    @Override
+    final public void beforeTextChanged(CharSequence s, int start, int count, int after) {/*No-op*/}
+
+    @Override
+    final public void onTextChanged(CharSequence s, int start, int before, int count) {/*No-op*/}
 }

app/src/main/java/com/jdqm/androidunittest/EmailValidator.java

@@ -0,0 +1,101 @@
+package com.jdqm.androidunittest;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.util.Pair;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by Jdqm on 2018/7/14.
+ */
+
+public class LogHistory implements Parcelable {
+
+    // Used to store the data to be used by the activity.
+    private final List<Pair<String, Long>> mData = new ArrayList<>();
+
+    // Creates an empty log.
+    public LogHistory() { }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel out, int flags) {
+        // Prepare an array of strings and an array of timestamps.
+        String[] texts = new String[mData.size()];
+        long[] timestamps = new long[mData.size()];
+
+        // Store the data in the arrays.
+        for (int i = 0; i < mData.size(); i++) {
+            texts[i] = mData.get(i).first;
+            timestamps[i] = mData.get(i).second;
+        }
+        // Write the size of the arrays first.
+        out.writeInt(texts.length);
+
+        // Write the two arrays in a specific order.
+        out.writeStringArray(texts);
+        out.writeLongArray(timestamps);
+    }
+
+    public static final Parcelable.Creator<LogHistory> CREATOR
+            = new Parcelable.Creator<LogHistory>() {
+
+        @Override
+        public LogHistory createFromParcel(Parcel in) {
+            return new LogHistory(in);
+        }
+
+        @Override
+        public LogHistory[] newArray(int size) {
+            return new LogHistory[size];
+        }
+    };
+
+    /**
+     * Returns a copy of the current data used by the activity.
+     */
+    public List<Pair<String, Long>> getData() {
+        return new ArrayList<>(mData);
+    }
+
+    /**
+     * Adds a new entry to the log.
+     * @param text the text to be stored in the log
+     * @param timestamp the current time in milliseconds since January 1, 1970 00:00:00.0 UTC.
+     */
+    public void addEntry(String text, long timestamp) {
+        mData.add(new Pair<String, Long>(text, timestamp));
+    }
+
+    // Constructor used from the CREATOR field that unpacks a Parcel.
+    private LogHistory(Parcel in) {
+        // First, read the size of the arrays that contain the data.
+        int length = in.readInt();
+
+        // Create the arrays to store the data.
+        String[] texts = new String[length];
+        long[] timestamps = new long[length];
+
+        // Read the arrays in a specific order.
+        in.readStringArray(texts);
+        in.readLongArray(timestamps);
+
+        // The lengths of both arrays should match or the data is corrupted.
+        if (texts.length != timestamps.length) {
+            throw new IllegalStateException("Error reading from saved state.");
+        }
+
+        // Reset the data container and update the data.
+        mData.clear();
+        for (int i = 0; i < texts.length; i++) {
+            Pair<String, Long> pair = new Pair<>(texts[i], timestamps[i]);
+            mData.add(pair);
+        }
+    }
+}

app/src/main/java/com/jdqm/androidunittest/LogHistory.java

@@ -0,0 +1,19 @@
+package com.jdqm.androidunittest;
+
+/**
+ * Created by Jdqm on 2018/7/14.
+ */
+
+public class MyClass {
+    public int getUniqueId(){
+        return 0;
+    }
+
+    public int compareTo(int a) {
+        return 0;
+    }
+
+    public void close() {
+
+    }
+}

app/src/main/java/com/jdqm/androidunittest/MyClass.java

@@ -1,31 +1,17 @@
 package com.jdqm.androidunittest;
 
-import org.junit.Before;
 import org.junit.Test;
 
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 
 /**
- * Created by yangsheng on 2018-7-13.
+ * Created by Jdqm on 2018-7-13.
  */
 public class EmailValidatorTest {
-    EmailValidator emailValidator;
-
-    @Before
-    public void setUp() throws Exception {
-        emailValidator = new EmailValidator();
-    }
 
     @Test
     public void isValidEmail() {
-     //   assertThat(emailValidator.isValidEmail("name@email.com"), is(true));
-        assertEquals(true, emailValidator.isValidEmail("name@email.com"));
-    }
-
-    @Test
-    public void tessss() {
-        assertThat(emailValidator.isValidEmail("name@email.com"), is(true));
+        assertThat(EmailValidator.isValidEmail("name@email.com"), is(true));
     }
 }

app/src/test/java/com/jdqm/androidunittest/CalculateTest.java

@@ -5,14 +5,15 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
+
 
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.when;
 
 /**
- * Created by yangsheng on 2018-7-13.
+ * Created by Jdqm on 2018-7-13.
  */
 
 @RunWith(MockitoJUnitRunner.class)
@@ -24,15 +25,7 @@ public class MockUnitTest {
 
     @Test
     public void readStringFromContext_LocalizedString() {
-        // Given a mocked Context injected into the object under test...
-        when(mMockContext.getString(R.string.app_name))
-                .thenReturn(FAKE_STRING);
-       // ClassUnderTest myObjectUnderTest = new ClassUnderTest(mMockContext);
-
-        // ...when the string is returned from the object under test...
-        //String result = myObjectUnderTest.getHelloWorldString();
-
-        // ...then the result should be the expected one.
+        when(mMockContext.getString(R.string.app_name)).thenReturn(FAKE_STRING);
         assertThat(mMockContext.getString(R.string.app_name), is(FAKE_STRING));
     }
 }