2 files changed, 13 insertions, 10 deletions
diff --git a/llvm/unittests/Support/CMakeLists.txt b/llvm/unittests/Support/CMakeLists.txt
index 053ca32fe9d..f02d501538b 100644
--- a/llvm/unittests/Support/CMakeLists.txt
+++ b/llvm/unittests/Support/CMakeLists.txt
@@ -36,7 +36,7 @@ add_llvm_unittest(SupportTests
   ScaledNumberTest.cpp
   SourceMgrTest.cpp
   SpecialCaseListTest.cpp
-  StreamingMemoryObject.cpp
+  StreamingMemoryObjectTest.cpp
   StringPool.cpp
   SwapByteOrderTest.cpp
   TargetParserTest.cpp
diff --git a/llvm/unittests/Support/StreamingMemoryObject.cpp b/llvm/unittests/Support/StreamingMemoryObjectTest.cpp
index e86aa9cae51..261f2144392 100644
--- a/llvm/unittests/Support/StreamingMemoryObject.cpp
+++ b/llvm/unittests/Support/StreamingMemoryObjectTest.cpp
@@ -1,4 +1,4 @@
-//===- llvm/unittest/Support/StreamingMemoryObject.cpp - unit tests -------===//
+//===- unittests/Support/StreamingMemoryObjectTest.cpp --------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -8,6 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/StringRef.h"
 #include "llvm/Support/StreamingMemoryObject.h"
 #include "gtest/gtest.h"
 #include <string.h>
@@ -15,25 +16,27 @@
 using namespace llvm;
 
 namespace {
+
 class NullDataStreamer : public DataStreamer {
-  size_t GetBytes(unsigned char *buf, size_t len) override {
-    memset(buf, 0, len);
-    return len;
+  size_t GetBytes(unsigned char *Buffer, size_t Length) override {
+    memset(Buffer, 0, Length);
+    return Length;
   }
 };
-}
 
-TEST(StreamingMemoryObject, Test) {
+TEST(StreamingMemoryObjectTest, isValidAddress) {
   auto DS = make_unique<NullDataStreamer>();
   StreamingMemoryObject O(std::move(DS));
   EXPECT_TRUE(O.isValidAddress(32 * 1024));
 }
 
-TEST(StreamingMemoryObject, TestSetKnownObjectSize) {
+TEST(StreamingMemoryObjectTest, setKnownObjectSize) {
   auto DS = make_unique<NullDataStreamer>();
   StreamingMemoryObject O(std::move(DS));
   uint8_t Buf[32];
-  EXPECT_EQ((uint64_t) 16, O.readBytes(Buf, 16, 0));
+  EXPECT_EQ(16u, O.readBytes(Buf, 16, 0));
   O.setKnownObjectSize(24);
-  EXPECT_EQ((uint64_t) 8, O.readBytes(Buf, 16, 16));
+  EXPECT_EQ(8u, O.readBytes(Buf, 16, 16));
 }
+
+} // end namespace