Move AutoText and EnumCase into spvtest namespace

Also fix using declaration order.
Also put a few tests into the anonymous namespace.

diff --git a/test/BinaryToText.cpp b/test/BinaryToText.cpp
index b473e94..ad63ea9 100644 (file)
--- a/test/BinaryToText.cpp
+++ b/test/BinaryToText.cpp
@@ -31,6 +31,7 @@
 #include "TestFixture.h"
 
 using ::testing::Eq;
+using spvtest::AutoText;
 
 namespace {
 

diff --git a/test/TextAdvance.cpp b/test/TextAdvance.cpp
index 723eece..4625755 100644 (file)
--- a/test/TextAdvance.cpp
+++ b/test/TextAdvance.cpp
@@ -29,6 +29,7 @@
 namespace {
 
 using libspirv::AssemblyContext;
+using spvtest::AutoText;
 
 TEST(TextAdvance, LeadingNewLines) {
   AutoText input("\n\nWord");

diff --git a/test/TextStartsNewInst.cpp b/test/TextStartsNewInst.cpp
index 3654c79..e7437f2 100644 (file)
--- a/test/TextStartsNewInst.cpp
+++ b/test/TextStartsNewInst.cpp
@@ -28,7 +28,10 @@
 
 #include <string>
 
+namespace {
+
 using libspirv::AssemblyContext;
+using spvtest::AutoText;
 
 TEST(TextStartsWithOp, YesAtStart) {
   EXPECT_TRUE(
@@ -84,3 +87,5 @@ TEST(TextStartsWithOp, NoForNearlyValueGeneration) {
   EXPECT_FALSE(
       AssemblyContext(AutoText("%foo"), nullptr).isStartOfNewInst());
 }
+
+}  // anonymous namespace

diff --git a/test/TextToBinary.Annotation.cpp b/test/TextToBinary.Annotation.cpp
index a429424..e0201ca 100644 (file)
--- a/test/TextToBinary.Annotation.cpp
+++ b/test/TextToBinary.Annotation.cpp
@@ -36,6 +36,7 @@
 
 namespace {
 
+using spvtest::EnumCase;
 using spvtest::MakeInstruction;
 using spvtest::MakeVector;
 using spvtest::TextToBinaryTest;

diff --git a/test/TextToBinary.Constant.cpp b/test/TextToBinary.Constant.cpp
index 37ef635..7233565 100644 (file)
--- a/test/TextToBinary.Constant.cpp
+++ b/test/TextToBinary.Constant.cpp
@@ -34,6 +34,7 @@
 
 namespace {
 
+using spvtest::EnumCase;
 using spvtest::MakeInstruction;
 using ::testing::Eq;
 

diff --git a/test/TextToBinary.ControlFlow.cpp b/test/TextToBinary.ControlFlow.cpp
index 762f029..e47c3b9 100644 (file)
--- a/test/TextToBinary.ControlFlow.cpp
+++ b/test/TextToBinary.ControlFlow.cpp
@@ -34,6 +34,7 @@
 
 namespace {
 
+using spvtest::EnumCase;
 using spvtest::MakeInstruction;
 using spvtest::TextToBinaryTest;
 using ::testing::Eq;

diff --git a/test/TextToBinary.Function.cpp b/test/TextToBinary.Function.cpp
index 3cd7246..845f0fb 100644 (file)
--- a/test/TextToBinary.Function.cpp
+++ b/test/TextToBinary.Function.cpp
@@ -34,8 +34,9 @@
 
 namespace {
 
+using spvtest::EnumCase;
 using spvtest::MakeInstruction;
-using spvtest::TextToBinaryTest;;
+using spvtest::TextToBinaryTest;
 using ::testing::Eq;
 
 // Test OpFunction

diff --git a/test/TextToBinary.Group.cpp b/test/TextToBinary.Group.cpp
index 974df68..da741d0 100644 (file)
--- a/test/TextToBinary.Group.cpp
+++ b/test/TextToBinary.Group.cpp
@@ -34,6 +34,7 @@
 
 namespace {
 
+using spvtest::EnumCase;
 using spvtest::MakeInstruction;
 using ::testing::Eq;
 

diff --git a/test/TextToBinary.Memory.cpp b/test/TextToBinary.Memory.cpp
index 6226198..124cb39 100644 (file)
--- a/test/TextToBinary.Memory.cpp
+++ b/test/TextToBinary.Memory.cpp
@@ -36,6 +36,7 @@
 
 namespace {
 
+using spvtest::EnumCase;
 using spvtest::MakeInstruction;
 using spvtest::TextToBinaryTest;
 using ::testing::Eq;

diff --git a/test/TextToBinary.ModeSetting.cpp b/test/TextToBinary.ModeSetting.cpp
index 86897dc..76b3e46 100644 (file)
--- a/test/TextToBinary.ModeSetting.cpp
+++ b/test/TextToBinary.ModeSetting.cpp
@@ -34,6 +34,7 @@
 
 namespace {
 
+using spvtest::EnumCase;
 using spvtest::MakeInstruction;
 using spvtest::MakeVector;
 using ::testing::Eq;

diff --git a/test/TextToBinary.TypeDeclaration.cpp b/test/TextToBinary.TypeDeclaration.cpp
index b0603ab..f724e05 100644 (file)
--- a/test/TextToBinary.TypeDeclaration.cpp
+++ b/test/TextToBinary.TypeDeclaration.cpp
@@ -34,6 +34,7 @@
 
 namespace {
 
+using spvtest::EnumCase;
 using spvtest::MakeInstruction;
 using ::testing::Eq;
 

diff --git a/test/TextToBinary.cpp b/test/TextToBinary.cpp
index e7f0e0c..0d9ae4c 100644 (file)
--- a/test/TextToBinary.cpp
+++ b/test/TextToBinary.cpp
@@ -33,9 +33,10 @@
 
 namespace {
 
-using spvtest::TextToBinaryTest;
 using libspirv::AssemblyContext;
 using libspirv::AssemblyGrammar;
+using spvtest::TextToBinaryTest;
+using spvtest::AutoText;
 
 TEST(GetWord, Simple) {
   EXPECT_EQ("", AssemblyContext(AutoText(""), nullptr).getWord());

diff --git a/test/TextWordGet.cpp b/test/TextWordGet.cpp
index 85791da..75fec1c 100644 (file)
--- a/test/TextWordGet.cpp
+++ b/test/TextWordGet.cpp
@@ -29,6 +29,7 @@
 namespace {
 
 using libspirv::AssemblyContext;
+using spvtest::AutoText;
 
 #define TAB "\t"
 #define NEWLINE "\n"

diff --git a/test/UnitSPIRV.h b/test/UnitSPIRV.h
index 41df2e4..fbccff4 100644 (file)
--- a/test/UnitSPIRV.h
+++ b/test/UnitSPIRV.h
@@ -68,7 +68,6 @@ static const union {
 #define I32_ENDIAN_HOST (o32_host_order.value)
 
 // A namespace for utilities used in SPIR-V Tools unit tests.
-// TODO(dneto): Move other type declarations into this namespace.
 namespace spvtest {
 
 class WordVector;
@@ -153,8 +152,6 @@ inline std::vector<uint32_t> MakeVector(std::string input) {
   return result;
 }
 
-}  // namespace spvtest
-
 // A type for easily creating spv_text_t values, with an implicit conversion to
 // spv_text.
 struct AutoText {
@@ -183,5 +180,6 @@ class EnumCase {
   std::vector<uint32_t> operands_;
 };
 
+}  // namespace spvtest
 
 #endif