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

Unified Diff: o3d/gpu_plugin/command_buffer_unittest.cc

Issue 234001: GPUProcessor uses O3D command buffer service to render to a window.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 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 | « o3d/gpu_plugin/command_buffer_mock.h ('k') | o3d/gpu_plugin/gpu_plugin.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: o3d/gpu_plugin/command_buffer_unittest.cc
===================================================================
--- o3d/gpu_plugin/command_buffer_unittest.cc (revision 26879)
+++ o3d/gpu_plugin/command_buffer_unittest.cc (working copy)
@@ -26,10 +26,11 @@
explicit MockSystemNPObject(NPP npp) {
}
- MOCK_METHOD1(CreateSharedMemory, NPObjectPointer<NPObject>(int32));
+ MOCK_METHOD1(CreateSharedMemory, NPObjectPointer<NPObject>(int32 size));
NP_UTILS_BEGIN_DISPATCHER_CHAIN(MockSystemNPObject, DefaultNPObject<NPObject>)
- NP_UTILS_DISPATCHER(CreateSharedMemory, NPObjectPointer<NPObject>(int32))
+ NP_UTILS_DISPATCHER(CreateSharedMemory,
+ NPObjectPointer<NPObject>(int32 size))
NP_UTILS_END_DISPATCHER_CHAIN
private:
@@ -75,14 +76,18 @@
EXPECT_CALL(*expected_shared_memory.Get(), Map())
.WillOnce(Return(true));
- EXPECT_TRUE(command_buffer_->Initialize(1024));
+ EXPECT_TRUE(command_buffer_->Initialize(256));
EXPECT_EQ(expected_shared_memory, command_buffer_->GetRingBuffer());
// Cannot reinitialize.
- EXPECT_FALSE(command_buffer_->Initialize(1024));
+ EXPECT_FALSE(command_buffer_->Initialize(256));
EXPECT_EQ(expected_shared_memory, command_buffer_->GetRingBuffer());
}
+TEST_F(CommandBufferTest, InitializeFailsIfSizeIsTooBig) {
+ EXPECT_FALSE(command_buffer_->Initialize(0x40000000));
+}
+
TEST_F(CommandBufferTest, InitializeFailsIfCannotCreateSharedMemory) {
EXPECT_CALL(mock_browser_, GetWindowNPObject(NULL))
.WillOnce(Return(window_object_.ToReturned()));
@@ -90,7 +95,7 @@
EXPECT_CALL(*system_object_.Get(), CreateSharedMemory(1024))
.WillOnce(Return(NPObjectPointer<NPObject>()));
- EXPECT_FALSE(command_buffer_->Initialize(1024));
+ EXPECT_FALSE(command_buffer_->Initialize(256));
EXPECT_EQ(NPObjectPointer<NPObject>(),
command_buffer_->GetRingBuffer());
}
@@ -108,7 +113,7 @@
EXPECT_CALL(*expected_shared_memory.Get(), Map())
.WillOnce(Return(false));
- EXPECT_FALSE(command_buffer_->Initialize(1024));
+ EXPECT_FALSE(command_buffer_->Initialize(256));
EXPECT_EQ(NPObjectPointer<NPObject>(),
command_buffer_->GetRingBuffer());
}
@@ -136,7 +141,7 @@
EXPECT_CALL(*expected_shared_memory.Get(), Map())
.WillOnce(Return(true));
- EXPECT_TRUE(command_buffer_->Initialize(1024));
+ EXPECT_TRUE(command_buffer_->Initialize(256));
StrictMock<MockCallback>* put_offset_change_callback =
new StrictMock<MockCallback>;
@@ -163,6 +168,14 @@
EXPECT_TRUE(NULL == command_buffer_->GetRegisteredObject(0).Get());
}
+TEST_F(CommandBufferTest, NegativeHandleMapsToNull) {
+ EXPECT_TRUE(NULL == command_buffer_->GetRegisteredObject(-1).Get());
+}
+
+TEST_F(CommandBufferTest, OutOfRangeHandleMapsToNull) {
+ EXPECT_TRUE(NULL == command_buffer_->GetRegisteredObject(1).Get());
+}
+
TEST_F(CommandBufferTest, RegisteringNullObjectReturnsZero) {
EXPECT_EQ(0, command_buffer_->RegisterObject(NPObjectPointer<NPObject>()));
}
@@ -245,16 +258,24 @@
EXPECT_EQ(7, command_buffer_->GetToken());
}
-TEST_F(CommandBufferTest, DefaultErrorIsNoError) {
- EXPECT_EQ(CommandBuffer::ERROR_NO_ERROR, command_buffer_->ResetError());
+TEST_F(CommandBufferTest, DefaultParseErrorIsNoError) {
+ EXPECT_EQ(0, command_buffer_->ResetParseError());
}
-TEST_F(CommandBufferTest, CanSetAndResetError) {
- command_buffer_->SetError(CommandBuffer::ERROR_UNKNOWN_COMMAND);
- EXPECT_EQ(CommandBuffer::ERROR_UNKNOWN_COMMAND,
- command_buffer_->ResetError());
- EXPECT_EQ(CommandBuffer::ERROR_NO_ERROR, command_buffer_->ResetError());
+TEST_F(CommandBufferTest, CanSetAndResetParseError) {
+ command_buffer_->SetParseError(1);
+ EXPECT_EQ(1, command_buffer_->ResetParseError());
+ EXPECT_EQ(0, command_buffer_->ResetParseError());
}
+TEST_F(CommandBufferTest, DefaultErrorStatusIsFalse) {
+ EXPECT_FALSE(command_buffer_->GetErrorStatus());
+}
+
+TEST_F(CommandBufferTest, CanRaiseErrorStatus) {
+ command_buffer_->RaiseErrorStatus();
+ EXPECT_TRUE(command_buffer_->GetErrorStatus());
+}
+
} // namespace gpu_plugin
} // namespace o3d
« no previous file with comments | « o3d/gpu_plugin/command_buffer_mock.h ('k') | o3d/gpu_plugin/gpu_plugin.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698