From 525a59056552a66cb82a621507eb5ac90c96f9f7 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 6 May 2021 16:33:52 +0100 Subject: Make sdk tests more realistic The tests use __ as the format for a versioned sdk member name but the format should be _@. This change corrects it and also fixes a similar issue in an error message. Bug: 181569894 Test: m nothing Change-Id: I8be0db4bcd0b6f4d6fbdf9e402ef7257fae8e18b --- sdk/java_sdk_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sdk/java_sdk_test.go') diff --git a/sdk/java_sdk_test.go b/sdk/java_sdk_test.go index 601698121..dc58d9309 100644 --- a/sdk/java_sdk_test.go +++ b/sdk/java_sdk_test.go @@ -83,12 +83,12 @@ func TestBasicSdkWithJavaLibrary(t *testing.T) { sdk_snapshot { name: "mysdk@1", - java_header_libs: ["sdkmember_mysdk_1"], + java_header_libs: ["sdkmember_mysdk@1"], } sdk_snapshot { name: "mysdk@2", - java_header_libs: ["sdkmember_mysdk_2"], + java_header_libs: ["sdkmember_mysdk@2"], } java_library { @@ -100,13 +100,13 @@ func TestBasicSdkWithJavaLibrary(t *testing.T) { } java_import { - name: "sdkmember_mysdk_1", + name: "sdkmember_mysdk@1", sdk_member_name: "sdkmember", host_supported: true, } java_import { - name: "sdkmember_mysdk_2", + name: "sdkmember_mysdk@2", sdk_member_name: "sdkmember", host_supported: true, } @@ -144,8 +144,8 @@ func TestBasicSdkWithJavaLibrary(t *testing.T) { } `) - sdkMemberV1 := result.ModuleForTests("sdkmember_mysdk_1", "android_common").Rule("combineJar").Output - sdkMemberV2 := result.ModuleForTests("sdkmember_mysdk_2", "android_common").Rule("combineJar").Output + sdkMemberV1 := result.ModuleForTests("sdkmember_mysdk@1", "android_common").Rule("combineJar").Output + sdkMemberV2 := result.ModuleForTests("sdkmember_mysdk@2", "android_common").Rule("combineJar").Output javalibForMyApex := result.ModuleForTests("myjavalib", "android_common_apex10000_mysdk_1") javalibForMyApex2 := result.ModuleForTests("myjavalib", "android_common_apex10000_mysdk_2") -- cgit v1.2.3-59-g8ed1b