Skip to content

Commit 1eba23b

Browse files
lauraharkercopybara-github
authored andcommitted
Consolidate makePassFactory utils in unit tests
PiperOrigin-RevId: 892404131
1 parent 6229a47 commit 1eba23b

File tree

8 files changed

+4
-42
lines changed

8 files changed

+4
-42
lines changed

test/com/google/javascript/jscomp/AggressiveInlineAliasesTest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.google.javascript.jscomp.CompilerOptions.PropertyCollapseLevel;
2323
import com.google.javascript.jscomp.GlobalNamespace.Name;
2424
import com.google.javascript.jscomp.deps.ModuleLoader.ResolutionMode;
25-
import java.util.function.Function;
2625
import org.junit.Before;
2726
import org.junit.Test;
2827
import org.junit.runner.RunWith;
@@ -45,11 +44,6 @@ public AggressiveInlineAliasesTest() {
4544
super(EXTERNS);
4645
}
4746

48-
private static PassFactory makePassFactory(
49-
String name, Function<AbstractCompiler, CompilerPass> pass) {
50-
return PassFactory.builder().setName(name).setInternalFactory(pass).build();
51-
}
52-
5347
@Override
5448
protected CompilerPass getProcessor(final Compiler compiler) {
5549
PhaseOptimizer optimizer = new PhaseOptimizer(compiler, null);

test/com/google/javascript/jscomp/CollapsePropertiesTest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import com.google.javascript.jscomp.CompilerOptions.PropertyCollapseLevel;
2727
import com.google.javascript.jscomp.deps.ModuleLoader.ResolutionMode;
2828
import java.util.ArrayList;
29-
import java.util.function.Function;
3029
import org.junit.Before;
3130
import org.junit.Test;
3231
import org.junit.runner.RunWith;
@@ -51,11 +50,6 @@ public CollapsePropertiesTest() {
5150
super(EXTERNS);
5251
}
5352

54-
private static PassFactory makePassFactory(
55-
String name, Function<AbstractCompiler, CompilerPass> pass) {
56-
return PassFactory.builder().setName(name).setInternalFactory(pass).build();
57-
}
58-
5953
@Override
6054
protected CompilerPass getProcessor(final Compiler compiler) {
6155
PhaseOptimizer optimizer = new PhaseOptimizer(compiler, null);

test/com/google/javascript/jscomp/CompilerTestCase.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2131,4 +2131,8 @@ private static Function<Node, String> createPrettyPrinter(Compiler compiler) {
21312131
.setPrettyPrint(true)
21322132
.build();
21332133
}
2134+
2135+
static PassFactory makePassFactory(String name, Function<AbstractCompiler, CompilerPass> pass) {
2136+
return PassFactory.builder().setName(name).setInternalFactory(pass).build();
2137+
}
21342138
}

test/com/google/javascript/jscomp/Es6ConvertSuperTest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import com.google.javascript.jscomp.testing.TestExternsBuilder;
2626
import com.google.javascript.rhino.Node;
2727
import com.google.javascript.rhino.Token;
28-
import java.util.function.Function;
2928
import org.junit.Before;
3029
import org.junit.Test;
3130
import org.junit.runner.RunWith;
@@ -64,11 +63,6 @@ public void setUp() throws Exception {
6463
enableMultistageCompilation();
6564
}
6665

67-
private static PassFactory makePassFactory(
68-
String name, Function<AbstractCompiler, CompilerPass> pass) {
69-
return PassFactory.builder().setName(name).setInternalFactory(pass).build();
70-
}
71-
7266
@Override
7367
protected CompilerPass getProcessor(final Compiler compiler) {
7468
PhaseOptimizer optimizer = new PhaseOptimizer(compiler, null);

test/com/google/javascript/jscomp/Es6RewriteClassTest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import com.google.javascript.jscomp.testing.TestExternsBuilder;
2828
import com.google.javascript.rhino.Node;
2929
import com.google.javascript.rhino.Token;
30-
import java.util.function.Function;
3130
import org.junit.Before;
3231
import org.junit.Test;
3332
import org.junit.runner.RunWith;
@@ -68,11 +67,6 @@ public void customSetUp() throws Exception {
6867
es6SubclassTranspilation = Es6SubclassTranspilation.CONCISE_UNSAFE;
6968
}
7069

71-
private static PassFactory makePassFactory(
72-
String name, Function<AbstractCompiler, CompilerPass> pass) {
73-
return PassFactory.builder().setName(name).setInternalFactory(pass).build();
74-
}
75-
7670
@Override
7771
protected CompilerPass getProcessor(final Compiler compiler) {
7872
PhaseOptimizer optimizer = new PhaseOptimizer(compiler, null);

test/com/google/javascript/jscomp/InlineAliasesTest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import static com.google.javascript.jscomp.InlineAndCollapseProperties.ALIAS_CYCLE;
2020

2121
import com.google.javascript.jscomp.CompilerOptions.PropertyCollapseLevel;
22-
import java.util.function.Function;
2322
import org.junit.Before;
2423
import org.junit.Test;
2524
import org.junit.runner.RunWith;
@@ -29,11 +28,6 @@
2928
@RunWith(JUnit4.class)
3029
public class InlineAliasesTest extends CompilerTestCase {
3130

32-
private static PassFactory makePassFactory(
33-
String name, Function<AbstractCompiler, CompilerPass> pass) {
34-
return PassFactory.builder().setName(name).setInternalFactory(pass).build();
35-
}
36-
3731
@Override
3832
protected CompilerPass getProcessor(final Compiler compiler) {
3933
PhaseOptimizer optimizer = new PhaseOptimizer(compiler, null);

test/com/google/javascript/jscomp/InlineAndCollapsePropertiesTest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import com.google.javascript.jscomp.testing.TestExternsBuilder;
2929
import com.google.javascript.rhino.Node;
3030
import com.google.javascript.rhino.testing.NodeSubject;
31-
import java.util.function.Function;
3231
import org.junit.Before;
3332
import org.junit.Test;
3433
import org.junit.runner.RunWith;
@@ -51,11 +50,6 @@ public InlineAndCollapsePropertiesTest() {
5150
super(EXTERNS);
5251
}
5352

54-
private static PassFactory makePassFactory(
55-
String name, Function<AbstractCompiler, CompilerPass> pass) {
56-
return PassFactory.builder().setName(name).setInternalFactory(pass).build();
57-
}
58-
5953
@Override
6054
protected CompilerPass getProcessor(final Compiler compiler) {
6155
PhaseOptimizer optimizer = new PhaseOptimizer(compiler, null);

test/com/google/javascript/jscomp/NormalizeTest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import java.util.Iterator;
2828
import java.util.LinkedHashSet;
2929
import java.util.Set;
30-
import java.util.function.Function;
3130
import java.util.function.Predicate;
3231
import org.junit.Before;
3332
import org.junit.Test;
@@ -1607,11 +1606,6 @@ public void testRenamingConstantProperties() throws Exception {
16071606
CompilerTestCase tester =
16081607
new CompilerTestCase() {
16091608

1610-
private static PassFactory makePassFactory(
1611-
String name, Function<AbstractCompiler, CompilerPass> pass) {
1612-
return PassFactory.builder().setName(name).setInternalFactory(pass).build();
1613-
}
1614-
16151609
@Override
16161610
protected CompilerPass getProcessor(final Compiler compiler) {
16171611
PhaseOptimizer optimizer = new PhaseOptimizer(compiler, null);

0 commit comments

Comments
 (0)