Skip to content

Commit 873ea3b

Browse files
committed
simplify params() in CompressionTest
1 parent 91c18ef commit 873ea3b

File tree

1 file changed

+12
-21
lines changed

1 file changed

+12
-21
lines changed

interop-testing/src/test/java/io/grpc/testing/integration/CompressionTest.java

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import static org.junit.Assert.assertNull;
2525
import static org.junit.Assert.assertTrue;
2626

27+
import com.google.common.collect.Iterables;
28+
import com.google.common.collect.Lists;
2729
import com.google.protobuf.ByteString;
2830
import io.grpc.CallOptions;
2931
import io.grpc.Channel;
@@ -53,8 +55,6 @@
5355
import io.grpc.testing.integration.TestServiceGrpc.TestServiceBlockingStub;
5456
import io.grpc.testing.integration.TransportCompressionTest.Fzip;
5557
import java.nio.charset.Charset;
56-
import java.util.ArrayList;
57-
import java.util.Collection;
5858
import java.util.List;
5959
import java.util.concurrent.Executors;
6060
import java.util.concurrent.ScheduledExecutorService;
@@ -146,25 +146,16 @@ public void tearDown() {
146146
* Parameters for test.
147147
*/
148148
@Parameters
149-
public static Collection<Object[]> params() {
150-
boolean[] bools = new boolean[]{false, true};
151-
List<Object[]> combos = new ArrayList<>(64);
152-
for (boolean enableClientMessageCompression : bools) {
153-
for (boolean clientAcceptEncoding : bools) {
154-
for (boolean clientEncoding : bools) {
155-
for (boolean enableServerMessageCompression : bools) {
156-
for (boolean serverAcceptEncoding : bools) {
157-
for (boolean serverEncoding : bools) {
158-
combos.add(new Object[] {
159-
enableClientMessageCompression, clientAcceptEncoding, clientEncoding,
160-
enableServerMessageCompression, serverAcceptEncoding, serverEncoding});
161-
}
162-
}
163-
}
164-
}
165-
}
166-
}
167-
return combos;
149+
public static Iterable<Object[]> params() {
150+
List<Boolean> bools = Lists.newArrayList(false, true);
151+
return Iterables.transform(Lists.cartesianProduct(
152+
bools, // enableClientMessageCompression
153+
bools, // clientAcceptEncoding
154+
bools, // clientEncoding
155+
bools, // enableServerMessageCompression
156+
bools, // serverAcceptEncoding
157+
bools // serverEncoding
158+
), List::toArray);
168159
}
169160

170161
@Test

0 commit comments

Comments
 (0)