sky/engine/core/animation/AnimationPlayerTest.cpp - Issue 922893002: Merge the Sky Engine changes from the SkyDart branch

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sky/engine/core/animation/AnimationPlayerTest.cpp

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: sky/engine/core/animation/AnimationPlayerTest.cpp

diff --git a/sky/engine/core/animation/AnimationPlayerTest.cpp b/sky/engine/core/animation/AnimationPlayerTest.cpp

index c458135388b50d1c54b84e4e4cf13256f7a8f842..61bee409f9939bc172f5f0b8a0c02bf58307bf1e 100644

--- a/sky/engine/core/animation/AnimationPlayerTest.cpp

+++ b/sky/engine/core/animation/AnimationPlayerTest.cpp

@@ -487,7 +487,7 @@ TEST_F(AnimationAnimationPlayerTest, Finish)

EXPECT_EQ(0, player->currentTimeInternal());

EXPECT_TRUE(player->finished());

- EXPECT_FALSE(exceptionState.hadException());

+ EXPECT_FALSE(exceptionState.had_exception());

}

TEST_F(AnimationAnimationPlayerTest, FinishAfterSourceEnd)

@@ -523,7 +523,7 @@ TEST_F(AnimationAnimationPlayerTest, FinishRaisesException)

player->finish(exceptionState);

EXPECT_EQ(10, player->currentTimeInternal());

- EXPECT_TRUE(exceptionState.hadException());

+ EXPECT_TRUE(exceptionState.had_exception());

EXPECT_EQ(InvalidStateError, exceptionState.code());

}