[clang-tools-extra] r178900 - Updating cpp11-migrate unit tests

Edwin Vane edwin.vane at intel.com
Fri Apr 5 12:17:36 PDT 2013


Author: revane
Date: Fri Apr  5 14:17:36 2013
New Revision: 178900

URL: http://llvm.org/viewvc/llvm-project?rev=178900&view=rev
Log:
Updating cpp11-migrate unit tests

With the lib-ification of cpp11-migrate, real unit tests can be written.
Replacing dummy tests with some simple tests for the Transform public
interface.


Added:
    clang-tools-extra/trunk/unittests/cpp11-migrate/TransformTest.cpp
Removed:
    clang-tools-extra/trunk/unittests/cpp11-migrate/dummy.cpp
Modified:
    clang-tools-extra/trunk/Makefile
    clang-tools-extra/trunk/unittests/cpp11-migrate/CMakeLists.txt
    clang-tools-extra/trunk/unittests/cpp11-migrate/Makefile

Modified: clang-tools-extra/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/Makefile?rev=178900&r1=178899&r2=178900&view=diff
==============================================================================
--- clang-tools-extra/trunk/Makefile (original)
+++ clang-tools-extra/trunk/Makefile Fri Apr  5 14:17:36 2013
@@ -11,7 +11,8 @@ CLANG_LEVEL := ../..
 
 include $(CLANG_LEVEL)/../../Makefile.config
 
-PARALLEL_DIRS := remove-cstr-calls tool-template cpp11-migrate modularize unittests
+PARALLEL_DIRS := remove-cstr-calls tool-template modularize
+DIRS := cpp11-migrate unittests
 
 include $(CLANG_LEVEL)/Makefile
 

Modified: clang-tools-extra/trunk/unittests/cpp11-migrate/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/unittests/cpp11-migrate/CMakeLists.txt?rev=178900&r1=178899&r2=178900&view=diff
==============================================================================
--- clang-tools-extra/trunk/unittests/cpp11-migrate/CMakeLists.txt (original)
+++ clang-tools-extra/trunk/unittests/cpp11-migrate/CMakeLists.txt Fri Apr  5 14:17:36 2013
@@ -2,10 +2,15 @@ set(LLVM_LINK_COMPONENTS
   support
   )
 
+get_filename_component(CPP11_MIGRATE_SOURCE_DIR
+  ${CMAKE_CURRENT_SOURCE_DIR}/../../cpp11-migrate REALPATH)
+include_directories(${CPP11_MIGRATE_SOURCE_DIR})
+
 add_extra_unittest(Cpp11MigrateTests
   dummy.cpp)
 
 target_link_libraries(Cpp11MigrateTests
+  migrateCore
   clangTooling
   clangBasic
   clangASTMatchers

Modified: clang-tools-extra/trunk/unittests/cpp11-migrate/Makefile
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/unittests/cpp11-migrate/Makefile?rev=178900&r1=178899&r2=178900&view=diff
==============================================================================
--- clang-tools-extra/trunk/unittests/cpp11-migrate/Makefile (original)
+++ clang-tools-extra/trunk/unittests/cpp11-migrate/Makefile Fri Apr  5 14:17:36 2013
@@ -15,8 +15,10 @@ LINK_COMPONENTS := asmparser bitreader s
 USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
 		   clangRewriteFrontend.a clangRewriteCore.a clangParse.a \
 		   clangSema.a clangAnalysis.a \
-		   clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
+		   clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a \
+			 migrateCore.a
 
 include $(CLANG_LEVEL)/Makefile
 MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../cpp11-migrate
 include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest

Added: clang-tools-extra/trunk/unittests/cpp11-migrate/TransformTest.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/unittests/cpp11-migrate/TransformTest.cpp?rev=178900&view=auto
==============================================================================
--- clang-tools-extra/trunk/unittests/cpp11-migrate/TransformTest.cpp (added)
+++ clang-tools-extra/trunk/unittests/cpp11-migrate/TransformTest.cpp Fri Apr  5 14:17:36 2013
@@ -0,0 +1,50 @@
+#include "gtest/gtest.h"
+#include "Core/Transform.h"
+
+class DummyTransform : public Transform {
+public:
+  DummyTransform(llvm::StringRef Name) : Transform(Name) {}
+
+  virtual int apply(const FileContentsByPath &,
+                    RiskLevel ,
+                    const clang::tooling::CompilationDatabase &,
+                    const std::vector<std::string> &,
+                    FileContentsByPath &) { return 0; }
+
+  void setAcceptedChanges(unsigned Changes) {
+    Transform::setAcceptedChanges(Changes);
+  }
+  void setRejectedChanges(unsigned Changes) {
+    Transform::setRejectedChanges(Changes);
+  }
+  void setDeferredChanges(unsigned Changes) {
+    Transform::setDeferredChanges(Changes);
+  }
+};
+
+TEST(Transform, Interface) {
+  DummyTransform T("my_transform");
+  ASSERT_EQ("my_transform", T.getName());
+  ASSERT_EQ(0u, T.getAcceptedChanges());
+  ASSERT_EQ(0u, T.getRejectedChanges());
+  ASSERT_EQ(0u, T.getDeferredChanges());
+  ASSERT_FALSE(T.getChangesMade());
+  ASSERT_FALSE(T.getChangesNotMade());
+
+  T.setAcceptedChanges(1);
+  ASSERT_TRUE(T.getChangesMade());
+
+  T.setDeferredChanges(1);
+  ASSERT_TRUE(T.getChangesNotMade());
+
+  T.setRejectedChanges(1);
+  ASSERT_TRUE(T.getChangesNotMade());
+
+  T.Reset();
+  ASSERT_EQ(0u, T.getAcceptedChanges());
+  ASSERT_EQ(0u, T.getRejectedChanges());
+  ASSERT_EQ(0u, T.getDeferredChanges());
+
+  T.setRejectedChanges(1);
+  ASSERT_TRUE(T.getChangesNotMade());
+}

Removed: clang-tools-extra/trunk/unittests/cpp11-migrate/dummy.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/unittests/cpp11-migrate/dummy.cpp?rev=178899&view=auto
==============================================================================
--- clang-tools-extra/trunk/unittests/cpp11-migrate/dummy.cpp (original)
+++ clang-tools-extra/trunk/unittests/cpp11-migrate/dummy.cpp (removed)
@@ -1,6 +0,0 @@
-#include "gtest/gtest.h"
-
-// FIXME: Replace this test with something more meaningful.
-TEST(SimpleTest, Test) {
-  ASSERT_TRUE(true);
-}





More information about the cfe-commits mailing list