diff options
Diffstat (limited to 'chrome/common/gpu_messages_unittest.cc')
-rw-r--r-- | chrome/common/gpu_messages_unittest.cc | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/chrome/common/gpu_messages_unittest.cc b/chrome/common/gpu_messages_unittest.cc index 904d9da..4e2da79 100644 --- a/chrome/common/gpu_messages_unittest.cc +++ b/chrome/common/gpu_messages_unittest.cc @@ -12,14 +12,18 @@ // Test GPUInfo serialization TEST(GPUIPCMessageTest, GPUInfo) { GPUInfo input; - // Test variables taken from Lenovo T61 - input.SetProgress(GPUInfo::kPartial); + // Test variables taken from HP Z600 Workstation + input.SetLevel(GPUInfo::kPartial); input.SetInitializationTime(base::TimeDelta::FromMilliseconds(100)); - input.SetGraphicsInfo(0x10de, 0x429, L"6.14.11.7715", - 0xffff0300, - 0xfffe0300, - 0x00010005, - true); + input.SetVideoCardInfo(0x10de, 0x0658); + input.SetDriverInfo("NVIDIA", "195.36.24"); + input.SetShaderVersion(0x0162, 0x0162); + input.SetGLVersion(0x0302); + input.SetGLVersionString("3.2.0 NVIDIA 195.36.24"); + input.SetGLVendor("NVIDIA Corporation"); + input.SetGLRenderer("Quadro FX 380/PCI/SSE2"); + input.SetGLExtensions("GL_ARB_texture_rg GL_ARB_window_pos"); + input.SetCanLoseContext(false); IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL); IPC::WriteParam(&msg, input); @@ -27,18 +31,24 @@ TEST(GPUIPCMessageTest, GPUInfo) { GPUInfo output; void* iter = NULL; EXPECT_TRUE(IPC::ReadParam(&msg, &iter, &output)); - EXPECT_EQ(input.progress(), output.progress()); + EXPECT_EQ(input.level(), output.level()); EXPECT_EQ(input.initialization_time().InMilliseconds(), output.initialization_time().InMilliseconds()); EXPECT_EQ(input.vendor_id(), output.vendor_id()); EXPECT_EQ(input.device_id(), output.device_id()); + EXPECT_EQ(input.driver_vendor(), output.driver_vendor()); EXPECT_EQ(input.driver_version(), output.driver_version()); EXPECT_EQ(input.pixel_shader_version(), output.pixel_shader_version()); EXPECT_EQ(input.vertex_shader_version(), output.vertex_shader_version()); EXPECT_EQ(input.gl_version(), output.gl_version()); + EXPECT_EQ(input.gl_version_string(), output.gl_version_string()); + EXPECT_EQ(input.gl_vendor(), output.gl_vendor()); + EXPECT_EQ(input.gl_renderer(), output.gl_renderer()); + EXPECT_EQ(input.gl_extensions(), output.gl_extensions()); EXPECT_EQ(input.can_lose_context(), output.can_lose_context()); std::string log_message; IPC::LogParam(output, &log_message); - EXPECT_STREQ("<GPUInfo> 1 100 10de 429 6.14.11.7715 1", log_message.c_str()); + EXPECT_STREQ("<GPUInfo> 1 100 10de 658 NVIDIA 195.36.24 162 162 302 0", + log_message.c_str()); } |