Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 118e65b0 authored by James Lemieux's avatar James Lemieux
Browse files

Prepare for upgrade to Truth 0.42 

IterableSubject had its generics removed causing a test to fail to
compile. Strip the generics in advance of the upgrade.

Test: make -j56 RunFrameworksServicesRoboTests
Change-Id: If411475d2bf3115efbbe910012884842765709ec
parent e5ec6b10

services/robotests/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java

+1 −3
Original line number Diff line number Diff line
@@ -2680,9 +2680,7 @@ public class KeyValueBackupTaskTest { 
        return Files.createTempFile(mContext.getCacheDir().toPath(), "backup", ".tmp");

    }



    private static IterableSubject<

                    ? extends IterableSubject<?, Path, Iterable<Path>>, Path, Iterable<Path>>

            assertDirectory(Path directory) throws IOException {

    private static IterableSubject assertDirectory(Path directory) throws IOException {

        return assertThat(oneTimeIterable(Files.newDirectoryStream(directory).iterator()))

                .named("directory " + directory);

    }