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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: device/sensors/data_fetcher_shared_memory_base_unittest.cc

Issue 2845763002: Remove DeviceLightEvent implementation (Closed)
Patch Set: same as previous patch Created 3 years, 8 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
« no previous file with comments | « device/sensors/data_fetcher_shared_memory_base.cc ('k') | device/sensors/data_fetcher_shared_memory_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/sensors/data_fetcher_shared_memory_base_unittest.cc
diff --git a/device/sensors/data_fetcher_shared_memory_base_unittest.cc b/device/sensors/data_fetcher_shared_memory_base_unittest.cc
index 2f01f707e2f0227a8734bd055d8dba1c3082bcfb..5f35feeb55f182eb9af67f35c3e3ae35346d6158 100644
--- a/device/sensors/data_fetcher_shared_memory_base_unittest.cc
+++ b/device/sensors/data_fetcher_shared_memory_base_unittest.cc
@@ -10,7 +10,6 @@
#include "base/single_thread_task_runner.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread.h"
-#include "device/sensors/public/cpp/device_light_hardware_buffer.h"
#include "device/sensors/public/cpp/device_motion_hardware_buffer.h"
#include "device/sensors/public/cpp/device_orientation_hardware_buffer.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -22,17 +21,13 @@ namespace {
class FakeDataFetcher : public DataFetcherSharedMemoryBase {
public:
FakeDataFetcher()
- : start_light_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
- base::WaitableEvent::InitialState::NOT_SIGNALED),
- start_motion_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
+ : start_motion_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
base::WaitableEvent::InitialState::NOT_SIGNALED),
start_orientation_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
base::WaitableEvent::InitialState::NOT_SIGNALED),
start_orientation_absolute_(
base::WaitableEvent::ResetPolicy::AUTOMATIC,
base::WaitableEvent::InitialState::NOT_SIGNALED),
- stop_light_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
- base::WaitableEvent::InitialState::NOT_SIGNALED),
stop_motion_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
base::WaitableEvent::InitialState::NOT_SIGNALED),
stop_orientation_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
@@ -40,8 +35,6 @@ class FakeDataFetcher : public DataFetcherSharedMemoryBase {
stop_orientation_absolute_(
base::WaitableEvent::ResetPolicy::AUTOMATIC,
base::WaitableEvent::InitialState::NOT_SIGNALED),
- updated_light_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
- base::WaitableEvent::InitialState::NOT_SIGNALED),
updated_motion_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
base::WaitableEvent::InitialState::NOT_SIGNALED),
updated_orientation_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
@@ -49,7 +42,6 @@ class FakeDataFetcher : public DataFetcherSharedMemoryBase {
updated_orientation_absolute_(
base::WaitableEvent::ResetPolicy::AUTOMATIC,
base::WaitableEvent::InitialState::NOT_SIGNALED),
- light_buffer_(nullptr),
motion_buffer_(nullptr),
orientation_buffer_(nullptr),
orientation_absolute_buffer_(nullptr) {}
@@ -70,24 +62,12 @@ class FakeDataFetcher : public DataFetcherSharedMemoryBase {
orientation_absolute_buffer_ =
static_cast<DeviceOrientationHardwareBuffer*>(buffer);
break;
- case CONSUMER_TYPE_LIGHT:
- light_buffer_ = static_cast<DeviceLightHardwareBuffer*>(buffer);
- break;
default:
return false;
}
return true;
}
- void UpdateLight() {
- DeviceLightHardwareBuffer* buffer = GetLightBuffer();
- ASSERT_TRUE(buffer);
- buffer->seqlock.WriteBegin();
- buffer->data.value = 100;
- buffer->seqlock.WriteEnd();
- updated_light_.Signal();
- }
-
void UpdateMotion() {
DeviceMotionHardwareBuffer* buffer = GetMotionBuffer();
ASSERT_TRUE(buffer);
@@ -116,8 +96,6 @@ class FakeDataFetcher : public DataFetcherSharedMemoryBase {
updated_orientation_absolute_.Signal();
}
- DeviceLightHardwareBuffer* GetLightBuffer() const { return light_buffer_; }
-
DeviceMotionHardwareBuffer* GetMotionBuffer() const { return motion_buffer_; }
DeviceOrientationHardwareBuffer* GetOrientationBuffer() const {
@@ -139,9 +117,6 @@ class FakeDataFetcher : public DataFetcherSharedMemoryBase {
case CONSUMER_TYPE_ORIENTATION_ABSOLUTE:
start_orientation_absolute_.Wait();
break;
- case CONSUMER_TYPE_LIGHT:
- start_light_.Wait();
- break;
}
}
@@ -156,9 +131,6 @@ class FakeDataFetcher : public DataFetcherSharedMemoryBase {
case CONSUMER_TYPE_ORIENTATION_ABSOLUTE:
stop_orientation_absolute_.Wait();
break;
- case CONSUMER_TYPE_LIGHT:
- stop_light_.Wait();
- break;
}
}
@@ -173,28 +145,21 @@ class FakeDataFetcher : public DataFetcherSharedMemoryBase {
case CONSUMER_TYPE_ORIENTATION_ABSOLUTE:
updated_orientation_absolute_.Wait();
break;
- case CONSUMER_TYPE_LIGHT:
- updated_light_.Wait();
- break;
}
}
protected:
- base::WaitableEvent start_light_;
base::WaitableEvent start_motion_;
base::WaitableEvent start_orientation_;
base::WaitableEvent start_orientation_absolute_;
- base::WaitableEvent stop_light_;
base::WaitableEvent stop_motion_;
base::WaitableEvent stop_orientation_;
base::WaitableEvent stop_orientation_absolute_;
- base::WaitableEvent updated_light_;
base::WaitableEvent updated_motion_;
base::WaitableEvent updated_orientation_;
base::WaitableEvent updated_orientation_absolute_;
private:
- DeviceLightHardwareBuffer* light_buffer_;
DeviceMotionHardwareBuffer* motion_buffer_;
DeviceOrientationHardwareBuffer* orientation_buffer_;
DeviceOrientationHardwareBuffer* orientation_absolute_buffer_;
@@ -225,11 +190,6 @@ class FakeNonPollingDataFetcher : public FakeDataFetcher {
UpdateOrientationAbsolute();
start_orientation_absolute_.Signal();
break;
- case CONSUMER_TYPE_LIGHT:
- if (update_)
- UpdateLight();
- start_light_.Signal();
- break;
default:
return false;
}
@@ -247,9 +207,6 @@ class FakeNonPollingDataFetcher : public FakeDataFetcher {
case CONSUMER_TYPE_ORIENTATION_ABSOLUTE:
stop_orientation_absolute_.Signal();
break;
- case CONSUMER_TYPE_LIGHT:
- stop_light_.Signal();
- break;
default:
return false;
}
@@ -290,9 +247,6 @@ class FakePollingDataFetcher : public FakeDataFetcher {
case CONSUMER_TYPE_ORIENTATION_ABSOLUTE:
start_orientation_absolute_.Signal();
break;
- case CONSUMER_TYPE_LIGHT:
- start_light_.Signal();
- break;
default:
return false;
}
@@ -313,9 +267,6 @@ class FakePollingDataFetcher : public FakeDataFetcher {
case CONSUMER_TYPE_ORIENTATION_ABSOLUTE:
stop_orientation_absolute_.Signal();
break;
- case CONSUMER_TYPE_LIGHT:
- stop_light_.Signal();
- break;
default:
return false;
}
@@ -327,8 +278,7 @@ class FakePollingDataFetcher : public FakeDataFetcher {
GetPollingMessageLoop()->task_runner()->BelongsToCurrentThread());
EXPECT_TRUE(consumer_bitmask & CONSUMER_TYPE_ORIENTATION ||
consumer_bitmask & CONSUMER_TYPE_ORIENTATION_ABSOLUTE ||
- consumer_bitmask & CONSUMER_TYPE_MOTION ||
- consumer_bitmask & CONSUMER_TYPE_LIGHT);
+ consumer_bitmask & CONSUMER_TYPE_MOTION);
if (consumer_bitmask & CONSUMER_TYPE_ORIENTATION)
UpdateOrientation();
@@ -336,8 +286,6 @@ class FakePollingDataFetcher : public FakeDataFetcher {
UpdateOrientationAbsolute();
if (consumer_bitmask & CONSUMER_TYPE_MOTION)
UpdateMotion();
- if (consumer_bitmask & CONSUMER_TYPE_LIGHT)
- UpdateLight();
}
FetcherType GetType() const override { return FETCHER_TYPE_POLLING_CALLBACK; }
@@ -366,9 +314,6 @@ class FakeZeroDelayPollingDataFetcher : public FakeDataFetcher {
case CONSUMER_TYPE_ORIENTATION_ABSOLUTE:
start_orientation_absolute_.Signal();
break;
- case CONSUMER_TYPE_LIGHT:
- start_light_.Signal();
- break;
default:
return false;
}
@@ -389,9 +334,6 @@ class FakeZeroDelayPollingDataFetcher : public FakeDataFetcher {
case CONSUMER_TYPE_ORIENTATION_ABSOLUTE:
stop_orientation_absolute_.Signal();
break;
- case CONSUMER_TYPE_LIGHT:
- stop_light_.Signal();
- break;
default:
return false;
}
@@ -458,20 +400,6 @@ TEST(DataFetcherSharedMemoryBaseTest, DoesStartOrientationAbsolute) {
fake_data_fetcher.WaitForStop(CONSUMER_TYPE_ORIENTATION_ABSOLUTE);
}
-TEST(DataFetcherSharedMemoryBaseTest, DoesStartLight) {
- FakeNonPollingDataFetcher fake_data_fetcher;
- EXPECT_EQ(DataFetcherSharedMemoryBase::FETCHER_TYPE_DEFAULT,
- fake_data_fetcher.GetType());
-
- EXPECT_TRUE(fake_data_fetcher.StartFetchingDeviceData(CONSUMER_TYPE_LIGHT));
- fake_data_fetcher.WaitForStart(CONSUMER_TYPE_LIGHT);
-
- EXPECT_EQ(100, fake_data_fetcher.GetLightBuffer()->data.value);
-
- fake_data_fetcher.StopFetchingDeviceData(CONSUMER_TYPE_LIGHT);
- fake_data_fetcher.WaitForStop(CONSUMER_TYPE_LIGHT);
-}
-
TEST(DataFetcherSharedMemoryBaseTest, DoesPollMotion) {
FakePollingDataFetcher fake_data_fetcher;
EXPECT_EQ(DataFetcherSharedMemoryBase::FETCHER_TYPE_POLLING_CALLBACK,
@@ -521,21 +449,6 @@ TEST(DataFetcherSharedMemoryBaseTest, DoesPollOrientationAbsolute) {
fake_data_fetcher.WaitForStop(CONSUMER_TYPE_ORIENTATION_ABSOLUTE);
}
-TEST(DataFetcherSharedMemoryBaseTest, DoesPollLight) {
- FakePollingDataFetcher fake_data_fetcher;
- EXPECT_EQ(DataFetcherSharedMemoryBase::FETCHER_TYPE_POLLING_CALLBACK,
- fake_data_fetcher.GetType());
-
- EXPECT_TRUE(fake_data_fetcher.StartFetchingDeviceData(CONSUMER_TYPE_LIGHT));
- fake_data_fetcher.WaitForStart(CONSUMER_TYPE_LIGHT);
- fake_data_fetcher.WaitForUpdate(CONSUMER_TYPE_LIGHT);
-
- EXPECT_EQ(100, fake_data_fetcher.GetLightBuffer()->data.value);
-
- fake_data_fetcher.StopFetchingDeviceData(CONSUMER_TYPE_LIGHT);
- fake_data_fetcher.WaitForStop(CONSUMER_TYPE_LIGHT);
-}
-
TEST(DataFetcherSharedMemoryBaseTest, DoesPollMotionAndOrientation) {
FakePollingDataFetcher fake_data_fetcher;
EXPECT_EQ(DataFetcherSharedMemoryBase::FETCHER_TYPE_POLLING_CALLBACK,
« no previous file with comments | « device/sensors/data_fetcher_shared_memory_base.cc ('k') | device/sensors/data_fetcher_shared_memory_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698