diff options
Diffstat (limited to 'eclipse/plugins/com.android.ide.eclipse.tests')
4 files changed, 12 insertions, 10 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LinearLayoutRuleTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LinearLayoutRuleTest.java index a703a6f..cec3a9b 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LinearLayoutRuleTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LinearLayoutRuleTest.java @@ -175,7 +175,7 @@ public class LinearLayoutRuleTest extends LayoutTestBase { initialize(rule, "android.widget.LinearLayout"); TestNode node = TestNode.create("android.widget.LinearLayout").id("@+id/LinearLayout012"); node.putAttributeInfo(ANDROID_URI, "orientation", - new TestAttributeInfo(ATTR_ORIENTATION, new Format[] { Format.ENUM }, + new TestAttributeInfo(ATTR_ORIENTATION, Format.ENUM_SET, "android.widget.LinearLayout", new String[] {"horizontal", "vertical"}, null, null)); @@ -209,13 +209,13 @@ public class LinearLayoutRuleTest extends LayoutTestBase { initialize(rule, "android.widget.LinearLayout"); TestNode node = TestNode.create("android.widget.LinearLayout").id("@+id/LinearLayout012"); node.putAttributeInfo(ANDROID_URI, "orientation", - new TestAttributeInfo(ATTR_ORIENTATION, new Format[] { Format.ENUM }, + new TestAttributeInfo(ATTR_ORIENTATION, Format.ENUM_SET, "android.widget.LinearLayout", new String[] {"horizontal", "vertical"}, null, null)); node.setAttributeSources(Arrays.asList("android.widget.LinearLayout", "android.view.ViewGroup", "android.view.View")); node.putAttributeInfo(ANDROID_URI, "gravity", - new TestAttributeInfo("gravity", new Format[] { Format.INTEGER }, + new TestAttributeInfo("gravity", Format.INTEGER_SET, "android.widget.LinearLayout", null, null, null)); diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/TestAttributeInfo.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/TestAttributeInfo.java index ee04260..f4f83c1 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/TestAttributeInfo.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/TestAttributeInfo.java @@ -17,10 +17,12 @@ package com.android.ide.common.layout; import com.android.ide.common.api.IAttributeInfo; +import java.util.EnumSet; + /** Test/mock implementation of {@link IAttributeInfo} */ public class TestAttributeInfo implements IAttributeInfo { private final String mName; - private final Format[] mFormats; + private final EnumSet<Format> mFormats; private final String mDefinedBy; private final String[] mEnumValues; private final String[] mFlagValues; @@ -30,7 +32,7 @@ public class TestAttributeInfo implements IAttributeInfo { this(name, null, null, null, null, null); } - public TestAttributeInfo(String name, Format[] formats, String definedBy, + public TestAttributeInfo(String name, EnumSet<Format> formats, String definedBy, String[] enumValues, String[] flagValues, String javadoc) { super(); this.mName = name; @@ -57,7 +59,7 @@ public class TestAttributeInfo implements IAttributeInfo { } @Override - public Format[] getFormats() { + public EnumSet<Format> getFormats() { return mFormats; } diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/resources/platform/AttrsXmlParserTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/resources/platform/AttrsXmlParserTest.java index 6b0ddd3..e57e5cd 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/resources/platform/AttrsXmlParserTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/resources/platform/AttrsXmlParserTest.java @@ -35,7 +35,7 @@ public class AttrsXmlParserTest extends TestCase { @Override public void setUp() throws Exception { - mFilePath = AdtTestData.getInstance().getTestFilePath(MOCK_DATA_PATH); //$NON-NLS-1$ + mFilePath = AdtTestData.getInstance().getTestFilePath(MOCK_DATA_PATH); mParser = new AttrsXmlParser(mFilePath, new TestLogger()); } @@ -65,8 +65,8 @@ public class AttrsXmlParserTest extends TestCase { AttributeInfo[] attrs = info.getAttributes(); assertEquals(1, attrs.length); assertEquals("scrollbarSize", info.getAttributes()[0].getName()); - assertEquals(1, info.getAttributes()[0].getFormats().length); - assertEquals(Format.DIMENSION, info.getAttributes()[0].getFormats()[0]); + assertEquals(1, info.getAttributes()[0].getFormats().size()); + assertEquals(Format.DIMENSION, info.getAttributes()[0].getFormats().iterator().next()); } public final void testEnumFlagValues() throws Exception { diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/UiElementPullParserTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/UiElementPullParserTest.java index e3df52d..5f01766 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/UiElementPullParserTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/UiElementPullParserTest.java @@ -45,7 +45,7 @@ public class UiElementPullParserTest extends TestCase { return new TextAttributeDescriptor( xmlName, // xmlLocalName SdkConstants.NS_RESOURCES, - new AttributeInfo(xmlName, new Format[] { Format.STRING }) + new AttributeInfo(xmlName, Format.STRING_SET) ); } |