Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(401)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/log/file_net_log_observer_unittest.cc

Issue 2698143004: Add ongoing events to net-export log when logging starts (Closed)
Patch Set: Fixed Eric's comments from ps10 Created 3 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:
View side-by-side diff with in-line comments
Download patch
« components/cronet/android/cronet_url_request_context_adapter.cc ('K') | « net/log/file_net_log_observer.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/log/file_net_log_observer_unittest.cc
diff --git a/net/log/file_net_log_observer_unittest.cc b/net/log/file_net_log_observer_unittest.cc
index a330e481f6d6f178b3088a9a31aaaefd67827c61..66c61c147287655d1b3474fbcc7fbce0f9737b1d 100644
--- a/net/log/file_net_log_observer_unittest.cc
+++ b/net/log/file_net_log_observer_unittest.cc
@@ -162,22 +162,21 @@ class FileNetLogObserverTest : public ::testing::TestWithParam<bool> {
file_thread_->StartWithOptions(
base::Thread::Options(base::MessageLoop::TYPE_DEFAULT, 0));
ASSERT_TRUE(file_thread_->WaitUntilThreadStarted());
- logger_.reset(new FileNetLogObserver(file_thread_->task_runner()));
}
- void StartObserving(std::unique_ptr<base::Value> constants,
- URLRequestContext* url_request_context) {
+ void CreateAndStartObserving(std::unique_ptr<base::Value> constants) {
bool bounded = GetParam();
if (bounded) {
- logger_->StartObservingBounded(&net_log_, NetLogCaptureMode::Default(),
- bounded_log_dir_, std::move(constants),
- url_request_context, kLargeFileSize,
- kTotalNumFiles);
+ logger_ = FileNetLogObserver::CreateBounded(
+ file_thread_->task_runner(), bounded_log_dir_, kLargeFileSize,
+ kTotalNumFiles, std::move(constants));
} else {
- logger_->StartObservingUnbounded(
- &net_log_, NetLogCaptureMode::Default(), unbounded_log_path_,
- std::move(constants), url_request_context);
+ logger_ = FileNetLogObserver::CreateUnbounded(file_thread_->task_runner(),
+ unbounded_log_path_,
+ std::move(constants));
}
+
+ logger_->StartObserving(&net_log_, NetLogCaptureMode::Default());
}
::testing::AssertionResult ReadNetLogFromDisk(
@@ -231,16 +230,15 @@ class FileNetLogObserverBoundedTest : public ::testing::Test {
file_thread_->StartWithOptions(
base::Thread::Options(base::MessageLoop::TYPE_DEFAULT, 0));
ASSERT_TRUE(file_thread_->WaitUntilThreadStarted());
- logger_.reset(new FileNetLogObserver(file_thread_->task_runner()));
}
- void StartObserving(std::unique_ptr<base::Value> constants,
- URLRequestContext* url_request_context,
- int total_file_size,
- int num_files) {
- logger_->StartObservingBounded(
- &net_log_, NetLogCaptureMode::Default(), bounded_log_dir_,
- std::move(constants), url_request_context, total_file_size, num_files);
+ void CreateAndStartObserving(std::unique_ptr<base::Value> constants,
+ int total_file_size,
+ int num_files) {
+ logger_ = FileNetLogObserver::CreateBounded(
+ file_thread_->task_runner(), bounded_log_dir_, total_file_size,
+ num_files, std::move(constants));
+ logger_->StartObserving(&net_log_, NetLogCaptureMode::Default());
}
::testing::AssertionResult ReadNetLogFromDisk(
@@ -278,7 +276,7 @@ INSTANTIATE_TEST_CASE_P(,
::testing::Values(true, false));
TEST_P(FileNetLogObserverTest, ObserverDestroyedWithoutStopObserving) {
- StartObserving(nullptr, nullptr);
+ CreateAndStartObserving(nullptr);
// Send dummy event
AddEntries(logger_.get(), 1, kDummyEventSize);
@@ -292,7 +290,7 @@ TEST_P(FileNetLogObserverTest, ObserverDestroyedWithoutStopObserving) {
TEST_P(FileNetLogObserverTest, GeneratesValidJSONWithNoEvents) {
TestClosure closure;
- StartObserving(nullptr, nullptr);
+ CreateAndStartObserving(nullptr);
logger_->StopObserving(nullptr, closure.closure());
@@ -315,7 +313,7 @@ TEST_P(FileNetLogObserverTest, GeneratesValidJSONWithNoEvents) {
TEST_P(FileNetLogObserverTest, GeneratesValidJSONWithOneEvent) {
TestClosure closure;
- StartObserving(nullptr, nullptr);
+ CreateAndStartObserving(nullptr);
// Send dummy event.
AddEntries(logger_.get(), 1, kDummyEventSize);
@@ -339,7 +337,7 @@ TEST_P(FileNetLogObserverTest, CustomConstants) {
std::unique_ptr<base::Value> constants(
new base::StringValue(kConstantString));
- StartObserving(std::move(constants), nullptr);
+ CreateAndStartObserving(std::move(constants));
logger_->StopObserving(nullptr, closure.closure());
@@ -360,7 +358,7 @@ TEST_P(FileNetLogObserverTest, CustomConstants) {
TEST_P(FileNetLogObserverTest, GeneratesValidJSONWithPolledData) {
TestClosure closure;
- StartObserving(nullptr, nullptr);
+ CreateAndStartObserving(nullptr);
// Create dummy polled data
const char kDummyPolledDataPath[] = "dummy_path";
@@ -390,43 +388,6 @@ TEST_P(FileNetLogObserverTest, GeneratesValidJSONWithPolledData) {
ASSERT_EQ(dummy_string, kDummyPolledDataString);
}
-TEST_P(FileNetLogObserverTest,
- GeneratesValidJSONWithPolledDataWithActiveRequest) {
- TestClosure closure;
-
- // Create context, start a request.
- TestURLRequestContext context(true);
- context.set_net_log(&net_log_);
- context.Init();
- TestDelegate delegate;
- delegate.set_quit_on_complete(false);
-
- // URL doesn't matter. Requests can't fail synchronously.
- std::unique_ptr<URLRequest> request(
- context.CreateRequest(GURL("blah:blah"), IDLE, &delegate));
- request->Start();
-
- StartObserving(nullptr, &context);
-
- logger_->StopObserving(net::GetNetInfo(&context, NET_INFO_ALL_SOURCES),
- closure.closure());
-
- closure.WaitForResult();
-
- std::unique_ptr<base::Value> root;
- base::ListValue* events;
- ASSERT_TRUE(ReadNetLogFromDisk(&root, &events));
-
- // Check that 1 event was written
- ASSERT_EQ(1u, events->GetSize());
-
- // Make sure additional information is present, but don't validate it.
- base::DictionaryValue* dict;
- ASSERT_TRUE(root->GetAsDictionary(&dict));
- base::DictionaryValue* polled_data;
- ASSERT_TRUE(dict->GetDictionary("polledData", &polled_data));
-}
-
// Adds events concurrently from several different threads. The exact order of
// events seen by this test is non-deterministic.
TEST_P(FileNetLogObserverTest, AddEventsFromMultipleThreads) {
@@ -441,7 +402,7 @@ TEST_P(FileNetLogObserverTest, AddEventsFromMultipleThreads) {
threads[i]->WaitUntilThreadStarted();
}
- StartObserving(nullptr, nullptr);
+ CreateAndStartObserving(nullptr);
const size_t kNumEventsAddedPerThread = 200;
@@ -477,7 +438,7 @@ TEST_F(FileNetLogObserverBoundedTest, EqualToOneFile) {
const int kEventSize = 250;
TestClosure closure;
- StartObserving(nullptr, nullptr, kTotalFileSize, kTotalNumFiles);
+ CreateAndStartObserving(nullptr, kTotalFileSize, kTotalNumFiles);
AddEntries(logger_.get(), kNumEvents, kEventSize);
logger_->StopObserving(nullptr, closure.closure());
@@ -524,7 +485,7 @@ TEST_F(FileNetLogObserverBoundedTest, OneEventOverOneFile) {
const int kEventSize = 200;
TestClosure closure;
- StartObserving(nullptr, nullptr, kTotalFileSize, kTotalNumFiles);
+ CreateAndStartObserving(nullptr, kTotalFileSize, kTotalNumFiles);
AddEntries(logger_.get(), kNumEvents, kEventSize);
@@ -565,7 +526,7 @@ TEST_F(FileNetLogObserverBoundedTest, EqualToTwoFiles) {
const int kEventSize = 200;
TestClosure closure;
- StartObserving(nullptr, nullptr, kTotalFileSize, kTotalNumFiles);
+ CreateAndStartObserving(nullptr, kTotalFileSize, kTotalNumFiles);
AddEntries(logger_.get(), kNumEvents, kEventSize);
@@ -617,7 +578,7 @@ TEST_F(FileNetLogObserverBoundedTest, FillAllFilesNoOverwriting) {
const int kNumEvents = kTotalNumFiles * ((kFileSize - 1) / kEventSize + 1);
TestClosure closure;
- StartObserving(nullptr, nullptr, kTotalFileSize, kTotalNumFiles);
+ CreateAndStartObserving(nullptr, kTotalFileSize, kTotalNumFiles);
AddEntries(logger_.get(), kNumEvents, kEventSize);
@@ -663,7 +624,7 @@ TEST_F(FileNetLogObserverBoundedTest, DropOldEventsFromWriteQueue) {
const int kFileSize = kTotalFileSize / kTotalNumFiles;
TestClosure closure;
- StartObserving(nullptr, nullptr, kTotalFileSize, kTotalNumFiles);
+ CreateAndStartObserving(nullptr, kTotalFileSize, kTotalNumFiles);
AddEntries(logger_.get(), kNumEvents, kEventSize);
@@ -714,7 +675,7 @@ TEST_F(FileNetLogObserverBoundedTest, OverwriteAllFiles) {
const int kFileSize = kTotalFileSize / kTotalNumFiles;
TestClosure closure;
- StartObserving(nullptr, nullptr, kTotalFileSize, kTotalNumFiles);
+ CreateAndStartObserving(nullptr, kTotalFileSize, kTotalNumFiles);
AddEntries(logger_.get(), kNumEvents, kEventSize);
@@ -786,7 +747,7 @@ TEST_F(FileNetLogObserverBoundedTest, PartiallyOverwriteFiles) {
const int kFileSize = kTotalFileSize / kTotalNumFiles;
TestClosure closure;
- StartObserving(nullptr, nullptr, kTotalFileSize, kTotalNumFiles);
+ CreateAndStartObserving(nullptr, kTotalFileSize, kTotalNumFiles);
AddEntries(logger_.get(), kNumEvents, kEventSize);
« components/cronet/android/cronet_url_request_context_adapter.cc ('K') | « net/log/file_net_log_observer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698