summaryrefslogtreecommitdiff
path: root/android/testSrc
diff options
context:
space:
mode:
authorLuke Egan <lukeegan@google.com>2022-03-02 11:56:29 +0000
committerTreeHugger Robot <treehugger-gerrit@google.com>2022-03-02 15:31:31 +0000
commitdcd2084e4cad0ad8a35a72443da78665669aa98e (patch)
treec96b8ab872b6aa5fa8e37ae950ef875b25fdea88 /android/testSrc
parent02d70addb7d7f662988fc5f34d1f390a73a7b83c (diff)
downloadidea-dcd2084e4cad0ad8a35a72443da78665669aa98e.tar.gz
Fix animated-vector target attribute
This attribute for the <target> tag had an incorrect ResourceType, anim, instead of the correct animator. Test: AndroidDrawableResourcesDomTest Fixes: 37081228 Change-Id: Iad7c5384c3d28364015e5a4aeb8b3cb2e8093b78
Diffstat (limited to 'android/testSrc')
-rw-r--r--android/testSrc/org/jetbrains/android/dom/AndroidDrawableResourcesDomTest.java31
1 files changed, 30 insertions, 1 deletions
diff --git a/android/testSrc/org/jetbrains/android/dom/AndroidDrawableResourcesDomTest.java b/android/testSrc/org/jetbrains/android/dom/AndroidDrawableResourcesDomTest.java
index afac2d6d968..d380404c109 100644
--- a/android/testSrc/org/jetbrains/android/dom/AndroidDrawableResourcesDomTest.java
+++ b/android/testSrc/org/jetbrains/android/dom/AndroidDrawableResourcesDomTest.java
@@ -16,10 +16,18 @@
package org.jetbrains.android.dom;
import static com.android.tools.idea.model.AndroidManifestIndexQueryUtils.queryPackageNameFromManifestIndex;
+import static com.android.tools.idea.testing.AndroidTestUtils.goToElementAtCaret;
+import static com.android.tools.idea.testing.AndroidTestUtils.moveCaret;
+import static com.google.common.truth.Truth.assertThat;
import com.android.SdkConstants;
+import com.android.ide.common.rendering.api.ResourceNamespace;
+import com.android.ide.common.rendering.api.ResourceReference;
+import com.android.resources.ResourceType;
+import com.android.tools.idea.res.psi.ResourceReferencePsiElement;
import com.intellij.codeInsight.completion.CompletionType;
import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import java.io.IOException;
import java.util.List;
@@ -384,7 +392,7 @@ public class AndroidDrawableResourcesDomTest extends AndroidDomTestCase {
" <animated-vector android:drawable=\"@android:color/background_dark\">\n" +
" <target\n" +
" android:name=\"button\"\n" +
- " android:animation=\"@android:anim/bounce_interpolator\" />\n" +
+ " android:animation=\"@android:animator/fade_in\" />\n" +
" </animated-vector>\n" +
" </transition>\n" +
"\n" +
@@ -392,6 +400,27 @@ public class AndroidDrawableResourcesDomTest extends AndroidDomTestCase {
doTestHighlighting(file.getVirtualFile());
}
+ public void testAnimatedVectorTargetElement() {
+ PsiFile file = myFixture.addFileToProject(
+ "res/drawable/foo.xml",
+ "<animated-selector xmlns:android=\"http://schemas.android.com/apk/res/android\">\n" +
+ " <transition android:fromId=\"@+id/off\" android:toId=\"@+id/on\">\n" +
+ " <animated-vector android:drawable=\"@android:color/background_dark\">\n" +
+ " <target\n" +
+ " android:name=\"button\"\n" +
+ " android:animation=\"@android:animator/fade_in\" />\n" +
+ " </animated-vector>\n" +
+ " </transition>\n" +
+ "\n" +
+ "</animated-selector>");
+ myFixture.configureFromExistingVirtualFile(file.getVirtualFile());
+ moveCaret(myFixture, "@android:a|nimator/fade_in");
+ PsiElement elementAtCaret = myFixture.getElementAtCaret();
+ assertThat(elementAtCaret).isInstanceOf(ResourceReferencePsiElement.class);
+ assertThat(((ResourceReferencePsiElement)elementAtCaret).getResourceReference())
+ .isEqualTo(new ResourceReference(ResourceNamespace.ANDROID, ResourceType.ANIMATOR, "fade_in"));
+ }
+
private void doTestOnlyDrawableReferences() throws IOException {
VirtualFile file = copyFileToProject(getTestName(true) + ".xml");
myFixture.configureFromExistingVirtualFile(file);