Change command buffer client code to use structures....

command_buffer/client/cross/fenced_allocator_test.cc

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 32 matching lines @@
 using testing::Return;
 using testing::Mock;
 using testing::Truly;
 using testing::Sequence;
 using testing::DoAll;
 using testing::Invoke;
 using testing::_;
 
 // Test fixture for FencedAllocator test - Creates a FencedAllocator, using a
 // CommandBufferHelper with a mock AsyncAPIInterface for its interface (calling
-// it directly, not through the RPC mechanism), making sure NOOPs are ignored
-// and SET_TOKEN are properly forwarded to the engine.
+// it directly, not through the RPC mechanism), making sure Noops are ignored
+// and SetToken are properly forwarded to the engine.
 class FencedAllocatorTest : public testing::Test {
  public:
   static const unsigned int kBufferSize = 1024;
 
  protected:
   virtual void SetUp() {
     api_mock_.reset(new AsyncAPIMock);
     // ignore noops in the mock - we don't want to inspect the internals of the
     // helper.
-    EXPECT_CALL(*api_mock_, DoCommand(NOOP, 0, _))
-        .WillRepeatedly(Return(BufferSyncInterface::PARSE_NO_ERROR));
+    EXPECT_CALL(*api_mock_, DoCommand(kNoop, 0, _))
+        .WillRepeatedly(Return(BufferSyncInterface::kParseNoError));
     // Forward the SetToken calls to the engine
-    EXPECT_CALL(*api_mock(), DoCommand(SET_TOKEN, 1, _))
+    EXPECT_CALL(*api_mock(), DoCommand(kSetToken, 1, _))
         .WillRepeatedly(DoAll(Invoke(api_mock(), &AsyncAPIMock::SetToken),
-                              Return(BufferSyncInterface::PARSE_NO_ERROR)));
+                              Return(BufferSyncInterface::kParseNoError)));
     engine_.reset(new CommandBufferEngine(api_mock_.get()));
     api_mock_->set_engine(engine_.get());
 
     nacl::SocketAddress client_address = { "test-socket" };
     client_socket_ = nacl::BoundSocket(&client_address);
     engine_->InitConnection();
     helper_.reset(new CommandBufferHelper(engine_.get()));
     helper_->Init(100);
 
     allocator_.reset(new FencedAllocator(kBufferSize, helper_.get()));
@@ skipping 225 matching lines @@
 
   // Everything now has been freed...
   EXPECT_EQ(kBufferSize, allocator()->GetLargestFreeOrPendingSize());
   // ... for real.
   EXPECT_EQ(kBufferSize, allocator()->GetLargestFreeSize());
 }
 
 // Test fixture for FencedAllocatorWrapper test - Creates a
 // FencedAllocatorWrapper, using a CommandBufferHelper with a mock
 // AsyncAPIInterface for its interface (calling it directly, not through the
-// RPC mechanism), making sure NOOPs are ignored and SET_TOKEN are properly
+// RPC mechanism), making sure Noops are ignored and SetToken are properly
 // forwarded to the engine.
 class FencedAllocatorWrapperTest : public testing::Test {
  public:
   static const unsigned int kBufferSize = 1024;
 
  protected:
   virtual void SetUp() {
     api_mock_.reset(new AsyncAPIMock);
     // ignore noops in the mock - we don't want to inspect the internals of the
     // helper.
-    EXPECT_CALL(*api_mock_, DoCommand(NOOP, 0, _))
-        .WillRepeatedly(Return(BufferSyncInterface::PARSE_NO_ERROR));
+    EXPECT_CALL(*api_mock_, DoCommand(kNoop, 0, _))
+        .WillRepeatedly(Return(BufferSyncInterface::kParseNoError));
     // Forward the SetToken calls to the engine
-    EXPECT_CALL(*api_mock(), DoCommand(SET_TOKEN, 1, _))
+    EXPECT_CALL(*api_mock(), DoCommand(kSetToken, 1, _))
         .WillRepeatedly(DoAll(Invoke(api_mock(), &AsyncAPIMock::SetToken),
-                              Return(BufferSyncInterface::PARSE_NO_ERROR)));
+                              Return(BufferSyncInterface::kParseNoError)));
     engine_.reset(new CommandBufferEngine(api_mock_.get()));
     api_mock_->set_engine(engine_.get());
 
     nacl::SocketAddress client_address = { "test-socket" };
     client_socket_ = nacl::BoundSocket(&client_address);
     engine_->InitConnection();
     helper_.reset(new CommandBufferHelper(engine_.get()));
     helper_->Init(100);
 
     // Though allocating this buffer isn't strictly necessary, it makes
@@ skipping 147 matching lines @@
   // Free up everything.
   for (unsigned int i = 0; i < kAllocCount; ++i) {
     allocator()->Free(pointers[i]);
     EXPECT_TRUE(allocator()->CheckConsistency());
   }
 }
 
 
 }  // namespace command_buffer
 }  // namespace o3d