Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: test/BaseJsTest.cpp

Issue 29372702: Issue #4826 - Use latch to replace thread-sleeping in tests
Patch Set: stray comments Created Jan. 20, 2017, 1:29 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « test/BaseJsTest.h ('k') | test/FileSystemJsObject.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 11 matching lines...) Expand all
22 { 22 {
23 return AdblockPlus::JsEngine::New(appInfo); 23 return AdblockPlus::JsEngine::New(appInfo);
24 } 24 }
25 25
26 void BaseJsTest::SetUp() 26 void BaseJsTest::SetUp()
27 { 27 {
28 jsEngine = CreateJsEngine(); 28 jsEngine = CreateJsEngine();
29 jsEngine->SetLogSystem(std::make_shared<ThrowingLogSystem>()); 29 jsEngine->SetLogSystem(std::make_shared<ThrowingLogSystem>());
30 jsEngine->SetFileSystem(std::make_shared<ThrowingFileSystem>()); 30 jsEngine->SetFileSystem(std::make_shared<ThrowingFileSystem>());
31 jsEngine->SetWebRequest(std::make_shared<ThrowingWebRequest>()); 31 jsEngine->SetWebRequest(std::make_shared<ThrowingWebRequest>());
32 engine = ToInternal(jsEngine);
32 } 33 }
33 34
34 void BaseJsTest::TearDown() 35 void BaseJsTest::TearDown()
35 { 36 {
36 ToInternal(jsEngine)->WaitForQuietScheduler(); 37 engine->WaitForQuietScheduler();
37 EXPECT_EQ(1, jsEngine.use_count()); 38 EXPECT_EQ(1, jsEngine.use_count());
38 jsEngine.reset(); 39 jsEngine.reset();
39 } 40 }
OLDNEW
« no previous file with comments | « test/BaseJsTest.h ('k') | test/FileSystemJsObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld