Add test for bug 620428 (setinterval cancellation)

fpdfsdk/fpdfformfill_embeddertest.cpp

Index: fpdfsdk/fpdfformfill_embeddertest.cpp
diff --git a/fpdfsdk/fpdfformfill_embeddertest.cpp b/fpdfsdk/fpdfformfill_embeddertest.cpp
index c73dc008f7ba753d51d2b16375522f232c8dcd53..a827c11d57bb75487bd897b0e06fce55e48c7578 100644
--- a/fpdfsdk/fpdfformfill_embeddertest.cpp
+++ b/fpdfsdk/fpdfformfill_embeddertest.cpp
@@ -66,22 +66,65 @@ TEST_F(FPDFFormFillEmbeddertest, BUG_514690) {
 
 #ifdef PDF_ENABLE_V8
 TEST_F(FPDFFormFillEmbeddertest, BUG_551248) {
+  // Test that timers fire once and intervals fire repeatedly.
   EmbedderTestTimerHandlingDelegate delegate;
   SetDelegate(&delegate);
 
   EXPECT_TRUE(OpenDocument("bug_551248.pdf"));
   FPDF_PAGE page = LoadPage(0);
-  EXPECT_NE(nullptr, page);
+  EXPECT_TRUE(page);
   DoOpenActions();
-  delegate.AdvanceTime(5000);
-  UnloadPage(page);
 
   const auto& alerts = delegate.GetAlerts();
-  ASSERT_EQ(1U, alerts.size());
+  EXPECT_EQ(0U, alerts.size());
+
+  delegate.AdvanceTime(1000);
+  EXPECT_EQ(0U, alerts.size());  // nothing fired.
+  delegate.AdvanceTime(1000);
+  EXPECT_EQ(1U, alerts.size());  // interval fired.
+  delegate.AdvanceTime(1000);
+  EXPECT_EQ(2U, alerts.size());  // timer fired.
+  delegate.AdvanceTime(1000);
+  EXPECT_EQ(3U, alerts.size());  // interval fired again.
+  delegate.AdvanceTime(1000);
+  UnloadPage(page);
+
+  ASSERT_EQ(3U, alerts.size());  // nothing else fired.
 
-  EXPECT_STREQ(L"hello world", alerts[0].message.c_str());
+  EXPECT_STREQ(L"interval fired", alerts[0].message.c_str());
   EXPECT_STREQ(L"Alert", alerts[0].title.c_str());
   EXPECT_EQ(0, alerts[0].type);
   EXPECT_EQ(0, alerts[0].icon);
+
+  EXPECT_STREQ(L"timer fired", alerts[1].message.c_str());
+  EXPECT_STREQ(L"Alert", alerts[1].title.c_str());
+  EXPECT_EQ(0, alerts[1].type);
+  EXPECT_EQ(0, alerts[1].icon);
+
+  EXPECT_STREQ(L"interval fired", alerts[2].message.c_str());
+  EXPECT_STREQ(L"Alert", alerts[2].title.c_str());
+  EXPECT_EQ(0, alerts[2].type);
+  EXPECT_EQ(0, alerts[2].icon);
 }
+
+TEST_F(FPDFFormFillEmbeddertest, BUG_620428) {
+  // Test that timers and intervals are cancelable.
+  EmbedderTestTimerHandlingDelegate delegate;
+  SetDelegate(&delegate);
+
+  EXPECT_TRUE(OpenDocument("bug_620428.pdf"));
+  FPDF_PAGE page = LoadPage(0);
+  EXPECT_NE(nullptr, page);

[Lei Zhang, 2016/08/03 20:36:52]

Do EXPECT_TRUE() like line 75?

[Tom Sepez, 2016/08/03 20:43:31]

Done throughout.

+  DoOpenActions();
+  delegate.AdvanceTime(1000);

[Lei Zhang, 2016/08/03 20:36:52]

Does this behaves different vs delegate.AdvanceTime(5000) ? Maybe add a comment?

[Tom Sepez, 2016/08/03 20:43:31]

Kinda sorta.  The clumsy test harness doesn't schedule timers based on absolute
time, but rather the delta from when they last fired. So a given timer will only
fire once per AdvanceTime(), thus avoiding an endless loop if something gets
botched.  Close enough.

A single call is fine here.

+  delegate.AdvanceTime(1000);
+  delegate.AdvanceTime(1000);
+  delegate.AdvanceTime(1000);
+  delegate.AdvanceTime(1000);
+  UnloadPage(page);
+
+  const auto& alerts = delegate.GetAlerts();
+  EXPECT_EQ(0U, alerts.size());
+}
+
 #endif  // PDF_ENABLE_V8