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

Commit 13657f33 authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge "Skip instead of Fail any test with a clock issue" into main

parents de3c8a87 f292ff66
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@

package android.animation;

import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;

import android.animation.AnimationHandler.AnimationFrameCallback;
import android.annotation.NonNull;
import android.annotation.Nullable;
@@ -34,6 +32,7 @@ import androidx.test.platform.app.InstrumentationRegistry;

import com.android.internal.util.Preconditions;

import org.junit.AssumptionViolatedException;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
@@ -204,7 +203,8 @@ public final class AnimatorTestRule implements TestRule {
        }
        long outputTime = AnimationUtils.currentAnimationTimeMillis();
        if (outputTime != desiredTime) {
            throw new AssertionError("currentAnimationTimeMillis() is " + outputTime
            // Skip the test (rather than fail it) if there's a clock issue
            throw new AssumptionViolatedException("currentAnimationTimeMillis() is " + outputTime
                    + " after locking to " + desiredTime);
        }
    }