@@ -86,8 +86,8 @@ TEST (FileSearchPathTests, StringAssignment)
8686 fsp = prefix + " /a/b;" + prefix + " /c/d" ;
8787
8888 EXPECT_EQ (fsp.getNumPaths (), 2 );
89- EXPECT_EQ (fsp[0 ].getFullPathName (), prefix + " /a/b" );
90- EXPECT_EQ (fsp[1 ].getFullPathName (), prefix + " /c/d" );
89+ EXPECT_EQ (fsp[0 ].getFullPathName (), File ( prefix + " /a/b" ). getFullPathName () );
90+ EXPECT_EQ (fsp[1 ].getFullPathName (), File ( prefix + " /c/d" ). getFullPathName () );
9191}
9292
9393TEST (FileSearchPathTests, GetNumPaths)
@@ -114,8 +114,8 @@ TEST (FileSearchPathTests, IndexOperator)
114114#endif
115115
116116 FileSearchPath fsp { prefix + " /a/b;" + prefix + " /c/d" };
117- EXPECT_EQ (fsp[0 ].getFullPathName (), prefix + " /a/b" );
118- EXPECT_EQ (fsp[1 ].getFullPathName (), prefix + " /c/d" );
117+ EXPECT_EQ (fsp[0 ].getFullPathName (), File ( prefix + " /a/b" ). getFullPathName () );
118+ EXPECT_EQ (fsp[1 ].getFullPathName (), File ( prefix + " /c/d" ). getFullPathName () );
119119}
120120
121121TEST (FileSearchPathTests, GetRawString)
@@ -144,8 +144,8 @@ TEST (FileSearchPathTests, Add)
144144 fsp.add (File (prefix + " /c/d" ));
145145
146146 EXPECT_EQ (fsp.getNumPaths (), 2 );
147- EXPECT_EQ (fsp[0 ].getFullPathName (), prefix + " /a/b" );
148- EXPECT_EQ (fsp[1 ].getFullPathName (), prefix + " /c/d" );
147+ EXPECT_EQ (fsp[0 ].getFullPathName (), File ( prefix + " /a/b" ). getFullPathName () );
148+ EXPECT_EQ (fsp[1 ].getFullPathName (), File ( prefix + " /c/d" ). getFullPathName () );
149149}
150150
151151TEST (FileSearchPathTests, AddWithIndex)
@@ -160,9 +160,9 @@ TEST (FileSearchPathTests, AddWithIndex)
160160 fsp.add (File (prefix + " /e/f" ), 1 );
161161
162162 EXPECT_EQ (fsp.getNumPaths (), 3 );
163- EXPECT_EQ (fsp[0 ].getFullPathName (), prefix + " /a/b" );
164- EXPECT_EQ (fsp[1 ].getFullPathName (), prefix + " /e/f" );
165- EXPECT_EQ (fsp[2 ].getFullPathName (), prefix + " /c/d" );
163+ EXPECT_EQ (fsp[0 ].getFullPathName (), File ( prefix + " /a/b" ). getFullPathName () );
164+ EXPECT_EQ (fsp[1 ].getFullPathName (), File ( prefix + " /e/f" ). getFullPathName () );
165+ EXPECT_EQ (fsp[2 ].getFullPathName (), File ( prefix + " /c/d" ). getFullPathName () );
166166}
167167
168168TEST (FileSearchPathTests, AddIfNotAlreadyThere)
@@ -194,8 +194,8 @@ TEST (FileSearchPathTests, Remove)
194194 fsp.remove (1 );
195195
196196 EXPECT_EQ (fsp.getNumPaths (), 2 );
197- EXPECT_EQ (fsp[0 ].getFullPathName (), prefix + " /a/b" );
198- EXPECT_EQ (fsp[1 ].getFullPathName (), prefix + " /e/f" );
197+ EXPECT_EQ (fsp[0 ].getFullPathName (), File ( prefix + " /a/b" ). getFullPathName () );
198+ EXPECT_EQ (fsp[1 ].getFullPathName (), File ( prefix + " /e/f" ). getFullPathName () );
199199}
200200
201201TEST (FileSearchPathTests, AddPath)
@@ -212,8 +212,8 @@ TEST (FileSearchPathTests, AddPath)
212212 fsp1.addPath (fsp2);
213213
214214 EXPECT_EQ (fsp1.getNumPaths (), 4 );
215- EXPECT_EQ (fsp1[2 ].getFullPathName (), prefix + " /e/f" );
216- EXPECT_EQ (fsp1[3 ].getFullPathName (), prefix + " /g/h" );
215+ EXPECT_EQ (fsp1[2 ].getFullPathName (), File ( prefix + " /e/f" ). getFullPathName () );
216+ EXPECT_EQ (fsp1[3 ].getFullPathName (), File ( prefix + " /g/h" ). getFullPathName () );
217217}
218218
219219TEST (FileSearchPathTests, AddPathSkipsDuplicates)
@@ -230,9 +230,9 @@ TEST (FileSearchPathTests, AddPathSkipsDuplicates)
230230 fsp1.addPath (fsp2);
231231
232232 EXPECT_EQ (fsp1.getNumPaths (), 3 );
233- EXPECT_EQ (fsp1[0 ].getFullPathName (), prefix + " /a/b" );
234- EXPECT_EQ (fsp1[1 ].getFullPathName (), prefix + " /c/d" );
235- EXPECT_EQ (fsp1[2 ].getFullPathName (), prefix + " /e/f" );
233+ EXPECT_EQ (fsp1[0 ].getFullPathName (), File ( prefix + " /a/b" ). getFullPathName () );
234+ EXPECT_EQ (fsp1[1 ].getFullPathName (), File ( prefix + " /c/d" ). getFullPathName () );
235+ EXPECT_EQ (fsp1[2 ].getFullPathName (), File ( prefix + " /e/f" ). getFullPathName () );
236236}
237237
238238TEST (FileSearchPathTests, RemoveNonExistentPaths)
0 commit comments