[llvm-commits] [llvm] r73150 - /llvm/trunk/unittests/ADT/TripleTest.cpp

Misha Brukman brukman+llvm at gmail.com
Tue Jun 9 14:48:57 PDT 2009


Author: brukman
Date: Tue Jun  9 16:48:57 2009
New Revision: 73150

URL: http://llvm.org/viewvc/llvm-project?rev=73150&view=rev
Log:
Reversed order of args in EXPECT_EQ() macros to be in the correct order:
EXPECT_EQ(expected, actual) .  This will make error messages understandable as
it uses terms such as "expected" and "actual" based on the order of arguments.

Modified:
    llvm/trunk/unittests/ADT/TripleTest.cpp

Modified: llvm/trunk/unittests/ADT/TripleTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ADT/TripleTest.cpp?rev=73150&r1=73149&r2=73150&view=diff

==============================================================================
--- llvm/trunk/unittests/ADT/TripleTest.cpp (original)
+++ llvm/trunk/unittests/ADT/TripleTest.cpp Tue Jun  9 16:48:57 2009
@@ -18,120 +18,120 @@
   Triple T;
 
   T = Triple("");
-  EXPECT_EQ(T.getArchName(), "");
-  EXPECT_EQ(T.getVendorName(), "");
-  EXPECT_EQ(T.getOSName(), "");
-  EXPECT_EQ(T.getEnvironmentName(), "");
+  EXPECT_EQ("", T.getArchName());
+  EXPECT_EQ("", T.getVendorName());
+  EXPECT_EQ("", T.getOSName());
+  EXPECT_EQ("", T.getEnvironmentName());
 
   T = Triple("-");
-  EXPECT_EQ(T.getArchName(), "");
-  EXPECT_EQ(T.getVendorName(), "");
-  EXPECT_EQ(T.getOSName(), "");
-  EXPECT_EQ(T.getEnvironmentName(), "");
+  EXPECT_EQ("", T.getArchName());
+  EXPECT_EQ("", T.getVendorName());
+  EXPECT_EQ("", T.getOSName());
+  EXPECT_EQ("", T.getEnvironmentName());
 
   T = Triple("--");
-  EXPECT_EQ(T.getArchName(), "");
-  EXPECT_EQ(T.getVendorName(), "");
-  EXPECT_EQ(T.getOSName(), "");
-  EXPECT_EQ(T.getEnvironmentName(), "");
+  EXPECT_EQ("", T.getArchName());
+  EXPECT_EQ("", T.getVendorName());
+  EXPECT_EQ("", T.getOSName());
+  EXPECT_EQ("", T.getEnvironmentName());
 
   T = Triple("---");
-  EXPECT_EQ(T.getArchName(), "");
-  EXPECT_EQ(T.getVendorName(), "");
-  EXPECT_EQ(T.getOSName(), "");
-  EXPECT_EQ(T.getEnvironmentName(), "");
+  EXPECT_EQ("", T.getArchName());
+  EXPECT_EQ("", T.getVendorName());
+  EXPECT_EQ("", T.getOSName());
+  EXPECT_EQ("", T.getEnvironmentName());
 
   T = Triple("----");
-  EXPECT_EQ(T.getArchName(), "");
-  EXPECT_EQ(T.getVendorName(), "");
-  EXPECT_EQ(T.getOSName(), "");
-  EXPECT_EQ(T.getEnvironmentName(), "-");
+  EXPECT_EQ("", T.getArchName());
+  EXPECT_EQ("", T.getVendorName());
+  EXPECT_EQ("", T.getOSName());
+  EXPECT_EQ("-", T.getEnvironmentName());
 
   T = Triple("a");
-  EXPECT_EQ(T.getArchName(), "a");
-  EXPECT_EQ(T.getVendorName(), "");
-  EXPECT_EQ(T.getOSName(), "");
-  EXPECT_EQ(T.getEnvironmentName(), "");
+  EXPECT_EQ("a", T.getArchName());
+  EXPECT_EQ("", T.getVendorName());
+  EXPECT_EQ("", T.getOSName());
+  EXPECT_EQ("", T.getEnvironmentName());
 
   T = Triple("a-b");
-  EXPECT_EQ(T.getArchName(), "a");
-  EXPECT_EQ(T.getVendorName(), "b");
-  EXPECT_EQ(T.getOSName(), "");
-  EXPECT_EQ(T.getEnvironmentName(), "");
+  EXPECT_EQ("a", T.getArchName());
+  EXPECT_EQ("b", T.getVendorName());
+  EXPECT_EQ("", T.getOSName());
+  EXPECT_EQ("", T.getEnvironmentName());
 
   T = Triple("a-b-c");
-  EXPECT_EQ(T.getArchName(), "a");
-  EXPECT_EQ(T.getVendorName(), "b");
-  EXPECT_EQ(T.getOSName(), "c");
-  EXPECT_EQ(T.getEnvironmentName(), "");
+  EXPECT_EQ("a", T.getArchName());
+  EXPECT_EQ("b", T.getVendorName());
+  EXPECT_EQ("c", T.getOSName());
+  EXPECT_EQ("", T.getEnvironmentName());
 
   T = Triple("a-b-c-d");
