Merge "Fix bug #6293659 android.view.cts.ViewGroupTest#testSetPadding fails - DO NOT MERGE" into jb-dev
diff --git a/tests/tests/view/src/android/view/cts/ViewGroupTest.java b/tests/tests/view/src/android/view/cts/ViewGroupTest.java
index 34b7742..e975a27 100644
--- a/tests/tests/view/src/android/view/cts/ViewGroupTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewGroupTest.java
@@ -1496,8 +1496,6 @@
assertEquals(0, vg.getPaddingTop());
assertEquals(0, vg.getPaddingLeft());
assertEquals(0, vg.getPaddingRight());
- assertEquals(0, vg.getPaddingStart());
- assertEquals(0, vg.getPaddingEnd());
vg.setPadding(left, top, right, bottom);
@@ -1505,83 +1503,6 @@
assertEquals(top, vg.getPaddingTop());
assertEquals(left, vg.getPaddingLeft());
assertEquals(right, vg.getPaddingRight());
-
- assertEquals(left, vg.getPaddingStart());
- assertEquals(right, vg.getPaddingEnd());
- assertEquals(false, vg.isPaddingRelative());
-
- // force RTL direction
- vg.setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
-
- assertEquals(bottom, vg.getPaddingBottom());
- assertEquals(top, vg.getPaddingTop());
- assertEquals(left, vg.getPaddingLeft());
- assertEquals(right, vg.getPaddingRight());
-
- assertEquals(right, vg.getPaddingStart());
- assertEquals(left, vg.getPaddingEnd());
- assertEquals(false, vg.isPaddingRelative());
- }
-
- public void testSetPaddingRelative() {
- final int start = 1;
- final int top = 2;
- final int end = 3;
- final int bottom = 4;
-
- MockViewGroup vg = new MockViewGroup(mContext);
-
- assertEquals(0, vg.getPaddingBottom());
- assertEquals(0, vg.getPaddingTop());
- assertEquals(0, vg.getPaddingLeft());
- assertEquals(0, vg.getPaddingRight());
- assertEquals(0, vg.getPaddingStart());
- assertEquals(0, vg.getPaddingEnd());
-
- vg.setPaddingRelative(start, top, end, bottom);
-
- assertEquals(bottom, vg.getPaddingBottom());
- assertEquals(top, vg.getPaddingTop());
- assertEquals(start, vg.getPaddingLeft());
- assertEquals(end, vg.getPaddingRight());
-
- assertEquals(start, vg.getPaddingStart());
- assertEquals(end, vg.getPaddingEnd());
- assertEquals(true, vg.isPaddingRelative());
-
- // force RTL direction after setting relative padding
- vg.setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
-
- assertEquals(bottom, vg.getPaddingBottom());
- assertEquals(top, vg.getPaddingTop());
- assertEquals(start, vg.getPaddingLeft());
- assertEquals(end, vg.getPaddingRight());
-
- assertEquals(start, vg.getPaddingStart());
- assertEquals(end, vg.getPaddingEnd());
- assertEquals(true, vg.isPaddingRelative());
-
- // force RTL direction before setting relative padding
- vg = new MockViewGroup(mContext);
- vg.setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
-
- assertEquals(0, vg.getPaddingBottom());
- assertEquals(0, vg.getPaddingTop());
- assertEquals(0, vg.getPaddingLeft());
- assertEquals(0, vg.getPaddingRight());
- assertEquals(0, vg.getPaddingStart());
- assertEquals(0, vg.getPaddingEnd());
-
- vg.setPaddingRelative(start, top, end, bottom);
-
- assertEquals(bottom, vg.getPaddingBottom());
- assertEquals(top, vg.getPaddingTop());
- assertEquals(end, vg.getPaddingLeft());
- assertEquals(start, vg.getPaddingRight());
-
- assertEquals(start, vg.getPaddingStart());
- assertEquals(end, vg.getPaddingEnd());
- assertEquals(true, vg.isPaddingRelative());
}
public void testSetPersistentDrawingCache() {
diff --git a/tests/tests/view/src/android/view/cts/ViewGroup_MarginLayoutParamsTest.java b/tests/tests/view/src/android/view/cts/ViewGroup_MarginLayoutParamsTest.java
index 453e200..d92fd9b 100644
--- a/tests/tests/view/src/android/view/cts/ViewGroup_MarginLayoutParamsTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewGroup_MarginLayoutParamsTest.java
@@ -83,90 +83,5 @@
assertEquals(Integer.MIN_VALUE, mMarginLayoutParams.startMargin);
assertEquals(Integer.MIN_VALUE, mMarginLayoutParams.endMargin);
-
- assertEquals(false, mMarginLayoutParams.isMarginRelative());
- }
-
- public void testSetMarginsRelative() {
- // create a new MarginLayoutParams instance
- mMarginLayoutParams = new ViewGroup.MarginLayoutParams(320, 480);
- mMarginLayoutParams.setMarginsRelative(20, 30, 120, 140);
- assertEquals(20, mMarginLayoutParams.startMargin);
- assertEquals(30, mMarginLayoutParams.topMargin);
- assertEquals(120, mMarginLayoutParams.endMargin);
- assertEquals(140, mMarginLayoutParams.bottomMargin);
-
- assertEquals(0, mMarginLayoutParams.leftMargin);
- assertEquals(0, mMarginLayoutParams.rightMargin);
-
- assertEquals(true, mMarginLayoutParams.isMarginRelative());
- }
-
- public void testResolveMarginsRelative() {
- ViewGroup vg = new LinearLayout(mContext);
-
- // LTR / normal margin case
- mMarginLayoutParams = new ViewGroup.MarginLayoutParams(320, 480);
- mMarginLayoutParams.setMargins(20, 30, 120, 140);
- vg.setLayoutParams(mMarginLayoutParams);
- vg.requestLayout();
-
- assertEquals(20, mMarginLayoutParams.leftMargin);
- assertEquals(30, mMarginLayoutParams.topMargin);
- assertEquals(120, mMarginLayoutParams.rightMargin);
- assertEquals(140, mMarginLayoutParams.bottomMargin);
-
- assertEquals(Integer.MIN_VALUE, mMarginLayoutParams.startMargin);
- assertEquals(Integer.MIN_VALUE, mMarginLayoutParams.endMargin);
-
- assertEquals(false, mMarginLayoutParams.isMarginRelative());
-
- // LTR / relative margin case
- mMarginLayoutParams.setMarginsRelative(20, 30, 120, 140);
- vg.setLayoutParams(mMarginLayoutParams);
- vg.requestLayout();
-
- assertEquals(20, mMarginLayoutParams.startMargin);
- assertEquals(30, mMarginLayoutParams.topMargin);
- assertEquals(120, mMarginLayoutParams.endMargin);
- assertEquals(140, mMarginLayoutParams.bottomMargin);
-
- assertEquals(20, mMarginLayoutParams.leftMargin);
- assertEquals(120, mMarginLayoutParams.rightMargin);
-
- assertEquals(true, mMarginLayoutParams.isMarginRelative());
-
- // RTL / normal margin case
- vg.setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
-
- mMarginLayoutParams = new ViewGroup.MarginLayoutParams(320, 480);
- mMarginLayoutParams.setMargins(20, 30, 120, 140);
- vg.setLayoutParams(mMarginLayoutParams);
- vg.requestLayout();
-
- assertEquals(20, mMarginLayoutParams.leftMargin);
- assertEquals(30, mMarginLayoutParams.topMargin);
- assertEquals(120, mMarginLayoutParams.rightMargin);
- assertEquals(140, mMarginLayoutParams.bottomMargin);
-
- assertEquals(Integer.MIN_VALUE, mMarginLayoutParams.startMargin);
- assertEquals(Integer.MIN_VALUE, mMarginLayoutParams.endMargin);
-
- assertEquals(false, mMarginLayoutParams.isMarginRelative());
-
- // RTL / relative margin case
- mMarginLayoutParams.setMarginsRelative(20, 30, 120, 140);
- vg.setLayoutParams(mMarginLayoutParams);
- vg.requestLayout();
-
- assertEquals(20, mMarginLayoutParams.startMargin);
- assertEquals(30, mMarginLayoutParams.topMargin);
- assertEquals(120, mMarginLayoutParams.endMargin);
- assertEquals(140, mMarginLayoutParams.bottomMargin);
-
- assertEquals(120, mMarginLayoutParams.leftMargin);
- assertEquals(20, mMarginLayoutParams.rightMargin);
-
- assertEquals(true, mMarginLayoutParams.isMarginRelative());
}
}
