aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2017-01-05 19:47:56 +0000
committerGravatar John Cater <jcater@google.com>2017-01-05 21:10:44 +0000
commitcae11a765439577061f51cb8f46d34ae59c882af (patch)
tree568812e1f7e44ec648c61ba5d3fcbdbaf56923f1 /src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java
parentf57730b8d8cd1f0d1e3b2cd59f8c26cadb773b99 (diff)
Disable legacy Skylark IDE tests.
The tests are now frozen, and will continue to protect the frozen native aspect until this is deleted. -- PiperOrigin-RevId: 143691221 MOS_MIGRATED_REVID=143691221
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java')
-rw-r--r--src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java25
1 files changed, 1 insertions, 24 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java b/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java
index 26219b09df..4bb99d6071 100644
--- a/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java
+++ b/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java
@@ -95,11 +95,7 @@ public class AndroidStudioInfoAspectTest extends AndroidStudioInfoAspectTestBase
ArtifactLocation packageManifest = targetIdeInfo.getJavaIdeInfo().getPackageManifest();
assertNotNull(packageManifest);
- if (isNativeTest()) {
- assertEquals(packageManifest.getRelativePath(), "com/google/example/simple.manifest");
- } else {
- assertEquals(packageManifest.getRelativePath(), "com/google/example/simple.java-manifest");
- }
+ assertEquals(packageManifest.getRelativePath(), "com/google/example/simple.manifest");
}
@Test
@@ -1866,23 +1862,4 @@ public class AndroidStudioInfoAspectTest extends AndroidStudioInfoAspectTestBase
assertThat(jar.getIsExternal()).isTrue();
assertThat(jar.getRelativePath()).isEqualTo("external/r/junit.jar");
}
-
- /**
- * Returns true if we are testing the native aspect, not the Skylark one. Eventually Skylark
- * aspect will be equivalent to a native one, and this method will be removed.
- */
- @Override
- protected boolean isNativeTest() {
- return true;
- }
-
- /** Test for Skylark version of the aspect. */
- @RunWith(JUnit4.class)
- public static class IntelliJSkylarkAspectTest extends AndroidStudioInfoAspectTest {
-
- @Override
- public boolean isNativeTest() {
- return false;
- }
- }
}