averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

SourceKit: use std::chrono in unittests

Browse Source 
Rather than using the `usleep` function which is both deprecated and
non-portable (does not exist on Windows), prefer using the C++11 chrono library
for the sleep.  This also allows us to use the UDL to simplify the code rather
than relying on the comments.  NFCI
This commit is contained in:
Saleem Abdulrasool
2019-01-23 09:45:11 -08:00
parent 939d51b8b8
commit 2bc1ec5650
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
unittests/SourceKit/SwiftLang/EditingTest.cpp
View File

@@ -19,8 +19,11 @@
#include "llvm/Support/Path.h" #include "llvm/Support/Path.h"
#include "llvm/Support/TargetSelect.h" #include "llvm/Support/TargetSelect.h"
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include <mutex>
#include <chrono>
#include <condition_variable> #include <condition_variable>
#include <mutex>
#include <thread>
using namespace SourceKit; using namespace SourceKit;
using namespace llvm; using namespace llvm;
@@ -177,7 +180,7 @@ public:
DocUpdState->HasUpdate = false; DocUpdState->HasUpdate = false;
} }
void doubleOpenWithDelay(useconds_t delay, bool close); void doubleOpenWithDelay(std::chrono::microseconds delay, bool close);
private: private:
std::vector<const char *> makeArgs(const char *DocName, std::vector<const char *> makeArgs(const char *DocName,
@@ -229,7 +232,8 @@ TEST_F(EditTest, DiagsAfterEdit) {
EXPECT_EQ(SemaDiagStage, Consumer.DiagStage); EXPECT_EQ(SemaDiagStage, Consumer.DiagStage);
} }
void EditTest::doubleOpenWithDelay(useconds_t delay, bool closeDoc) { void EditTest::doubleOpenWithDelay(std::chrono::microseconds delay,
bool closeDoc) {
const char *DocName = "/test.swift"; const char *DocName = "/test.swift";
const char *Contents = const char *Contents =
"func foo() { _ = unknown_name }\n"; "func foo() { _ = unknown_name }\n";
@@ -239,8 +243,8 @@ void EditTest::doubleOpenWithDelay(useconds_t delay, bool closeDoc) {
open(DocName, Contents, Args, Consumer); open(DocName, Contents, Args, Consumer);
ASSERT_EQ(0u, Consumer.Diags.size()); ASSERT_EQ(0u, Consumer.Diags.size());
// Open again without closing; this reinitializes the semantic info on the doc // Open again without closing; this reinitializes the semantic info on the doc
if (delay) if (delay > std::chrono::microseconds(0))
usleep(delay); std::this_thread::sleep_for(delay);
if (closeDoc) if (closeDoc)
close(DocName); close(DocName);
reset(Consumer); reset(Consumer);
@@ -277,10 +281,10 @@ TEST_F(EditTest, DISABLED_DiagsAfterCloseAndReopen) {
// The middle case in particular verifies the ASTManager is only calling the // The middle case in particular verifies the ASTManager is only calling the
// correct ASTConsumers. // correct ASTConsumers.
doubleOpenWithDelay(0, true); doubleOpenWithDelay(std::chrono::microseconds(0), true);
doubleOpenWithDelay(1000, true); // 1 ms doubleOpenWithDelay(std::chrono::milliseconds(1), true);
doubleOpenWithDelay(10000, true); // 10 ms doubleOpenWithDelay(std::chrono::milliseconds(10), true);
doubleOpenWithDelay(100000, true); // 100 ms doubleOpenWithDelay(std::chrono::milliseconds(100), true);
} }
TEST_F(EditTest, DiagsAfterReopen) { TEST_F(EditTest, DiagsAfterReopen) {
@@ -288,8 +292,8 @@ TEST_F(EditTest, DiagsAfterReopen) {
// close the original document, causing it to reinitialize instead of create // close the original document, causing it to reinitialize instead of create
// a fresh document. // a fresh document.
doubleOpenWithDelay(0, false); doubleOpenWithDelay(std::chrono::microseconds(0), false);
doubleOpenWithDelay(1000, false); // 1 ms doubleOpenWithDelay(std::chrono::milliseconds(1), false);
doubleOpenWithDelay(10000, false); // 10 ms doubleOpenWithDelay(std::chrono::milliseconds(10), false);
doubleOpenWithDelay(100000, false); // 100 ms doubleOpenWithDelay(std::chrono::milliseconds(100), false);
} }