Update caret location in AswbGotoDeclararationTest.java
@@ -34,14 +34,12 @@ import java.io.File;
import org.jetbrains.android.dom.wrappers.LazyValueResourceElementWrapper;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
/** Tests that R class references are properly resolved by the android plugin. */
@RunWith(JUnit4.class)
-@Ignore("b/140286021")
public class AswbGotoDeclarationTest extends BlazeAndroidIntegrationTestCase {
@Before
public void setup() {
@@ -97,7 +95,7 @@ public class AswbGotoDeclarationTest extends BlazeAndroidIntegrationTestCase {
runFullBlazeSync();
testFixture.configureFromExistingVirtualFile(mainActivity);
- assertGotoDeclarationOpensFile("R.style.Base_Highlight", stylesXml);
+ assertGotoDeclarationOpensFile("Base_Highlight", stylesXml);
}
@Test
@@ -132,7 +130,7 @@ public class AswbGotoDeclarationTest extends BlazeAndroidIntegrationTestCase {
runFullBlazeSync();
testFixture.configureFromExistingVirtualFile(mainActivity);
- assertGotoDeclarationOpensFile("R.menu.settings", settingsXml);
+ assertGotoDeclarationOpensFile("settings", settingsXml);
}
@Test
@@ -187,8 +185,8 @@ public class AswbGotoDeclarationTest extends BlazeAndroidIntegrationTestCase {
VirtualFile aarColorXml = getResourceFile(aarLibraryFile, "values/colors.xml");
VirtualFile aarLayoutXml = getResourceFile(aarLibraryFile, "layout/activity_aar.xml");
testFixture.configureFromExistingVirtualFile(mainActivity);
- assertGotoDeclarationOpensFile("R.color.aarColor", aarColorXml);
- assertGotoDeclarationOpensFile("R.layout.activity_aar", aarLayoutXml);
+ assertGotoDeclarationOpensFile("aarColor", aarColorXml);
+ assertGotoDeclarationOpensFile("activity_aar", aarLayoutXml);
}
@Test
