18
18
19
19
import static com .google .common .truth .Truth .assertThat ;
20
20
import static com .google .common .truth .Truth .assertWithMessage ;
21
- import static com .google .common .truth .Truth8 .assertThat ;
22
21
import static com .google .javascript .jscomp .base .JSCompStrings .lines ;
23
22
import static java .util .Collections .shuffle ;
24
23
import static org .junit .Assert .assertThrows ;
25
24
26
25
import com .google .common .collect .ImmutableList ;
27
26
import com .google .common .collect .Iterables ;
27
+ import com .google .common .truth .Truth8 ;
28
28
import com .google .gson .JsonArray ;
29
29
import com .google .gson .JsonObject ;
30
30
import com .google .javascript .jscomp .deps .DependencyInfo .Require ;
@@ -664,9 +664,9 @@ public void testMoveMarkedWeakSources() throws Exception {
664
664
665
665
makeGraph ();
666
666
667
- assertThat (getWeakModule ().getInputs ().stream ().map (CompilerInput ::getSourceFile ))
667
+ Truth8 . assertThat (getWeakModule ().getInputs ().stream ().map (CompilerInput ::getSourceFile ))
668
668
.containsExactly (weak1 , weak2 );
669
- assertThat (chunkA .getInputs ().stream ().map (CompilerInput ::getSourceFile ))
669
+ Truth8 . assertThat (chunkA .getInputs ().stream ().map (CompilerInput ::getSourceFile ))
670
670
.containsExactly (strong1 , strong2 );
671
671
}
672
672
@@ -691,9 +691,9 @@ public void testMoveMarkedWeakSourcesDuringManageDepsSortOnly() throws Exception
691
691
makeGraph ();
692
692
graph .manageDependencies (compiler , DependencyOptions .sortOnly ());
693
693
694
- assertThat (getWeakModule ().getInputs ().stream ().map (CompilerInput ::getSourceFile ))
694
+ Truth8 . assertThat (getWeakModule ().getInputs ().stream ().map (CompilerInput ::getSourceFile ))
695
695
.containsExactly (weak1 , weak2 );
696
- assertThat (chunkA .getInputs ().stream ().map (CompilerInput ::getSourceFile ))
696
+ Truth8 . assertThat (chunkA .getInputs ().stream ().map (CompilerInput ::getSourceFile ))
697
697
.containsExactly (strong1 , strong2 );
698
698
}
699
699
@@ -727,7 +727,7 @@ public void testIgnoreMarkedWeakSourcesDuringManageDepsPrune() throws Exception
727
727
.map (CompilerInput ::getSourceFile )
728
728
.collect (Collectors .toList ()))
729
729
.isEmpty ();
730
- assertThat (chunkA .getInputs ().stream ().map (CompilerInput ::getSourceFile ))
730
+ Truth8 . assertThat (chunkA .getInputs ().stream ().map (CompilerInput ::getSourceFile ))
731
731
.containsExactly (strong1 , strong2 );
732
732
}
733
733
@@ -769,7 +769,7 @@ public void testIgnoreDepsOfMarkedWeakSourcesDuringManageDepsPrune() throws Exce
769
769
.map (CompilerInput ::getSourceFile )
770
770
.collect (Collectors .toList ()))
771
771
.isEmpty ();
772
- assertThat (chunkA .getInputs ().stream ().map (CompilerInput ::getSourceFile ))
772
+ Truth8 . assertThat (chunkA .getInputs ().stream ().map (CompilerInput ::getSourceFile ))
773
773
.containsExactly (strong1 , strong2 );
774
774
}
775
775
@@ -795,9 +795,9 @@ public void testMoveImplicitWeakSourcesFromMoocherDuringManageDepsLegacyPrune()
795
795
DependencyOptions .pruneLegacyForEntryPoints (
796
796
ImmutableList .of (ModuleIdentifier .forFile ("strong" ))));
797
797
798
- assertThat (getWeakModule ().getInputs ().stream ().map (CompilerInput ::getSourceFile ))
798
+ Truth8 . assertThat (getWeakModule ().getInputs ().stream ().map (CompilerInput ::getSourceFile ))
799
799
.containsExactly (weak );
800
- assertThat (chunkA .getInputs ().stream ().map (CompilerInput ::getSourceFile ))
800
+ Truth8 . assertThat (chunkA .getInputs ().stream ().map (CompilerInput ::getSourceFile ))
801
801
.containsExactly (strong , moocher );
802
802
}
803
803
@@ -823,7 +823,7 @@ public void testImplicitWeakSourcesNotMovedDuringManageDepsSortOnly() throws Exc
823
823
graph .manageDependencies (compiler , DependencyOptions .sortOnly ());
824
824
825
825
assertThat (getWeakModule ().getInputs ()).isEmpty ();
826
- assertThat (chunkA .getInputs ().stream ().map (CompilerInput ::getSourceFile ))
826
+ Truth8 . assertThat (chunkA .getInputs ().stream ().map (CompilerInput ::getSourceFile ))
827
827
.containsExactly (weak1 , strong1 , weak2 , strong2 );
828
828
}
829
829
@@ -852,9 +852,9 @@ public void testImplicitWeakSourcesMovedDuringManageDepsPrune() throws Exception
852
852
ImmutableList .of (
853
853
ModuleIdentifier .forFile ("strong1" ), ModuleIdentifier .forFile ("strong2" ))));
854
854
855
- assertThat (getWeakModule ().getInputs ().stream ().map (CompilerInput ::getSourceFile ))
855
+ Truth8 . assertThat (getWeakModule ().getInputs ().stream ().map (CompilerInput ::getSourceFile ))
856
856
.containsExactly (weak1 , weak2 );
857
- assertThat (chunkA .getInputs ().stream ().map (CompilerInput ::getSourceFile ))
857
+ Truth8 . assertThat (chunkA .getInputs ().stream ().map (CompilerInput ::getSourceFile ))
858
858
.containsExactly (strong1 , strong2 );
859
859
}
860
860
@@ -889,9 +889,9 @@ public void testTransitiveWeakSources() throws Exception {
889
889
DependencyOptions .pruneForEntryPoints (
890
890
ImmutableList .of (ModuleIdentifier .forFile ("strong1" ))));
891
891
892
- assertThat (getWeakModule ().getInputs ().stream ().map (CompilerInput ::getSourceFile ))
892
+ Truth8 . assertThat (getWeakModule ().getInputs ().stream ().map (CompilerInput ::getSourceFile ))
893
893
.containsExactly (weak1 , weak2 , weak3 , strongFromWeak );
894
- assertThat (chunkA .getInputs ().stream ().map (CompilerInput ::getSourceFile ))
894
+ Truth8 . assertThat (chunkA .getInputs ().stream ().map (CompilerInput ::getSourceFile ))
895
895
.containsExactly (strong1 );
896
896
}
897
897
0 commit comments