diff options
author | Xavier Ducrohet <xav@android.com> | 2009-10-05 15:28:33 -0700 |
---|---|---|
committer | Xavier Ducrohet <xav@android.com> | 2009-10-05 15:36:53 -0700 |
commit | 8c739671d262c74c5743bf249180b1ba58bef4da (patch) | |
tree | f623fc522ce9d66316255628c399c96381d65433 /tools/layoutlib | |
parent | ac7391de5f32cf051678886f0d393fe0431dc6d1 (diff) | |
download | frameworks_base-8c739671d262c74c5743bf249180b1ba58bef4da.zip frameworks_base-8c739671d262c74c5743bf249180b1ba58bef4da.tar.gz frameworks_base-8c739671d262c74c5743bf249180b1ba58bef4da.tar.bz2 |
Fix the layoutlib test to run from adt-tests.
Change-Id: I34f513429593dce9f781ed8a08c4664a5d6f9aa8
Diffstat (limited to 'tools/layoutlib')
-rw-r--r-- | tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/BridgeTest.java | 56 | ||||
-rw-r--r-- | tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/BridgeXmlBlockParserTest.java | 2 | ||||
-rw-r--r-- | tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/NinePatchTest.java | 2 | ||||
-rw-r--r-- | tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/StyleResourceValue.java | 60 | ||||
-rw-r--r-- | tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/button.9.png (renamed from tools/layoutlib/bridge/tests/data/button.9.png) | bin | 3750 -> 3750 bytes | |||
-rw-r--r-- | tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/layout1.xml (renamed from tools/layoutlib/bridge/tests/data/layout1.xml) | 0 |
6 files changed, 53 insertions, 67 deletions
diff --git a/tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/BridgeTest.java b/tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/BridgeTest.java index e424f1d..c66ae37 100644 --- a/tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/BridgeTest.java +++ b/tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/BridgeTest.java @@ -73,6 +73,48 @@ public class BridgeTest extends TestCase { } } + /** + * Mock implementation of {@link IStyleResourceValue}. + */ + private static class StyleResourceValueMock extends ResourceValue + implements IStyleResourceValue { + + private String mParentStyle = null; + private HashMap<String, IResourceValue> mItems = new HashMap<String, IResourceValue>(); + + StyleResourceValueMock(String name) { + super(name); + } + + StyleResourceValueMock(String name, String parentStyle) { + super(name); + mParentStyle = parentStyle; + } + + public String getParentStyle() { + return mParentStyle; + } + + public IResourceValue findItem(String name) { + return mItems.get(name); + } + + public void addItem(IResourceValue value) { + mItems.put(value.getName(), value); + } + + @Override + public void replaceWith(ResourceValue value) { + super.replaceWith(value); + + if (value instanceof StyleResourceValueMock) { + mItems.clear(); + mItems.putAll(((StyleResourceValueMock)value).mItems); + } + } + } + + public void testComputeLayout() throws Exception { TestParser parser = new TestParser(); @@ -88,8 +130,10 @@ public class BridgeTest extends TestCase { // FIXME need a dummy font for the tests! ILayoutResult result = mBridge.computeLayout(parser, new Integer(1) /* projectKey */, - screenWidth, screenHeight, - "Theme", projectResources, frameworkResources, null, null); + screenWidth, screenHeight, false /* full render */, + 160, 160f, 160f, + "Theme", false /* is project theme */, + projectResources, frameworkResources, null, null); display(result.getRootView(), ""); } @@ -191,7 +235,7 @@ public class BridgeTest extends TestCase { * a style item value. If the number of string in the array is not even, an exception is thrown. */ private IStyleResourceValue createStyle(String styleName, String... items) { - StyleResourceValue value = new StyleResourceValue(styleName); + StyleResourceValueMock value = new StyleResourceValueMock(styleName); if (items.length % 3 == 0) { for (int i = 0 ; i < items.length;) { @@ -220,8 +264,10 @@ public class BridgeTest extends TestCase { // FIXME need a dummy font for the tests! ILayoutResult result = mBridge.computeLayout(parser, new Integer(1) /* projectKey */, - screenWidth, screenHeight, - "Theme", projectResources, frameworkResources, null, null); + screenWidth, screenHeight, false /* full render */, + 160, 160f, 160f, + "Theme", false /* is project theme */, + projectResources, frameworkResources, null, null); display(result.getRootView(), ""); } diff --git a/tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/BridgeXmlBlockParserTest.java b/tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/BridgeXmlBlockParserTest.java index cac1f95..ef7442c 100644 --- a/tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/BridgeXmlBlockParserTest.java +++ b/tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/BridgeXmlBlockParserTest.java @@ -41,7 +41,7 @@ public class BridgeXmlBlockParserTest extends TestCase { @Override protected void setUp() throws Exception { super.setUp(); - URL url = this.getClass().getClassLoader().getResource("data/layout1.xml"); + URL url = this.getClass().getClassLoader().getResource("layout1.xml"); mXmlPath = url.getFile(); mDoc = getXmlDocument(mXmlPath); } diff --git a/tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/NinePatchTest.java b/tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/NinePatchTest.java index 67ec5e1..e667472 100644 --- a/tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/NinePatchTest.java +++ b/tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/NinePatchTest.java @@ -12,7 +12,7 @@ public class NinePatchTest extends TestCase { @Override protected void setUp() throws Exception { - URL url = this.getClass().getClassLoader().getResource("data/button.9.png"); + URL url = this.getClass().getClassLoader().getResource("button.9.png"); mPatch = NinePatch.load(url, false /* convert */); } diff --git a/tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/StyleResourceValue.java b/tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/StyleResourceValue.java deleted file mode 100644 index 84bdc2f..0000000 --- a/tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/StyleResourceValue.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * 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 com.android.layoutlib.bridge; - -import com.android.layoutlib.api.IResourceValue; -import com.android.layoutlib.api.IStyleResourceValue; - -import java.util.HashMap; - -class StyleResourceValue extends ResourceValue implements IStyleResourceValue { - - private String mParentStyle = null; - private HashMap<String, IResourceValue> mItems = new HashMap<String, IResourceValue>(); - - StyleResourceValue(String name) { - super(name); - } - - StyleResourceValue(String name, String parentStyle) { - super(name); - mParentStyle = parentStyle; - } - - public String getParentStyle() { - return mParentStyle; - } - - public IResourceValue findItem(String name) { - return mItems.get(name); - } - - public void addItem(IResourceValue value) { - mItems.put(value.getName(), value); - } - - @Override - public void replaceWith(ResourceValue value) { - super.replaceWith(value); - - if (value instanceof StyleResourceValue) { - mItems.clear(); - mItems.putAll(((StyleResourceValue)value).mItems); - } - } - -} diff --git a/tools/layoutlib/bridge/tests/data/button.9.png b/tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/button.9.png Binary files differindex 9d52f40..9d52f40 100644 --- a/tools/layoutlib/bridge/tests/data/button.9.png +++ b/tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/button.9.png diff --git a/tools/layoutlib/bridge/tests/data/layout1.xml b/tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/layout1.xml index 554f541..554f541 100644 --- a/tools/layoutlib/bridge/tests/data/layout1.xml +++ b/tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/layout1.xml |