diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/ideinfo')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java | 15 |
1 files changed, 8 insertions, 7 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 85ee79c0ab..c7e161b8e5 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 @@ -19,6 +19,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import com.google.common.collect.Iterables; +import com.google.devtools.build.lib.cmdline.RepositoryName; import com.google.devtools.build.lib.ideinfo.androidstudio.AndroidStudioIdeInfo.ArtifactLocation; import com.google.devtools.build.lib.ideinfo.androidstudio.AndroidStudioIdeInfo.CRuleIdeInfo; import com.google.devtools.build.lib.ideinfo.androidstudio.AndroidStudioIdeInfo.CToolchainIdeInfo; @@ -28,15 +29,13 @@ import com.google.devtools.build.lib.ideinfo.androidstudio.AndroidStudioIdeInfo. import com.google.devtools.build.lib.vfs.Path; import com.google.protobuf.ByteString; import com.google.protobuf.ProtocolStringList; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - import java.nio.file.Paths; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests for {@link AndroidStudioInfoAspect} validating proto's contents. @@ -937,9 +936,11 @@ public class AndroidStudioInfoAspectTest extends AndroidStudioInfoAspectTestBase ArtifactLocation.newBuilder() .setRootPath( testLegacyAswbPluginVersionCompatibility() - ? targetConfig.getGenfilesDirectory().getPath().getPathString() : "") + ? targetConfig.getGenfilesDirectory(RepositoryName.MAIN).getPath() + .getPathString() + : "") .setRootExecutionPathFragment( - targetConfig.getGenfilesDirectory().getExecPathString()) + targetConfig.getGenfilesDirectory(RepositoryName.MAIN).getExecPathString()) .setRelativePath("com/google/example/gen.java") .setIsSource(false) .build(), |