Skip to content

Commit c7d9fef

Browse files
eamonnmcmanusGoogle Java Core Libraries
eamonnmcmanus
authored and
Google Java Core Libraries
committed
Copy the setUp and tearDown from the parent builder to derived test suites.
Fixes #5674. RELNOTES=In collection test suites, the `setUp` and `tearDown` are copied to derived test suites. PiperOrigin-RevId: 391626825
1 parent ebc0b10 commit c7d9fef

22 files changed

+264
-8
lines changed

‎android/guava-testlib/src/com/google/common/collect/testing/CollectionTestSuiteBuilder.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ protected List<TestSuite> createDerivedSuites(
5757
.named(getName() + " reserialized")
5858
.withFeatures(computeReserializedCollectionFeatures(parentBuilder.getFeatures()))
5959
.suppressing(parentBuilder.getSuppressedTests())
60+
.withSetUp(parentBuilder.getSetUp())
61+
.withTearDown(parentBuilder.getTearDown())
6062
.createTestSuite());
6163
}
6264
return derivedSuites;

‎android/guava-testlib/src/com/google/common/collect/testing/FeatureSpecificTestSuiteBuilder.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public B withSetUp(Runnable setUp) {
8181
return self();
8282
}
8383

84-
protected Runnable getSetUp() {
84+
public Runnable getSetUp() {
8585
return setUp;
8686
}
8787

@@ -90,13 +90,13 @@ public B withTearDown(Runnable tearDown) {
9090
return self();
9191
}
9292

93-
protected Runnable getTearDown() {
93+
public Runnable getTearDown() {
9494
return tearDown;
9595
}
9696

9797
// Features
9898

99-
private Set<Feature<?>> features = new LinkedHashSet<>();
99+
private final Set<Feature<?>> features = new LinkedHashSet<>();
100100

101101
/**
102102
* Configures this builder to produce tests appropriate for the given features. This method may be
@@ -138,7 +138,7 @@ public String getName() {
138138

139139
// Test suppression
140140

141-
private Set<Method> suppressedTests = new HashSet<>();
141+
private final Set<Method> suppressedTests = new HashSet<>();
142142

143143
/**
144144
* Prevents the given methods from being run as part of the test suite.

‎android/guava-testlib/src/com/google/common/collect/testing/ListTestSuiteBuilder.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ protected List<TestSuite> createDerivedSuites(
112112
.named(getName() + " reserialized")
113113
.withFeatures(computeReserializedCollectionFeatures(parentBuilder.getFeatures()))
114114
.suppressing(parentBuilder.getSuppressedTests())
115+
.withSetUp(parentBuilder.getSetUp())
116+
.withTearDown(parentBuilder.getTearDown())
115117
.createTestSuite());
116118
}
117119
return derivedSuites;

‎android/guava-testlib/src/com/google/common/collect/testing/MapTestSuiteBuilder.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ protected List<TestSuite> createDerivedSuites(
101101
.withFeatures(computeReserializedMapFeatures(parentBuilder.getFeatures()))
102102
.named(parentBuilder.getName() + " reserialized")
103103
.suppressing(parentBuilder.getSuppressedTests())
104+
.withSetUp(parentBuilder.getSetUp())
105+
.withTearDown(parentBuilder.getTearDown())
104106
.createTestSuite());
105107
}
106108

@@ -110,13 +112,17 @@ protected List<TestSuite> createDerivedSuites(
110112
.withFeatures(computeEntrySetFeatures(parentBuilder.getFeatures()))
111113
.named(parentBuilder.getName() + " entrySet")
112114
.suppressing(parentBuilder.getSuppressedTests())
115+
.withSetUp(parentBuilder.getSetUp())
116+
.withTearDown(parentBuilder.getTearDown())
113117
.createTestSuite());
114118

115119
derivedSuites.add(
116120
createDerivedKeySetSuite(keySetGenerator(parentBuilder.getSubjectGenerator()))
117121
.withFeatures(computeKeySetFeatures(parentBuilder.getFeatures()))
118122
.named(parentBuilder.getName() + " keys")
119123
.suppressing(parentBuilder.getSuppressedTests())
124+
.withSetUp(parentBuilder.getSetUp())
125+
.withTearDown(parentBuilder.getTearDown())
120126
.createTestSuite());
121127

122128
derivedSuites.add(
@@ -125,6 +131,8 @@ protected List<TestSuite> createDerivedSuites(
125131
.named(parentBuilder.getName() + " values")
126132
.withFeatures(computeValuesCollectionFeatures(parentBuilder.getFeatures()))
127133
.suppressing(parentBuilder.getSuppressedTests())
134+
.withSetUp(parentBuilder.getSetUp())
135+
.withTearDown(parentBuilder.getTearDown())
128136
.createTestSuite());
129137

130138
return derivedSuites;

‎android/guava-testlib/src/com/google/common/collect/testing/SetTestSuiteBuilder.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ protected List<TestSuite> createDerivedSuites(
7878
.named(getName() + " reserialized")
7979
.withFeatures(computeReserializedCollectionFeatures(parentBuilder.getFeatures()))
8080
.suppressing(parentBuilder.getSuppressedTests())
81+
.withSetUp(parentBuilder.getSetUp())
82+
.withTearDown(parentBuilder.getTearDown())
8183
.createTestSuite());
8284
}
8385
return derivedSuites;

‎android/guava-testlib/src/com/google/common/collect/testing/SortedMapTestSuiteBuilder.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ final TestSuite createSubmapSuite(
121121
.named(parentBuilder.getName() + " subMap " + from + "-" + to)
122122
.withFeatures(features)
123123
.suppressing(parentBuilder.getSuppressedTests())
124+
.withSetUp(parentBuilder.getSetUp())
125+
.withTearDown(parentBuilder.getTearDown())
124126
.createTestSuite();
125127
}
126128

‎android/guava-testlib/src/com/google/common/collect/testing/SortedSetTestSuiteBuilder.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ final TestSuite createSubsetSuite(
9494
.named(parentBuilder.getName() + " subSet " + from + "-" + to)
9595
.withFeatures(features)
9696
.suppressing(parentBuilder.getSuppressedTests())
97+
.withSetUp(parentBuilder.getSetUp())
98+
.withTearDown(parentBuilder.getTearDown())
9799
.createTestSuite();
98100
}
99101

‎android/guava-testlib/src/com/google/common/collect/testing/google/BiMapTestSuiteBuilder.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ protected List<TestSuite> createDerivedSuites(
8888
.suppressing(parentBuilder.getSuppressedTests())
8989
.suppressing(SetCreationTester.class.getMethods())
9090
// BiMap.entrySet() duplicate-handling behavior is too confusing for SetCreationTester
91+
.withSetUp(parentBuilder.getSetUp())
92+
.withTearDown(parentBuilder.getTearDown())
9193
.createTestSuite());
9294
/*
9395
* TODO(cpovirk): the Map tests duplicate most of this effort by using a
@@ -101,6 +103,8 @@ protected List<TestSuite> createDerivedSuites(
101103
.suppressing(parentBuilder.getSuppressedTests())
102104
.suppressing(SetCreationTester.class.getMethods())
103105
// BiMap.values() duplicate-handling behavior is too confusing for SetCreationTester
106+
.withSetUp(parentBuilder.getSetUp())
107+
.withTearDown(parentBuilder.getTearDown())
104108
.createTestSuite());
105109
if (!parentBuilder.getFeatures().contains(NoRecurse.INVERSE)) {
106110
derived.add(
@@ -109,6 +113,8 @@ protected List<TestSuite> createDerivedSuites(
109113
.withFeatures(computeInverseFeatures(parentBuilder.getFeatures()))
110114
.named(parentBuilder.getName() + " inverse")
111115
.suppressing(parentBuilder.getSuppressedTests())
116+
.withSetUp(parentBuilder.getSetUp())
117+
.withTearDown(parentBuilder.getTearDown())
112118
.createTestSuite());
113119
}
114120

‎android/guava-testlib/src/com/google/common/collect/testing/google/MultimapTestSuiteBuilder.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ protected List<TestSuite> createDerivedSuites(
115115
.withFeatures(computeReserializedMultimapFeatures(parentBuilder.getFeatures()))
116116
.named(parentBuilder.getName() + " reserialized")
117117
.suppressing(parentBuilder.getSuppressedTests())
118+
.withSetUp(parentBuilder.getSetUp())
119+
.withTearDown(parentBuilder.getTearDown())
118120
.createTestSuite());
119121
}
120122

@@ -123,6 +125,8 @@ protected List<TestSuite> createDerivedSuites(
123125
.withFeatures(computeAsMapFeatures(parentBuilder.getFeatures()))
124126
.named(parentBuilder.getName() + ".asMap")
125127
.suppressing(parentBuilder.getSuppressedTests())
128+
.withSetUp(parentBuilder.getSetUp())
129+
.withTearDown(parentBuilder.getTearDown())
126130
.createTestSuite());
127131

128132
derivedSuites.add(computeEntriesTestSuite(parentBuilder));
@@ -153,6 +157,8 @@ TestSuite computeEntriesTestSuite(
153157
.withFeatures(computeEntriesFeatures(parentBuilder.getFeatures()))
154158
.named(parentBuilder.getName() + ".entries")
155159
.suppressing(parentBuilder.getSuppressedTests())
160+
.withSetUp(parentBuilder.getSetUp())
161+
.withTearDown(parentBuilder.getTearDown())
156162
.createTestSuite();
157163
}
158164

@@ -164,6 +170,8 @@ TestSuite computeMultimapGetTestSuite(
164170
.withFeatures(computeMultimapGetFeatures(parentBuilder.getFeatures()))
165171
.named(parentBuilder.getName() + ".get[key]")
166172
.suppressing(parentBuilder.getSuppressedTests())
173+
.withSetUp(parentBuilder.getSetUp())
174+
.withTearDown(parentBuilder.getTearDown())
167175
.createTestSuite();
168176
}
169177

@@ -179,6 +187,8 @@ TestSuite computeMultimapAsMapGetTestSuite(
179187
.withFeatures(features)
180188
.named(parentBuilder.getName() + ".asMap[].get[key]")
181189
.suppressing(parentBuilder.getSuppressedTests())
190+
.withSetUp(parentBuilder.getSetUp())
191+
.withTearDown(parentBuilder.getTearDown())
182192
.createTestSuite();
183193
}
184194
}
@@ -191,6 +201,8 @@ TestSuite computeKeysTestSuite(
191201
.withFeatures(computeKeysFeatures(parentBuilder.getFeatures()))
192202
.named(parentBuilder.getName() + ".keys")
193203
.suppressing(parentBuilder.getSuppressedTests())
204+
.withSetUp(parentBuilder.getSetUp())
205+
.withTearDown(parentBuilder.getTearDown())
194206
.createTestSuite();
195207
}
196208

‎android/guava-testlib/src/com/google/common/collect/testing/google/MultisetTestSuiteBuilder.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ protected List<TestSuite> createDerivedSuites(
130130
.named(getName() + ".entrySet")
131131
.withFeatures(computeEntrySetFeatures(parentBuilder.getFeatures()))
132132
.suppressing(parentBuilder.getSuppressedTests())
133+
.withSetUp(parentBuilder.getSetUp())
134+
.withTearDown(parentBuilder.getTearDown())
133135
.createTestSuite());
134136
}
135137

@@ -140,6 +142,8 @@ protected List<TestSuite> createDerivedSuites(
140142
.named(getName() + " reserialized")
141143
.withFeatures(computeReserializedMultisetFeatures(parentBuilder.getFeatures()))
142144
.suppressing(parentBuilder.getSuppressedTests())
145+
.withSetUp(parentBuilder.getSetUp())
146+
.withTearDown(parentBuilder.getTearDown())
143147
.createTestSuite());
144148
}
145149
return derivedSuites;
@@ -153,6 +157,8 @@ TestSuite createElementSetTestSuite(
153157
.named(getName() + ".elementSet")
154158
.withFeatures(computeElementSetFeatures(parentBuilder.getFeatures()))
155159
.suppressing(parentBuilder.getSuppressedTests())
160+
.withSetUp(parentBuilder.getSetUp())
161+
.withTearDown(parentBuilder.getTearDown())
156162
.createTestSuite();
157163
}
158164

0 commit comments

Comments
 (0)