Skip to content

Commit 48fd86c

Browse files
houshiancopybara-github
houshian
authored and
copybara-github
committed
Internal change
PiperOrigin-RevId: 710903231
1 parent b597222 commit 48fd86c

File tree

30 files changed

+148
-200
lines changed

30 files changed

+148
-200
lines changed

‎src/javatests/com/google/devtools/mobileharness/infra/ats/common/BUILD‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ java_library(
3636
"//src/java/com/google/devtools/mobileharness/infra/ats/console/result/report:certification_suite_info_factory",
3737
"//src/java/com/google/devtools/mobileharness/infra/ats/console/result/report:compatibility_report_creator",
3838
"//src/java/com/google/devtools/mobileharness/infra/ats/console/result/report:compatibility_report_merger",
39-
"//src/java/com/google/devtools/mobileharness/infra/ats/console/result/report:compatibility_report_parser",
4039
"//src/java/com/google/devtools/mobileharness/infra/client/api/controller/device:querier",
4140
"//src/java/com/google/devtools/mobileharness/infra/client/longrunningservice:annotations",
4241
"//src/java/com/google/devtools/mobileharness/infra/client/longrunningservice/model:session_info",
@@ -48,10 +47,10 @@ java_library(
4847
"//src/java/com/google/devtools/mobileharness/platform/android/xts/suite/retry:retry_report_merger",
4948
"//src/java/com/google/devtools/mobileharness/platform/android/xts/suite/subplan:sub_plan",
5049
"//src/java/com/google/devtools/mobileharness/shared/util/file/local",
51-
"//src/java/com/google/devtools/mobileharness/shared/util/flags",
5250
"//src/java/com/google/wireless/qa/mobileharness/shared/model/job",
5351
"//src/java/com/google/wireless/qa/mobileharness/shared/proto:job_config_java_proto",
5452
"//src/javatests/com/google/devtools/mobileharness/builddefs:truth",
53+
"//src/javatests/com/google/devtools/mobileharness/shared/util/junit/rule:set_flags_oss",
5554
"@maven//:com_google_code_gson_gson",
5655
"@maven//:com_google_guava_guava",
5756
"@maven//:com_google_inject_extensions_guice_testlib",

‎src/javatests/com/google/devtools/mobileharness/infra/ats/common/SessionRequestHandlerUtilTest.java‎

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.google.devtools.mobileharness.infra.ats.common;
1818

19-
import static com.google.common.collect.ImmutableList.toImmutableList;
2019
import static com.google.common.truth.Truth.assertThat;
2120
import static com.google.devtools.mobileharness.infra.ats.common.SessionRequestHandlerUtil.MOBLY_TEST_SELECTOR_KEY;
2221
import static com.google.devtools.mobileharness.infra.ats.common.SessionRequestHandlerUtil.PARAM_XTS_SUITE_INFO;
@@ -48,7 +47,7 @@
4847
import com.google.devtools.mobileharness.platform.android.xts.suite.TestSuiteHelper;
4948
import com.google.devtools.mobileharness.platform.android.xts.suite.subplan.SubPlan;
5049
import com.google.devtools.mobileharness.shared.util.file.local.LocalFileUtil;
51-
import com.google.devtools.mobileharness.shared.util.flags.Flags;
50+
import com.google.devtools.mobileharness.shared.util.junit.rule.SetFlagsOss;
5251
import com.google.gson.Gson;
5352
import com.google.gson.reflect.TypeToken;
5453
import com.google.inject.Guice;
@@ -66,7 +65,6 @@
6665
import java.util.Map;
6766
import java.util.Optional;
6867
import javax.inject.Inject;
69-
import org.junit.After;
7068
import org.junit.Before;
7169
import org.junit.Rule;
7270
import org.junit.Test;
@@ -82,8 +80,9 @@ public final class SessionRequestHandlerUtilTest {
8280

8381
private static final String XTS_ROOT_DIR_PATH = "/path/to/xts_root_dir";
8482

85-
@Rule public MockitoRule mockito = MockitoJUnit.rule();
86-
@Rule public TemporaryFolder folder = new TemporaryFolder();
83+
@Rule public final MockitoRule mockito = MockitoJUnit.rule();
84+
@Rule public final TemporaryFolder folder = new TemporaryFolder();
85+
@Rule public final SetFlagsOss flags = new SetFlagsOss();
8786

8887
@Bind @Mock private DeviceQuerier deviceQuerier;
8988
@Bind @Mock private LocalFileUtil localFileUtil;
@@ -103,7 +102,7 @@ public final class SessionRequestHandlerUtilTest {
103102

104103
@Before
105104
public void setUp() throws Exception {
106-
setFlags(/* enableAtsMode= */ true, /* useTfRetry= */ false);
105+
flags.setAllFlags(ImmutableMap.of("enable_ats_mode", "true", "use_tf_retry", "false"));
107106

108107
sessionGenDir = folder.newFolder("session_gen_dir").toPath();
109108
sessionTempDir = folder.newFolder("session_temp_dir").toPath();
@@ -120,25 +119,6 @@ public void setUp() throws Exception {
120119
.build());
121120
}
122121

123-
private void setFlags(boolean enableAtsMode, boolean useTfRetry) {
124-
ImmutableMap<String, String> flagMap =
125-
ImmutableMap.of(
126-
"enable_ats_mode",
127-
String.valueOf(enableAtsMode),
128-
"use_tf_retry",
129-
String.valueOf(useTfRetry));
130-
Flags.parse(
131-
flagMap.entrySet().stream()
132-
.map(e -> String.format("--%s=%s", e.getKey(), e.getValue()))
133-
.collect(toImmutableList())
134-
.toArray(new String[0]));
135-
}
136-
137-
@After
138-
public void tearDown() {
139-
Flags.resetToDefault();
140-
}
141-
142122
private SessionRequestInfo.Builder defaultSessionRequestInfoBuilder() {
143123
return SessionRequestInfo.builder()
144124
.setTestPlan("cts")
@@ -194,7 +174,7 @@ public void initializeJobConfig_pickOneDevice() throws Exception {
194174
assertThat(jobConfig.getDriver().getName()).isEqualTo("XtsTradefedTest");
195175
String driverParamsStr = jobConfig.getDriver().getParam();
196176
Map<String, String> driverParamsMap =
197-
new Gson().fromJson(driverParamsStr, new TypeToken<Map<String, String>>() {});
177+
new Gson().fromJson(driverParamsStr, new TypeToken<>() {});
198178
assertThat(driverParamsMap).containsExactlyEntriesIn(driverParams);
199179
}
200180

@@ -254,7 +234,7 @@ public void initializeJobConfig_pickOneRealDevice() throws Exception {
254234
assertThat(jobConfig.getDriver().getName()).isEqualTo("XtsTradefedTest");
255235
String driverParamsStr = jobConfig.getDriver().getParam();
256236
Map<String, String> driverParamsMap =
257-
new Gson().fromJson(driverParamsStr, new TypeToken<Map<String, String>>() {});
237+
new Gson().fromJson(driverParamsStr, new TypeToken<>() {});
258238
assertThat(driverParamsMap).containsExactlyEntriesIn(driverParams);
259239
}
260240

@@ -400,7 +380,7 @@ public void initializeJobConfig_someGivenSerialsNotExist_pickExistingDevicesOnly
400380
}
401381

402382
@Test
403-
public void initializeJobConfig_allGivenSerialsNotExist_noJobConfig() throws Exception {
383+
public void initializeJobConfig_allGivenSerialsNotExist_noJobConfig() {
404384
assertThrows(
405385
MobileHarnessException.class,
406386
() ->
@@ -496,7 +476,7 @@ public void getFilteredTradefedModules_testFilters() throws Exception {
496476

497477
@Test
498478
public void getFilteredTradefedModules_testFilters_tfRetryWithModules() throws Exception {
499-
setFlags(/* enableAtsMode= */ true, /* useTfRetry= */ true);
479+
flags.setAllFlags(ImmutableMap.of("enable_ats_mode", "true", "use_tf_retry", "true"));
500480
Configuration config1 =
501481
defaultConfigurationBuilder()
502482
.setMetadata(

‎src/javatests/com/google/devtools/mobileharness/infra/ats/common/jobcreator/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ java_library(
4343
"//src/java/com/google/devtools/mobileharness/platform/android/xts/suite/retry:retry_generator",
4444
"//src/java/com/google/devtools/mobileharness/platform/android/xts/suite/subplan:sub_plan",
4545
"//src/java/com/google/devtools/mobileharness/shared/util/file/local",
46-
"//src/java/com/google/devtools/mobileharness/shared/util/flags",
4746
"//src/java/com/google/wireless/qa/mobileharness/shared/model/job",
4847
"//src/java/com/google/wireless/qa/mobileharness/shared/proto:job_config_java_proto",
4948
"//src/javatests/com/google/devtools/mobileharness/builddefs:truth",
49+
"//src/javatests/com/google/devtools/mobileharness/shared/util/junit/rule:set_flags_oss",
5050
"//src/javatests/com/google/devtools/mobileharness/shared/util/runfiles:runfiles_util",
5151
"@maven//:com_google_guava_guava",
5252
"@maven//:com_google_inject_extensions_guice_testlib",

‎src/javatests/com/google/devtools/mobileharness/infra/ats/common/jobcreator/ConsoleJobCreatorTest.java‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.google.devtools.mobileharness.infra.ats.common.jobcreator;
1818

19-
import static com.google.common.collect.ImmutableList.toImmutableList;
2019
import static com.google.common.truth.Truth.assertThat;
2120
import static org.junit.Assert.assertThrows;
2221
import static org.mockito.ArgumentMatchers.any;
@@ -42,7 +41,7 @@
4241
import com.google.devtools.mobileharness.platform.android.xts.suite.retry.RetryGenerator;
4342
import com.google.devtools.mobileharness.platform.android.xts.suite.subplan.SubPlan;
4443
import com.google.devtools.mobileharness.shared.util.file.local.LocalFileUtil;
45-
import com.google.devtools.mobileharness.shared.util.flags.Flags;
44+
import com.google.devtools.mobileharness.shared.util.junit.rule.SetFlagsOss;
4645
import com.google.inject.Guice;
4746
import com.google.inject.testing.fieldbinder.Bind;
4847
import com.google.inject.testing.fieldbinder.BoundFieldModule;
@@ -52,7 +51,6 @@
5251
import java.util.Map;
5352
import java.util.Optional;
5453
import javax.inject.Inject;
55-
import org.junit.After;
5654
import org.junit.Before;
5755
import org.junit.Rule;
5856
import org.junit.Test;
@@ -71,6 +69,7 @@ public final class ConsoleJobCreatorTest {
7169

7270
@Rule public MockitoRule mockito = MockitoJUnit.rule();
7371
@Rule public TemporaryFolder folder = new TemporaryFolder();
72+
@Rule public final SetFlagsOss flags = new SetFlagsOss();
7473

7574
@Bind @Mock private SessionRequestHandlerUtil sessionRequestHandlerUtil;
7675
@Bind @Mock private LocalFileUtil localFileUtil;
@@ -85,31 +84,12 @@ public final class ConsoleJobCreatorTest {
8584

8685
@Before
8786
public void setUp() throws Exception {
88-
setFlags(/* enableAtsMode= */ true, /* useTfRetry= */ false);
87+
flags.setAllFlags(ImmutableMap.of("enable_ats_mode", "true", "use_tf_retry", "false"));
8988

9089
Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this);
9190
testPlanFilter = TestPlanParser.TestPlanFilter.create(ImmutableSet.of(), ImmutableSet.of());
9291
}
9392

94-
private void setFlags(boolean enableAtsMode, boolean useTfRetry) {
95-
ImmutableMap<String, String> flagMap =
96-
ImmutableMap.of(
97-
"enable_ats_mode",
98-
String.valueOf(enableAtsMode),
99-
"use_tf_retry",
100-
String.valueOf(useTfRetry));
101-
Flags.parse(
102-
flagMap.entrySet().stream()
103-
.map(e -> String.format("--%s=%s", e.getKey(), e.getValue()))
104-
.collect(toImmutableList())
105-
.toArray(new String[0]));
106-
}
107-
108-
@After
109-
public void tearDown() {
110-
Flags.resetToDefault();
111-
}
112-
11393
@SuppressWarnings("unchecked")
11494
@Test
11595
public void createXtsTradefedTestJob() throws Exception {
@@ -384,7 +364,7 @@ public void createXtsNonTradefedJobs_retry_noNonTfFailedTestsFound_throwExceptio
384364

385365
@Test
386366
public void createXtsTradefedTestJob_tfRetryWithModules() throws Exception {
387-
setFlags(/* enableAtsMode= */ true, /* useTfRetry= */ true);
367+
flags.setAllFlags(ImmutableMap.of("enable_ats_mode", "true", "use_tf_retry", "true"));
388368
SessionRequestInfo sessionRequestInfo =
389369
SessionRequestInfo.builder()
390370
.setTestPlan("retry")

‎src/javatests/com/google/devtools/mobileharness/infra/ats/common/jobcreator/ServerJobCreatorTest.java‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.google.devtools.mobileharness.infra.ats.common.jobcreator;
1818

19-
import static com.google.common.collect.ImmutableList.toImmutableList;
2019
import static com.google.common.truth.Truth.assertThat;
2120
import static org.junit.Assert.assertThrows;
2221
import static org.mockito.ArgumentMatchers.any;
@@ -42,7 +41,7 @@
4241
import com.google.devtools.mobileharness.platform.android.xts.suite.retry.RetryGenerator;
4342
import com.google.devtools.mobileharness.platform.android.xts.suite.subplan.SubPlan;
4443
import com.google.devtools.mobileharness.shared.util.file.local.LocalFileUtil;
45-
import com.google.devtools.mobileharness.shared.util.flags.Flags;
44+
import com.google.devtools.mobileharness.shared.util.junit.rule.SetFlagsOss;
4645
import com.google.devtools.mobileharness.shared.util.runfiles.RunfilesUtil;
4746
import com.google.inject.Guice;
4847
import com.google.inject.testing.fieldbinder.Bind;
@@ -54,7 +53,6 @@
5453
import java.util.Map;
5554
import java.util.Optional;
5655
import javax.inject.Inject;
57-
import org.junit.After;
5856
import org.junit.Before;
5957
import org.junit.Rule;
6058
import org.junit.Test;
@@ -86,6 +84,7 @@ public final class ServerJobCreatorTest {
8684

8785
@Rule public MockitoRule mockito = MockitoJUnit.rule();
8886
@Rule public TemporaryFolder folder = new TemporaryFolder();
87+
@Rule public final SetFlagsOss flags = new SetFlagsOss();
8988

9089
@Bind @Mock private SessionRequestHandlerUtil sessionRequestHandlerUtil;
9190
@Bind @Mock private LocalFileUtil localFileUtil;
@@ -101,32 +100,13 @@ public final class ServerJobCreatorTest {
101100

102101
@Before
103102
public void setUp() throws Exception {
104-
setFlags(/* enableAtsMode= */ true, /* useTfRetry= */ false);
103+
flags.setAllFlags(ImmutableMap.of("enable_ats_mode", "true", "use_tf_retry", "false"));
105104

106105
Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this);
107106
testPlanFilter = TestPlanParser.TestPlanFilter.create(ImmutableSet.of(), ImmutableSet.of());
108107
realLocalFileUtil = new LocalFileUtil();
109108
}
110109

111-
private void setFlags(boolean enableAtsMode, boolean useTfRetry) {
112-
ImmutableMap<String, String> flagMap =
113-
ImmutableMap.of(
114-
"enable_ats_mode",
115-
String.valueOf(enableAtsMode),
116-
"use_tf_retry",
117-
String.valueOf(useTfRetry));
118-
Flags.parse(
119-
flagMap.entrySet().stream()
120-
.map(e -> String.format("--%s=%s", e.getKey(), e.getValue()))
121-
.collect(toImmutableList())
122-
.toArray(new String[0]));
123-
}
124-
125-
@After
126-
public void tearDown() {
127-
Flags.resetToDefault();
128-
}
129-
130110
@SuppressWarnings("unchecked")
131111
@Test
132112
public void createXtsTradefedTestJob() throws Exception {
@@ -601,7 +581,7 @@ public void createXtsNonTradefedJobs_subPlanCmdWithExcludeFilter() throws Except
601581
}
602582

603583
@Test
604-
public void createXtsNonTradefedJobs_noNonTfModulesAndTestsFoundinSubPlan_skipped()
584+
public void createXtsNonTradefedJobs_noNonTfModulesAndTestsFoundInSubPlan_skipped()
605585
throws Exception {
606586
File xtsRootDir = folder.newFolder("xts_root_dir");
607587
Path subPlansDir = xtsRootDir.toPath().resolve("android-cts/subplans");

‎src/javatests/com/google/devtools/mobileharness/infra/ats/console/AtsConsoleTest.java‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import com.google.common.collect.ImmutableMap;
3030
import com.google.devtools.mobileharness.infra.ats.common.FlagsString;
3131
import com.google.devtools.mobileharness.shared.util.file.local.LocalFileUtil;
32-
import com.google.devtools.mobileharness.shared.util.flags.Flags;
32+
import com.google.devtools.mobileharness.shared.util.junit.rule.SetFlagsOss;
3333
import com.google.devtools.mobileharness.shared.util.path.PathUtil;
3434
import com.google.devtools.mobileharness.shared.util.port.PortProber;
3535
import com.google.devtools.mobileharness.shared.util.runfiles.RunfilesUtil;
@@ -43,7 +43,6 @@
4343
import org.jline.reader.History;
4444
import org.jline.reader.LineReader;
4545
import org.jline.utils.AttributedString;
46-
import org.junit.After;
4746
import org.junit.Before;
4847
import org.junit.Rule;
4948
import org.junit.Test;
@@ -57,8 +56,9 @@
5756
@RunWith(JUnit4.class)
5857
public final class AtsConsoleTest {
5958

60-
@Rule public MockitoRule mockito = MockitoJUnit.rule();
61-
@Rule public TemporaryFolder tmpFolder = new TemporaryFolder();
59+
@Rule public final MockitoRule mockito = MockitoJUnit.rule();
60+
@Rule public final TemporaryFolder tmpFolder = new TemporaryFolder();
61+
@Rule public final SetFlagsOss flags = new SetFlagsOss();
6262

6363
@Mock private LineReader lineReader;
6464
@Mock private History history;
@@ -109,12 +109,12 @@ public void setUp() throws Exception {
109109
tmpDirPath,
110110
"xts_res_dir_root",
111111
xtsResourceDirPath);
112+
flags.setAllFlags(flagMap);
112113
ImmutableList<String> flagList =
113114
flagMap.entrySet().stream()
114115
.map(e -> String.format("--%s=%s", e.getKey(), e.getValue()))
115116
.collect(toImmutableList());
116117
deviceInfraServiceFlags = FlagsString.of(String.join(" ", flagList), flagList);
117-
Flags.parse(deviceInfraServiceFlags.flags().toArray(new String[0]));
118118

119119
ByteArrayOutputStream consoleOutOutputStream = new ByteArrayOutputStream();
120120
consoleOutPrintStream = new PrintStream(consoleOutOutputStream, false, UTF_8);
@@ -140,11 +140,6 @@ public void setUp() throws Exception {
140140
atsConsole.injector = injector;
141141
}
142142

143-
@After
144-
public void tearDown() {
145-
Flags.resetToDefault();
146-
}
147-
148143
@Test
149144
public void startsConsoleWithHelp_exitConsoleAfterCommandExecution() throws Exception {
150145
Injector injector =

‎src/javatests/com/google/devtools/mobileharness/infra/ats/console/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ java_library(
3232
"//src/java/com/google/devtools/mobileharness/infra/ats/console:ats_console_lib",
3333
"//src/java/com/google/devtools/mobileharness/infra/ats/console:ats_console_module",
3434
"//src/java/com/google/devtools/mobileharness/shared/util/file/local",
35-
"//src/java/com/google/devtools/mobileharness/shared/util/flags",
3635
"//src/java/com/google/devtools/mobileharness/shared/util/path",
3736
"//src/java/com/google/devtools/mobileharness/shared/util/port:portprober",
37+
"//src/javatests/com/google/devtools/mobileharness/shared/util/junit/rule:set_flags_oss",
3838
"//src/javatests/com/google/devtools/mobileharness/shared/util/runfiles:runfiles_util",
3939
"@maven//:com_google_guava_guava",
4040
"@maven//:com_google_inject_guice",

‎src/javatests/com/google/devtools/mobileharness/infra/ats/console/command/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ java_library(
4444
"//src/java/com/google/devtools/mobileharness/infra/ats/console/util/console:console_util",
4545
"//src/java/com/google/devtools/mobileharness/shared/util/command",
4646
"//src/java/com/google/devtools/mobileharness/shared/util/file/local",
47-
"//src/java/com/google/devtools/mobileharness/shared/util/flags",
4847
"//src/java/com/google/devtools/mobileharness/shared/util/logging:google_logger",
4948
"//src/java/com/google/devtools/mobileharness/shared/util/path",
5049
"//src/java/com/google/devtools/mobileharness/shared/util/port:portprober",
5150
"//src/javatests/com/google/devtools/mobileharness/builddefs:truth",
51+
"//src/javatests/com/google/devtools/mobileharness/shared/util/junit/rule:set_flags_oss",
5252
"//src/javatests/com/google/devtools/mobileharness/shared/util/runfiles:runfiles_util",
5353
"//src/javatests/com/google/devtools/mobileharness/shared/util/truth:correspondences",
5454
"@maven//:com_google_code_findbugs_jsr305",

0 commit comments

Comments
 (0)