Merge change 1711 into donut
* changes:
Integration of unsubmitted cupcake change 122278: CTS: add test cases for android.widget.AbsoluteLayout
diff --git a/tests/res/layout/absolute_layout.xml b/tests/res/layout/absolute_layout.xml
new file mode 100644
index 0000000..767d7d3
--- /dev/null
+++ b/tests/res/layout/absolute_layout.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+
+ <AbsoluteLayout
+ android:id="@+id/absolute_view"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_x="1dip"
+ android:layout_y="2dip">
+
+ <TextView
+ android:id="@+id/absolute_textview"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_x="10dip"
+ android:layout_y="20dip"
+ android:background="@drawable/red"
+ android:text="@string/hello_world"/>
+
+ </AbsoluteLayout>
+
+</LinearLayout>
diff --git a/tests/tests/widget/src/android/widget/cts/AbsoluteLayoutTest.java b/tests/tests/widget/src/android/widget/cts/AbsoluteLayoutTest.java
new file mode 100644
index 0000000..28f074e
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/AbsoluteLayoutTest.java
@@ -0,0 +1,234 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.widget.cts;
+
+import com.android.cts.stub.R;
+
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
+import dalvik.annotation.ToBeFixed;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import android.app.Activity;
+import android.content.Context;
+import android.test.ActivityInstrumentationTestCase2;
+import android.util.AttributeSet;
+import android.util.Xml;
+import android.view.ViewGroup;
+import android.widget.AbsoluteLayout;
+import android.widget.AbsoluteLayout.LayoutParams;
+
+import java.io.IOException;
+
+@SuppressWarnings("deprecation")
+@TestTargetClass(AbsoluteLayout.class)
+public class AbsoluteLayoutTest extends ActivityInstrumentationTestCase2<StubActivity> {
+ private static final int DEFAULT_X = 5;
+ private static final int DEFAULT_Y = 10;
+ private static final int DEFAULT_WIDTH = 20;
+ private static final int DEFAULT_HEIGHT = 30;
+
+ private Activity mActivity;
+ private MyAbsoluteLayout mMyAbsoluteLayout;
+ private LayoutParams mAbsoluteLayoutParams;
+
+ public AbsoluteLayoutTest() {
+ super("com.android.cts.stub", StubActivity.class);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ mActivity = getActivity();
+ mMyAbsoluteLayout = new MyAbsoluteLayout(mActivity);
+ mAbsoluteLayoutParams = new LayoutParams(DEFAULT_WIDTH, DEFAULT_HEIGHT,
+ DEFAULT_X, DEFAULT_Y);
+ }
+
+ private AttributeSet getAttributeSet() throws XmlPullParserException, IOException {
+ XmlPullParser parser = mActivity.getResources().getLayout(R.layout.absolute_layout);
+ WidgetTestUtils.beginDocument(parser, "LinearLayout");
+ return Xml.asAttributeSet(parser);
+ }
+
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "AbsoluteLayout",
+ args = {android.content.Context.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "AbsoluteLayout",
+ args = {android.content.Context.class, android.util.AttributeSet.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "AbsoluteLayout",
+ args = {android.content.Context.class, android.util.AttributeSet.class, int.class}
+ )
+ })
+ @ToBeFixed(bug = "1695243", explanation = "Android API javadocs are incomplete")
+ public void testConstructor() throws XmlPullParserException, IOException {
+ AttributeSet attrs = getAttributeSet();
+
+ new AbsoluteLayout(mActivity);
+ new AbsoluteLayout(mActivity, attrs);
+ new AbsoluteLayout(mActivity, attrs, 0);
+
+ new AbsoluteLayout(null);
+
+ try {
+ new AbsoluteLayout(null, attrs);
+ fail("should throw NullPointerException");
+ } catch (NullPointerException e) {
+ }
+
+ try {
+ new AbsoluteLayout(null, attrs, 1);
+ fail("should throw NullPointerException");
+ } catch (NullPointerException e) {
+ }
+
+ new AbsoluteLayout(mActivity, null, 1);
+ new AbsoluteLayout(mActivity, attrs, -1);
+ }
+
+ @TestTargetNew(
+ level = TestLevel.NOT_NECESSARY,
+ method = "onMeasure",
+ args = {int.class, int.class}
+ )
+ public void testOnMeasure() {
+ // onMeasure() is implementation details, do NOT test
+ }
+
+ @TestTargetNew(
+ level = TestLevel.NOT_NECESSARY,
+ method = "onLayout",
+ args = {boolean.class, int.class, int.class, int.class, int.class}
+ )
+ public void testOnLayout() {
+ // onMeasure() is implementation details, do NOT test
+ }
+
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "checkLayoutParams",
+ args = {android.view.ViewGroup.LayoutParams.class}
+ )
+ public void testCheckLayoutParams() {
+ assertTrue(mMyAbsoluteLayout.checkLayoutParams(mAbsoluteLayoutParams));
+
+ ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(1, 2);
+ assertFalse(mMyAbsoluteLayout.checkLayoutParams(layoutParams));
+ assertFalse(mMyAbsoluteLayout.checkLayoutParams(null));
+ }
+
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "generateLayoutParams",
+ args = {android.util.AttributeSet.class}
+ )
+ public void testGenerateLayoutParams1() throws Throwable {
+ runTestOnUiThread(new Runnable() {
+ public void run() {
+ mActivity.setContentView(R.layout.absolute_layout);
+ }
+ });
+ getInstrumentation().waitForIdleSync();
+ AbsoluteLayout layout = (AbsoluteLayout) mActivity.findViewById(R.id.absolute_view);
+ LayoutParams params = (LayoutParams) layout.generateLayoutParams(getAttributeSet());
+
+ assertNotNull(params);
+ assertEquals(LayoutParams.FILL_PARENT, params.width);
+ assertEquals(LayoutParams.FILL_PARENT, params.height);
+ assertEquals(0, params.x);
+ assertEquals(0, params.y);
+
+ try {
+ mMyAbsoluteLayout.generateLayoutParams((AttributeSet) null);
+ fail("did not throw NullPointerException when AttributeSet is null.");
+ } catch (RuntimeException e) {
+ // expected, test success
+ }
+ }
+
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "generateLayoutParams",
+ args = {android.view.ViewGroup.LayoutParams.class}
+ )
+ @ToBeFixed(bug = "1695243", explanation = "should add @throws clause into javadoc of " +
+ "AbsoluteLayout#generateLayoutParams(ViewGroup.LayoutParams) when the input " +
+ "ViewGroup.LayoutParams is null")
+ public void testGenerateLayoutParams2() {
+ LayoutParams params =
+ (LayoutParams) mMyAbsoluteLayout.generateLayoutParams(mAbsoluteLayoutParams);
+
+ assertEquals(DEFAULT_WIDTH, params.width);
+ assertEquals(DEFAULT_HEIGHT, params.height);
+ assertEquals(0, params.x);
+ assertEquals(0, params.y);
+
+ try {
+ mMyAbsoluteLayout.generateLayoutParams((LayoutParams) null);
+ fail("did not throw NullPointerException when ViewGroup.LayoutParams is null.");
+ } catch (NullPointerException e) {
+ // expected, test success
+ }
+ }
+
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "generateDefaultLayoutParams",
+ args = {}
+ )
+ public void testGenerateDefaultLayoutParams() {
+ LayoutParams params = (LayoutParams) mMyAbsoluteLayout.generateDefaultLayoutParams();
+
+ assertEquals(LayoutParams.WRAP_CONTENT, params.width);
+ assertEquals(LayoutParams.WRAP_CONTENT, params.height);
+ assertEquals(0, params.x);
+ assertEquals(0, params.y);
+ }
+
+ private static class MyAbsoluteLayout extends AbsoluteLayout {
+ public MyAbsoluteLayout(Context context) {
+ super(context);
+ }
+
+ @Override
+ protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {
+ return super.checkLayoutParams(p);
+ }
+
+ @Override
+ protected ViewGroup.LayoutParams generateDefaultLayoutParams() {
+ return super.generateDefaultLayoutParams();
+ }
+
+ @Override
+ protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) {
+ return super.generateLayoutParams(p);
+ }
+ }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/AbsoluteLayout_LayoutParamsTest.java b/tests/tests/widget/src/android/widget/cts/AbsoluteLayout_LayoutParamsTest.java
new file mode 100644
index 0000000..ef9bf1f
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/AbsoluteLayout_LayoutParamsTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.widget.cts;
+
+import com.android.cts.stub.R;
+
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import android.test.AndroidTestCase;
+import android.util.AttributeSet;
+import android.util.Xml;
+import android.widget.AbsoluteLayout;
+import android.widget.AbsoluteLayout.LayoutParams;
+
+import java.io.IOException;
+
+@SuppressWarnings("deprecation")
+@TestTargetClass(LayoutParams.class)
+public class AbsoluteLayout_LayoutParamsTest extends AndroidTestCase {
+
+ private AttributeSet getAttributeSet() throws XmlPullParserException, IOException {
+ XmlPullParser parser = mContext.getResources().getLayout(R.layout.absolute_layout);
+ WidgetTestUtils.beginDocument(parser, "LinearLayout");
+ return Xml.asAttributeSet(parser);
+ }
+
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "AbsoluteLayout.LayoutParams",
+ args = {int.class, int.class, int.class, int.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "AbsoluteLayout.LayoutParams",
+ args = {android.content.Context.class, android.util.AttributeSet.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "AbsoluteLayout.LayoutParams",
+ args = {android.view.ViewGroup.LayoutParams.class}
+ )
+ })
+ public void testConstructor() throws XmlPullParserException, IOException {
+ LayoutParams layoutParams;
+
+ layoutParams = new AbsoluteLayout.LayoutParams(1, 2, 3, 4);
+ assertEquals(1, layoutParams.width);
+ assertEquals(2, layoutParams.height);
+ assertEquals(3, layoutParams.x);
+ assertEquals(4, layoutParams.y);
+
+ LayoutParams params = new AbsoluteLayout.LayoutParams(layoutParams);
+ assertEquals(1, params.width);
+ assertEquals(2, params.height);
+ assertEquals(0, params.x);
+ assertEquals(0, params.y);
+
+ new AbsoluteLayout.LayoutParams(mContext, getAttributeSet());
+ }
+
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "debug",
+ args = {java.lang.String.class}
+ )
+ public void testDebug() {
+ LayoutParams layoutParams = new AbsoluteLayout.LayoutParams(1, 2, 3, 4);
+ assertNotNull(layoutParams.debug("test: "));
+ }
+}