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

Commit 61e28524 authored by vadimt's avatar vadimt
Browse files

Moving logging Launcher and platform versions before matching 

I suspect that sometimes APIs return versions that are different from
ones in the bugreport. We want to see them before possible non-match
failures.

Bug: 145935261
Change-Id: Ia1a9208de111368245eac9147ae4a189db823105
parent 0aa4bfeb

tests/src/com/android/launcher3/util/rule/TestStabilityRule.java

+4 −5
Original line number Diff line number Diff line
@@ -114,21 +114,20 @@ public class TestStabilityRule implements TestRule { 
            throw new RuntimeException(e);

        }



        final Matcher launcherBuildMatcher = LAUNCHER_BUILD.matcher(launcherVersion);

        final String platformVersion = Build.VERSION.INCREMENTAL;



        Log.d(TAG, "Launcher: " + launcherVersion + ", platform: " + platformVersion);



        final Matcher launcherBuildMatcher = LAUNCHER_BUILD.matcher(launcherVersion);

        if (!launcherBuildMatcher.find()) {

            throw new AssertionError("Launcher build match not found");

        }



        final String platformVersion = Build.VERSION.INCREMENTAL;

        final Matcher platformBuildMatcher = PLATFORM_BUILD.matcher(platformVersion);



        if (!platformBuildMatcher.find()) {

            throw new AssertionError("Platform build match not found");

        }



        Log.d(TAG, "Launcher: " + launcherVersion + ", platform: " + platformVersion);



        final int runFlavor;



        if (launcherBuildMatcher.group("local") != null && (