Skip to content

Use yet more static imports. #8363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Apr 20, 2026
Merged

Use yet more static imports. #8363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions android/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.collect.Iterators.peekingIterator;
import static com.google.common.collect.Maps.unmodifiableNavigableMap;
import static com.google.common.collect.Sets.newTreeSet;
import static com.google.common.collect.Sets.unmodifiableNavigableSet;
import static com.google.common.collect.Tables.unmodifiableRowSortedTable;
import static java.nio.charset.StandardCharsets.UTF_8;
Expand Down Expand Up @@ -63,7 +65,6 @@
import com.google.common.collect.Range;
import com.google.common.collect.RowSortedTable;
import com.google.common.collect.SetMultimap;
import com.google.common.collect.Sets;
import com.google.common.collect.SortedMapDifference;
import com.google.common.collect.SortedMultiset;
import com.google.common.collect.SortedSetMultimap;
Expand Down Expand Up @@ -254,12 +255,12 @@ private static MatchResult createMatchResult() {
.put(ImmutableSet.class, ImmutableSet.of())
.put(SortedSet.class, ImmutableSortedSet.of())
.put(ImmutableSortedSet.class, ImmutableSortedSet.of())
.put(NavigableSet.class, unmodifiableNavigableSet(Sets.newTreeSet()))
.put(NavigableSet.class, unmodifiableNavigableSet(newTreeSet()))
.put(Map.class, ImmutableMap.of())
.put(ImmutableMap.class, ImmutableMap.of())
.put(SortedMap.class, ImmutableSortedMap.of())
.put(ImmutableSortedMap.class, ImmutableSortedMap.of())
.put(NavigableMap.class, Maps.unmodifiableNavigableMap(Maps.newTreeMap()))
.put(NavigableMap.class, unmodifiableNavigableMap(Maps.newTreeMap()))
.put(Multimap.class, ImmutableMultimap.of())
.put(ImmutableMultimap.class, ImmutableMultimap.of())
.put(ListMultimap.class, ImmutableListMultimap.of())
Expand Down
5 changes: 3 additions & 2 deletions android/guava-testlib/src/com/google/common/testing/ClassSanityTester.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Throwables.throwIfUnchecked;
import static com.google.common.collect.Lists.newArrayListWithCapacity;
import static com.google.common.testing.NullPointerTester.isNullable;
import static com.google.common.testing.SerializableTester.reserialize;
import static com.google.common.testing.SerializableTester.reserializeAndAssert;
Expand Down Expand Up @@ -578,8 +579,8 @@ private void testEqualsUsing(Invokable<?, ?> factory)
InvocationTargetException,
FactoryMethodReturnsNullException {
List<Parameter> params = factory.getParameters();
List<FreshValueGenerator> argGenerators = Lists.newArrayListWithCapacity(params.size());
List<@Nullable Object> args = Lists.newArrayListWithCapacity(params.size());
List<FreshValueGenerator> argGenerators = newArrayListWithCapacity(params.size());
List<@Nullable Object> args = newArrayListWithCapacity(params.size());
for (Parameter param : params) {
FreshValueGenerator generator = newFreshValueGenerator();
argGenerators.add(generator);
Expand Down
4 changes: 2 additions & 2 deletions android/guava-testlib/src/com/google/common/testing/EqualsTester.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
package com.google.common.testing;

import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.Iterables.concat;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertTrue;

import com.google.common.annotations.GwtCompatible;
import com.google.common.base.Equivalence;
import com.google.common.collect.Iterables;
import com.google.common.testing.RelationshipTester.Item;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import java.util.ArrayList;
Expand Down Expand Up @@ -139,7 +139,7 @@ public EqualsTester testEquals() {
}

private void testItems() {
for (Object item : Iterables.concat(equalityGroups)) {
for (Object item : concat(equalityGroups)) {
assertTrue(item + " must not be Object#equals to null", !item.equals(null));
assertTrue(
item + " must not be Object#equals to an arbitrary object of another class",
Expand Down
8 changes: 4 additions & 4 deletions android/guava-testlib/src/com/google/common/testing/FreshValueGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Throwables.throwIfUnchecked;
import static com.google.common.collect.Lists.newArrayListWithCapacity;
import static com.google.common.collect.Sets.newTreeSet;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.Arrays.asList;
import static java.util.Objects.requireNonNull;
Expand Down Expand Up @@ -52,15 +54,13 @@
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.LinkedHashMultiset;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multiset;
import com.google.common.collect.Ordering;
import com.google.common.collect.Range;
import com.google.common.collect.RowSortedTable;
import com.google.common.collect.SetMultimap;
import com.google.common.collect.Sets;
import com.google.common.collect.SortedMultiset;
import com.google.common.collect.Table;
import com.google.common.collect.TreeBasedTable;
Expand Down Expand Up @@ -239,7 +239,7 @@ final <T> T newFreshProxy(Class<T> interfaceType) {
Method generate = GENERATORS.get(rawType);
if (generate != null) {
ImmutableList<Parameter> params = Invokable.from(generate).getParameters();
List<Object> args = Lists.newArrayListWithCapacity(params.size());
List<Object> args = newArrayListWithCapacity(params.size());
TypeVariable<?>[] typeVars = rawType.getTypeParameters();
for (int i = 0; i < params.size(); i++) {
TypeToken<?> paramType = type.resolveType(typeVars[i]);
Expand Down Expand Up @@ -703,7 +703,7 @@ static <E extends Comparable<? super E>> NavigableSet<E> generateNavigableSet(E

@Generates
static <E extends Comparable<? super E>> TreeSet<E> generateTreeSet(E freshElement) {
TreeSet<E> set = Sets.newTreeSet();
TreeSet<E> set = newTreeSet();
set.add(freshElement);
return set;
}
Expand Down
6 changes: 3 additions & 3 deletions android/guava-testlib/test/com/google/common/collect/testing/SafeTreeSetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@

package com.google.common.collect.testing;

import static com.google.common.collect.Sets.newTreeSet;
import static com.google.common.testing.SerializableTester.reserialize;
import static com.google.common.testing.SerializableTester.reserializeAndAssert;
import static java.util.Arrays.asList;

import com.google.common.annotations.GwtIncompatible;
import com.google.common.collect.ImmutableSortedMap;
import com.google.common.collect.Ordering;
import com.google.common.collect.Sets;
import com.google.common.collect.testing.features.CollectionFeature;
import com.google.common.collect.testing.features.CollectionSize;
import java.util.ArrayList;
Expand Down Expand Up @@ -52,7 +52,7 @@ protected Set<String> create(String[] elements) {

@Override
public List<String> order(List<String> insertionOrder) {
return new ArrayList<>(Sets.newTreeSet(insertionOrder));
return new ArrayList<>(newTreeSet(insertionOrder));
}
})
.withFeatures(
Expand All @@ -73,7 +73,7 @@ protected Set<String> create(String[] elements) {

@Override
public List<String> order(List<String> insertionOrder) {
return new ArrayList<>(Sets.newTreeSet(insertionOrder));
return new ArrayList<>(newTreeSet(insertionOrder));
}
})
.withFeatures(
Expand Down
5 changes: 3 additions & 2 deletions android/guava-tests/test/com/google/common/base/CharMatcherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import static com.google.common.base.CharMatcher.noneOf;
import static com.google.common.base.CharMatcher.whitespace;
import static com.google.common.base.Predicates.equalTo;
import static com.google.common.base.Strings.repeat;
import static com.google.common.truth.Truth.assertThat;
import static java.util.Arrays.sort;
import static org.junit.Assert.assertThrows;
Expand Down Expand Up @@ -293,8 +294,8 @@ private void reallyTestAllMatches(CharMatcher matcher, CharSequence s) {
assertTrue(matcher.matchesAllOf(s));
assertFalse(matcher.matchesNoneOf(s));
assertThat(matcher.removeFrom(s)).isEqualTo("");
assertThat(matcher.replaceFrom(s, 'z')).isEqualTo(Strings.repeat("z", s.length()));
assertThat(matcher.replaceFrom(s, "ZZ")).isEqualTo(Strings.repeat("ZZ", s.length()));
assertThat(matcher.replaceFrom(s, 'z')).isEqualTo(repeat("z", s.length()));
assertThat(matcher.replaceFrom(s, "ZZ")).isEqualTo(repeat("ZZ", s.length()));
assertThat(matcher.trimFrom(s)).isEqualTo("");
assertEquals(s.length(), matcher.countIn(s));
}
Expand Down
Loading
Loading