Overview
Comment: | OFFileManagerTests: Add more tests |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
150b8f07afa3afe3b758a981b3f8a790 |
User & Date: | js on 2024-03-17 08:56:05 |
Original Comment: | OFFileManagerTests: Add more tests. |
Other Links: | manifest | tags |
References
2024-03-17
| ||
09:45 | • Fixed ticket [3e6dc8e381]: Tests for OFFileIRIHandler plus 4 other changes artifact: d470775856 user: js | |
Context
2024-03-17
| ||
09:41 | OFFileManager: Fix getting non-existent xattr check-in: 0fe644ef2c user: js tags: trunk | |
08:56 | OFFileManagerTests: Add more tests check-in: 150b8f07af user: js tags: trunk | |
2024-03-16
| ||
22:14 | Fix OFFileManagerTests on macOS check-in: 897aa8244d user: js tags: trunk | |
Changes
Modified src/OFFileIRIHandler.m from [7d64a7fa27] to [75eba519f2].
︙ | ︙ | |||
161 162 163 164 165 166 167 168 169 170 171 172 173 174 | switch (GetLastError()) { case ERROR_FILE_NOT_FOUND: case ERROR_PATH_NOT_FOUND: case ERROR_NO_MORE_FILES: return ENOENT; case ERROR_ACCESS_DENIED: return EACCES; case ERROR_DIRECTORY: return ENOTDIR; case ERROR_NOT_READY: return EBUSY; default: return EIO; } | > > | 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 | switch (GetLastError()) { case ERROR_FILE_NOT_FOUND: case ERROR_PATH_NOT_FOUND: case ERROR_NO_MORE_FILES: return ENOENT; case ERROR_ACCESS_DENIED: return EACCES; case ERROR_PRIVILEGE_NOT_HELD: return EPERM; case ERROR_DIRECTORY: return ENOTDIR; case ERROR_NOT_READY: return EBUSY; default: return EIO; } |
︙ | ︙ |
Modified tests/OFFileManagerTests.m from [6eea30c03b] to [51b8d13873].
︙ | ︙ | |||
180 181 182 183 184 185 186 187 | * presence of test.txt instead. */ OTAssertTrue([_fileManager fileExistsAtPath: @"test.txt"]); } @finally { [_fileManager changeCurrentDirectoryPath: oldDirectoryPath]; } } @end | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 | * presence of test.txt instead. */ OTAssertTrue([_fileManager fileExistsAtPath: @"test.txt"]); } @finally { [_fileManager changeCurrentDirectoryPath: oldDirectoryPath]; } } - (void)testCopyItemAtPathToPath { OFIRI *sourceIRI = [_testsDirectoryIRI IRIByAppendingPathComponent: @"source"]; OFIRI *destinationIRI = [_testsDirectoryIRI IRIByAppendingPathComponent: @"destination"]; OFIRI *subdirectory1IRI = [sourceIRI IRIByAppendingPathComponent: @"a"]; OFIRI *subdirectory2IRI = [sourceIRI IRIByAppendingPathComponent: @"b"]; OFIRI *file1IRI = [subdirectory1IRI IRIByAppendingPathComponent: @"1.txt"]; OFIRI *file2IRI = [subdirectory2IRI IRIByAppendingPathComponent: @"2.txt"]; [_fileManager createDirectoryAtIRI: subdirectory1IRI createParents: true]; [_fileManager createDirectoryAtIRI: subdirectory2IRI createParents: true]; [@"1" writeToIRI: file1IRI]; [@"2" writeToIRI: file2IRI]; subdirectory1IRI = [destinationIRI IRIByAppendingPathComponent: @"a"]; subdirectory2IRI = [destinationIRI IRIByAppendingPathComponent: @"b"]; file1IRI = [subdirectory1IRI IRIByAppendingPathComponent: @"1.txt"]; file2IRI = [subdirectory2IRI IRIByAppendingPathComponent: @"2.txt"]; OTAssertFalse([_fileManager directoryExistsAtIRI: subdirectory1IRI]); OTAssertFalse([_fileManager directoryExistsAtIRI: subdirectory2IRI]); OTAssertFalse([_fileManager fileExistsAtIRI: file1IRI]); OTAssertFalse([_fileManager fileExistsAtIRI: file2IRI]); [_fileManager copyItemAtPath: sourceIRI.fileSystemRepresentation toPath: destinationIRI.fileSystemRepresentation]; OTAssertTrue([_fileManager directoryExistsAtIRI: subdirectory1IRI]); OTAssertTrue([_fileManager directoryExistsAtIRI: subdirectory2IRI]); OTAssertEqualObjects([OFString stringWithContentsOfIRI: file1IRI], @"1"); OTAssertEqualObjects([OFString stringWithContentsOfIRI: file2IRI], @"2"); } - (void)testMoveItemAtPathToPath { OFIRI *sourceIRI = [_testsDirectoryIRI IRIByAppendingPathComponent: @"source"]; OFIRI *destinationIRI = [_testsDirectoryIRI IRIByAppendingPathComponent: @"destination"]; OFIRI *subdirectory1IRI = [sourceIRI IRIByAppendingPathComponent: @"a"]; OFIRI *subdirectory2IRI = [sourceIRI IRIByAppendingPathComponent: @"b"]; OFIRI *file1IRI = [subdirectory1IRI IRIByAppendingPathComponent: @"1.txt"]; OFIRI *file2IRI = [subdirectory2IRI IRIByAppendingPathComponent: @"2.txt"]; [_fileManager createDirectoryAtIRI: subdirectory1IRI createParents: true]; [_fileManager createDirectoryAtIRI: subdirectory2IRI createParents: true]; [@"1" writeToIRI: file1IRI]; [@"2" writeToIRI: file2IRI]; [_fileManager moveItemAtPath: sourceIRI.fileSystemRepresentation toPath: destinationIRI.fileSystemRepresentation]; OTAssertFalse([_fileManager directoryExistsAtIRI: subdirectory1IRI]); OTAssertFalse([_fileManager directoryExistsAtIRI: subdirectory2IRI]); OTAssertFalse([_fileManager fileExistsAtIRI: file1IRI]); OTAssertFalse([_fileManager fileExistsAtIRI: file2IRI]); subdirectory1IRI = [destinationIRI IRIByAppendingPathComponent: @"a"]; subdirectory2IRI = [destinationIRI IRIByAppendingPathComponent: @"b"]; file1IRI = [subdirectory1IRI IRIByAppendingPathComponent: @"1.txt"]; file2IRI = [subdirectory2IRI IRIByAppendingPathComponent: @"2.txt"]; OTAssertTrue([_fileManager directoryExistsAtIRI: subdirectory1IRI]); OTAssertTrue([_fileManager directoryExistsAtIRI: subdirectory2IRI]); OTAssertEqualObjects([OFString stringWithContentsOfIRI: file1IRI], @"1"); OTAssertEqualObjects([OFString stringWithContentsOfIRI: file2IRI], @"2"); } - (void)testRemoveItemAtPath { OFIRI *subdirectoryIRI = [_testsDirectoryIRI IRIByAppendingPathComponent: @"dir"]; OFIRI *fileIRI = [subdirectoryIRI IRIByAppendingPathComponent: @"file.txt"]; [_fileManager createDirectoryAtIRI: subdirectoryIRI]; [@"file" writeToIRI: fileIRI]; OTAssertTrue([_fileManager directoryExistsAtIRI: subdirectoryIRI]); OTAssertTrue([_fileManager fileExistsAtIRI: fileIRI]); [_fileManager removeItemAtPath: subdirectoryIRI.fileSystemRepresentation]; OTAssertFalse([_fileManager fileExistsAtIRI: fileIRI]); OTAssertFalse([_fileManager directoryExistsAtIRI: subdirectoryIRI]); } #ifdef OF_FILE_MANAGER_SUPPORTS_LINKS - (void)testLinkItemAtPathToPath { OFIRI *sourceIRI = [_testsDirectoryIRI IRIByAppendingPathComponent: @"source"]; OFIRI *destinationIRI = [_testsDirectoryIRI IRIByAppendingPathComponent: @"destination"]; OFFileAttributes attributes; [@"test" writeToIRI: sourceIRI]; [_fileManager linkItemAtPath: sourceIRI.fileSystemRepresentation toPath: destinationIRI.fileSystemRepresentation]; attributes = [_fileManager attributesOfItemAtIRI: destinationIRI]; OTAssertEqual(attributes.fileType, OFFileTypeRegular); OTAssertEqual(attributes.fileSize, 4); OTAssertEqualObjects([OFString stringWithContentsOfIRI: destinationIRI], @"test"); } #endif #ifdef OF_FILE_MANAGER_SUPPORTS_SYMLINKS - (void)testCreateSymbolicLinkAtPathWithDestinationPath { OFIRI *sourceIRI = [_testsDirectoryIRI IRIByAppendingPathComponent: @"source"]; OFIRI *destinationIRI = [_testsDirectoryIRI IRIByAppendingPathComponent: @"destination"]; OFFileAttributes attributes; [@"test" writeToIRI: sourceIRI]; @try { OFString *sourcePath = sourceIRI.fileSystemRepresentation; OFString *destinationPath = destinationIRI.fileSystemRepresentation; [_fileManager createSymbolicLinkAtPath: destinationPath withDestinationPath: sourcePath]; } @catch (OFCreateSymbolicLinkFailedException *e) { if (e.errNo == EPERM) OTSkip(@"No permission to create symlink.\n" @"On Windows, only the administrator can create " @"symbolic links."); else @throw e; } attributes = [_fileManager attributesOfItemAtIRI: destinationIRI]; OTAssertEqual(attributes.fileType, OFFileTypeSymbolicLink); OTAssertEqualObjects([OFString stringWithContentsOfIRI: destinationIRI], @"test"); } #endif @end |