Align all-caps test on AppCompatButton with AppCompatTextView logic.

Also tweak the comments to reflect the new logic.

Change-Id: I8d6acb608258d071f58051067459837e21c6b90e
diff --git a/v7/appcompat/tests/src/android/support/v7/widget/AppCompatButtonTest.java b/v7/appcompat/tests/src/android/support/v7/widget/AppCompatButtonTest.java
index 46925ce..340737e 100644
--- a/v7/appcompat/tests/src/android/support/v7/widget/AppCompatButtonTest.java
+++ b/v7/appcompat/tests/src/android/support/v7/widget/AppCompatButtonTest.java
@@ -60,15 +60,15 @@
         assertEquals("Button starts in all caps off", text2,
                 button2.getLayout().getText());
 
-        // Toggle all-caps mode on the two buttons. Note that as with the core Button,
-        // setting a style with textAllCaps=false on a AppCompatButton with all-caps on
-        // will have no effect.
-        onView(withId(R.id.button_caps1)).perform(setTextAppearance(R.style.TextStyleAllCapsOff));
-        onView(withId(R.id.button_caps2)).perform(setTextAppearance(R.style.TextStyleAllCapsOn));
-
-        assertEquals("Button is still in all caps on", text1.toUpperCase(),
+        // Toggle all-caps mode on the two buttons
+        onView(withId(R.id.button_caps1)).perform(
+                setTextAppearance(R.style.TextStyleAllCapsOff));
+        assertEquals("Button is now in all caps off", text1,
                 button1.getLayout().getText());
-        assertEquals("Button is in all caps on", text2.toUpperCase(),
+
+        onView(withId(R.id.button_caps2)).perform(
+                setTextAppearance(R.style.TextStyleAllCapsOn));
+        assertEquals("Button is now in all caps on", text2.toUpperCase(),
                 button2.getLayout().getText());
     }
 
diff --git a/v7/appcompat/tests/src/android/support/v7/widget/AppCompatTextViewTest.java b/v7/appcompat/tests/src/android/support/v7/widget/AppCompatTextViewTest.java
index 0b19ac7..8da53d6 100644
--- a/v7/appcompat/tests/src/android/support/v7/widget/AppCompatTextViewTest.java
+++ b/v7/appcompat/tests/src/android/support/v7/widget/AppCompatTextViewTest.java
@@ -65,12 +65,12 @@
         // Toggle all-caps mode on the two text views
         onView(withId(R.id.text_view_caps1)).perform(
                 setTextAppearance(R.style.TextStyleAllCapsOff));
-        assertEquals("Text view is still in all caps on", text1,
+        assertEquals("Text view is now in all caps off", text1,
                 textView1.getLayout().getText());
 
         onView(withId(R.id.text_view_caps2)).perform(
                 setTextAppearance(R.style.TextStyleAllCapsOn));
-        assertEquals("Text view is in all caps on", text2.toUpperCase(),
+        assertEquals("Text view is now in all caps on", text2.toUpperCase(),
                 textView2.getLayout().getText());
     }