Fix YAML tests.

llvm-svn: 190487

diff --git a/clang-tools-extra/test/clang-apply-replacements/Inputs/basic/file1.yaml b/clang-tools-extra/test/clang-apply-replacements/Inputs/basic/file1.yaml
index 50b923e..3b67305 100644 (file)
--- a/clang-tools-extra/test/clang-apply-replacements/Inputs/basic/file1.yaml
+++ b/clang-tools-extra/test/clang-apply-replacements/Inputs/basic/file1.yaml
@@ -1,16 +1,16 @@
 ---
-MainSourceFile:     "source1.cpp"
+MainSourceFile:     source1.cpp
 Replacements:
-  - FilePath:        "$(path)/basic.h"
+  - FilePath:        '$(path)/basic.h'
     Offset:          242
     Length:          26
-    ReplacementText: "auto & elem : ints"
-  - FilePath:        "$(path)/basic.h"
+    ReplacementText: 'auto & elem : ints'
+  - FilePath:        '$(path)/basic.h'
     Offset:          276
     Length:          22
-    ReplacementText: ""
-  - FilePath:        "$(path)/basic.h"
+    ReplacementText: ''
+  - FilePath:        '$(path)/basic.h'
     Offset:          298
     Length:          1
-    ReplacementText: "elem"
+    ReplacementText: elem
 ...

diff --git a/clang-tools-extra/test/clang-apply-replacements/Inputs/conflict/file2.yaml b/clang-tools-extra/test/clang-apply-replacements/Inputs/conflict/file2.yaml
index fb48e3f..171a4e0 100644 (file)
--- a/clang-tools-extra/test/clang-apply-replacements/Inputs/conflict/file2.yaml
+++ b/clang-tools-extra/test/clang-apply-replacements/Inputs/conflict/file2.yaml
@@ -1,16 +1,16 @@
 ---
-MainSourceFile: "source2.cpp"
+MainSourceFile: source2.cpp
 Replacements:
-  - FilePath:        "$(path)/common.h"
+  - FilePath:        '$(path)/common.h'
     Offset:          106
     Length:          26
-    ReplacementText: "int & elem : ints"
-  - FilePath:        "$(path)/common.h"
+    ReplacementText: 'int & elem : ints'
+  - FilePath:        '$(path)/common.h'
     Offset:          140
     Length:          7
-    ReplacementText: "elem"
-  - FilePath:        "$(path)/common.h"
+    ReplacementText: elem
+  - FilePath:        '$(path)/common.h'
     Offset:          169
     Length:          1
-    ReplacementText: "nullptr"
+    ReplacementText: nullptr
 ...

diff --git a/clang-tools-extra/test/clang-modernize/HeaderReplacements/common_expected.yaml b/clang-tools-extra/test/clang-modernize/HeaderReplacements/common_expected.yaml
index 67eb1fb..08ff5ae 100644 (file)
--- a/clang-tools-extra/test/clang-modernize/HeaderReplacements/common_expected.yaml
+++ b/clang-tools-extra/test/clang-modernize/HeaderReplacements/common_expected.yaml
@@ -1,20 +1,20 @@
 ---
-MainSourceFile:  "$(path)/common.cpp"
+MainSourceFile:  '$(path)/common.cpp'
 Replacements:    
-  - FilePath:        "$(path)/common.h"
+  - FilePath:        '$(path)/common.h'
     Offset:          506
     Length:          2
-    ReplacementText: "elem"
-  - FilePath:        "$(path)/common.h"
+    ReplacementText: elem
+  - FilePath:        '$(path)/common.h'
     Offset:          432
     Length:          61
-    ReplacementText: "(auto & elem : C)"
-  - FilePath:        "$(path)/common.cpp"
+    ReplacementText: '(auto & elem : C)'
+  - FilePath:        '$(path)/common.cpp'
     Offset:          289
     Length:          2
-    ReplacementText: "elem"
-  - FilePath:        "$(path)/common.cpp"
+    ReplacementText: elem
+  - FilePath:        '$(path)/common.cpp'
     Offset:          206
     Length:          63
-    ReplacementText: "(auto & elem : C1)"
+    ReplacementText: '(auto & elem : C1)'
 ...

diff --git a/clang-tools-extra/test/clang-modernize/HeaderReplacements/main_expected.yaml b/clang-tools-extra/test/clang-modernize/HeaderReplacements/main_expected.yaml
index 8702bc1..48c919a 100644 (file)
--- a/clang-tools-extra/test/clang-modernize/HeaderReplacements/main_expected.yaml
+++ b/clang-tools-extra/test/clang-modernize/HeaderReplacements/main_expected.yaml
@@ -1,12 +1,12 @@
 ---
-MainSourceFile:      "$(path)/main.cpp"
+MainSourceFile:      '$(path)/main.cpp'
 Replacements:
-  - FilePath:        "$(path)/common.h"
+  - FilePath:        '$(path)/common.h'
     Offset:          506
     Length:          2
-    ReplacementText: "elem"
-  - FilePath:        "$(path)/common.h"
+    ReplacementText: elem
+  - FilePath:        '$(path)/common.h'
     Offset:          432
     Length:          61
-    ReplacementText: "(auto & elem : C)"
+    ReplacementText: '(auto & elem : C)'
 ...