-  EXPECT_EQ(T.getArchName(), "a");
-  EXPECT_EQ(T.getVendorName(), "b");
-  EXPECT_EQ(T.getOSName(), "c");
-  EXPECT_EQ(T.getEnvironmentName(), "d");
+  EXPECT_EQ("a", T.getArchName());
+  EXPECT_EQ("b", T.getVendorName());
+  EXPECT_EQ("c", T.getOSName());
+  EXPECT_EQ("d", T.getEnvironmentName());
 }
 
 TEST(TripleTest, ParsedIDs) {
   Triple T;
 
   T = Triple("i386-apple-darwin");
-  EXPECT_EQ(T.getArch(), Triple::x86);
-  EXPECT_EQ(T.getVendor(), Triple::Apple);
-  EXPECT_EQ(T.getOS(), Triple::Darwin);
+  EXPECT_EQ(Triple::x86, T.getArch());
+  EXPECT_EQ(Triple::Apple, T.getVendor());
+  EXPECT_EQ(Triple::Darwin, T.getOS());
 
   T = Triple("x86_64-pc-linux-gnu");
-  EXPECT_EQ(T.getArch(), Triple::x86_64);
-  EXPECT_EQ(T.getVendor(), Triple::PC);
-  EXPECT_EQ(T.getOS(), Triple::Linux);
+  EXPECT_EQ(Triple::x86_64, T.getArch());
+  EXPECT_EQ(Triple::PC, T.getVendor());
+  EXPECT_EQ(Triple::Linux, T.getOS());
 
   T = Triple("powerpc-dunno-notsure");
-  EXPECT_EQ(T.getArch(), Triple::ppc);
-  EXPECT_EQ(T.getVendor(), Triple::UnknownVendor);
-  EXPECT_EQ(T.getOS(), Triple::UnknownOS);
+  EXPECT_EQ(Triple::ppc, T.getArch());
+  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
+  EXPECT_EQ(Triple::UnknownOS, T.getOS());
 
   T = Triple("huh");
-  EXPECT_EQ(T.getArch(), Triple::UnknownArch);
+  EXPECT_EQ(Triple::UnknownArch, T.getArch());
 }
 
 TEST(TripleTest, MutateName) {
   Triple T;
-  EXPECT_EQ(T.getArch(), Triple::UnknownArch);
-  EXPECT_EQ(T.getVendor(), Triple::UnknownVendor);
-  EXPECT_EQ(T.getOS(), Triple::UnknownOS);
+  EXPECT_EQ(Triple::UnknownArch, T.getArch());
+  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
+  EXPECT_EQ(Triple::UnknownOS, T.getOS());
 
   T.setArchName("i386");
-  EXPECT_EQ(T.getArch(), Triple::x86);
-  EXPECT_EQ(T.getTriple(), "i386--");
+  EXPECT_EQ(Triple::x86, T.getArch());
+  EXPECT_EQ("i386--", T.getTriple());
 
   T.setVendorName("pc");
-  EXPECT_EQ(T.getArch(), Triple::x86);
-  EXPECT_EQ(T.getVendor(), Triple::PC);
-  EXPECT_EQ(T.getTriple(), "i386-pc-");
+  EXPECT_EQ(Triple::x86, T.getArch());
+  EXPECT_EQ(Triple::PC, T.getVendor());
+  EXPECT_EQ("i386-pc-", T.getTriple());
 
   T.setOSName("linux");
-  EXPECT_EQ(T.getArch(), Triple::x86);
-  EXPECT_EQ(T.getVendor(), Triple::PC);
-  EXPECT_EQ(T.getOS(), Triple::Linux);
-  EXPECT_EQ(T.getTriple(), "i386-pc-linux");
+  EXPECT_EQ(Triple::x86, T.getArch());
+  EXPECT_EQ(Triple::PC, T.getVendor());
+  EXPECT_EQ(Triple::Linux, T.getOS());
+  EXPECT_EQ("i386-pc-linux", T.getTriple());
 
   T.setEnvironmentName("gnu");
-  EXPECT_EQ(T.getArch(), Triple::x86);
-  EXPECT_EQ(T.getVendor(), Triple::PC);
-  EXPECT_EQ(T.getOS(), Triple::Linux);
-  EXPECT_EQ(T.getTriple(), "i386-pc-linux-gnu");
+  EXPECT_EQ(Triple::x86, T.getArch());
+  EXPECT_EQ(Triple::PC, T.getVendor());
+  EXPECT_EQ(Triple::Linux, T.getOS());
+  EXPECT_EQ("i386-pc-linux-gnu", T.getTriple());
 
   T.setOSName("freebsd");
-  EXPECT_EQ(T.getArch(), Triple::x86);
-  EXPECT_EQ(T.getVendor(), Triple::PC);
-  EXPECT_EQ(T.getOS(), Triple::FreeBSD);
-  EXPECT_EQ(T.getTriple(), "i386-pc-freebsd-gnu");
+  EXPECT_EQ(Triple::x86, T.getArch());
+  EXPECT_EQ(Triple::PC, T.getVendor());
+  EXPECT_EQ(Triple::FreeBSD, T.getOS());
+  EXPECT_EQ("i386-pc-freebsd-gnu", T.getTriple());
 
   T.setOSAndEnvironmentName("darwin");
-  EXPECT_EQ(T.getArch(), Triple::x86);
-  EXPECT_EQ(T.getVendor(), Triple::PC);
-  EXPECT_EQ(T.getOS(), Triple::Darwin);
-  EXPECT_EQ(T.getTriple(), "i386-pc-darwin");
+  EXPECT_EQ(Triple::x86, T.getArch());
+  EXPECT_EQ(Triple::PC, T.getVendor());
+  EXPECT_EQ(Triple::Darwin, T.getOS());
+  EXPECT_EQ("i386-pc-darwin", T.getTriple());
 }
 
 }





More information about the llvm-commits mailing list