diff --git a/tests/src/ResourceToolsLibraryTest.cpp b/tests/src/ResourceToolsLibraryTest.cpp index 7b3d48b..082e7ff 100644 --- a/tests/src/ResourceToolsLibraryTest.cpp +++ b/tests/src/ResourceToolsLibraryTest.cpp @@ -39,7 +39,7 @@ TEST_F( ResourceToolsTest, FileMd5ChecksumGeneration ) std::filesystem::path testDataPath( testDataPathStr ); - std::filesystem::path sourcePath = testDataPath / "resourcesOnBranch" / "introMovie.txt"; + std::filesystem::path sourcePath = testDataPath / "ResourcesOnBranch" / "introMovie.txt"; std::string output; @@ -56,9 +56,9 @@ TEST_F( ResourceToolsTest, FileMd5ChecksumMatches ) std::filesystem::path testDataPath( testDataPathStr ); - std::filesystem::path sourcePath = testDataPath / "resourcesOnBranch" / "introMovie.txt"; + std::filesystem::path sourcePath = testDataPath / "ResourcesOnBranch" / "introMovie.txt"; - std::filesystem::path sourcePath2 = testDataPath / "resourcesOnBranch" / "videoCardCategories.yaml"; + std::filesystem::path sourcePath2 = testDataPath / "ResourcesOnBranch" / "videoCardCategories.yaml"; std::string output; @@ -99,7 +99,7 @@ TEST_F( ResourceToolsTest, DownloadFile ) ResourceTools::Downloader downloader; std::filesystem::path testDataPath( testDataPathStr ); - std::filesystem::path sourcePath = testDataPath / "resourcesLocal" / FOLDER_NAME / FILE_NAME; + std::filesystem::path sourcePath = testDataPath / "ResourcesLocal" / FOLDER_NAME / FILE_NAME; std::string sourcePathString( sourcePath.string() ); std::string url = "file://" + sourcePathString; std::filesystem::path outputPath = std::filesystem::temp_directory_path() / FOLDER_NAME / FILE_NAME; @@ -147,7 +147,7 @@ TEST_F( ResourceToolsTest, DownloadHeader ) ResourceTools::Downloader downloader; std::filesystem::path testDataPath( testDataPathStr ); - std::filesystem::path sourcePath = testDataPath / "resourcesLocal" / FOLDER_NAME / FILE_NAME; + std::filesystem::path sourcePath = testDataPath / "ResourcesLocal" / FOLDER_NAME / FILE_NAME; std::string sourcePathString( sourcePath.string() ); std::string url = "file://" + sourcePathString; @@ -194,7 +194,7 @@ TEST_F( ResourceToolsTest, GZipCompressData ) const char* testDataPathStr = TEST_DATA_BASE_PATH; ASSERT_TRUE( testDataPathStr ); std::filesystem::path testDataPath( testDataPathStr ); - std::filesystem::path sourcePath = testDataPath / "resourcesOnBranch" / "introMovie.txt"; + std::filesystem::path sourcePath = testDataPath / "ResourcesOnBranch" / "introMovie.txt"; std::string fileData; ASSERT_TRUE( ResourceTools::GetLocalFileData( sourcePath, fileData ) ); @@ -888,8 +888,8 @@ TEST_F( ResourceToolsTest, CountMatchingChunks ) const char* testDataPathStr = TEST_DATA_BASE_PATH; ASSERT_TRUE( testDataPathStr ); std::filesystem::path testDataPath( testDataPathStr ); - std::filesystem::path introMovieFilePath = testDataPath / "Patch" / "previousBuildResources" / "introMoviePrefixed.txt"; - std::filesystem::path introMoviePatchedFilePath = testDataPath / "Patch" / "nextBuildResources" / "introMoviePrefixed.txt"; + std::filesystem::path introMovieFilePath = testDataPath / "Patch" / "PreviousBuildResources" / "introMoviePrefixed.txt"; + std::filesystem::path introMoviePatchedFilePath = testDataPath / "Patch" / "NextBuildResources" / "introMoviePrefixed.txt"; const size_t CHUNK_SIZE{ 500 }; const size_t PREFIX_SIZE{ 308 }; @@ -998,8 +998,8 @@ TEST_F( ResourceToolsTest, CalculateBinaryOperationMacOS ) // 33279: Binaries, not just executables (No extension, .so, .pyd) // 33188: Basically everything else std::filesystem::path testDataPath = TEST_DATA_BASE_PATH; - std::filesystem::path textFilePath = testDataPath / "resourcesOnBranch" / "introMovie.txt"; - std::filesystem::path nonexistantFilePath = testDataPath / "resourcesOnBranch" / "thisFileDoesNotExist.txt"; + std::filesystem::path textFilePath = testDataPath / "ResourcesOnBranch" / "introMovie.txt"; + std::filesystem::path nonexistantFilePath = testDataPath / "ResourcesOnBranch" / "thisFileDoesNotExist.txt"; ASSERT_EQ( 33188, ResourceTools::CalculateBinaryOperation( textFilePath ) ); ASSERT_EQ( 0, ResourceTools::CalculateBinaryOperation( nonexistantFilePath ) ); } @@ -1010,8 +1010,8 @@ TEST_F( ResourceToolsTest, CalculateBinaryOperationWindows ) // 33279: Executables (.exe, .bat, .cmd, .com) # See: update_st_mode_from_path Modules/posixmodule.c // 33206: Basically everything else (.dll, .pyd, .yaml, .txt etc. ) std::filesystem::path testDataPath = TEST_DATA_BASE_PATH; - std::filesystem::path textFilePath = testDataPath / "resourcesOnBranch" / "introMovie.txt"; - std::filesystem::path nonexistantFilePath = testDataPath / "resourcesOnBranch" / "thisFileDoesNotExist.txt"; + std::filesystem::path textFilePath = testDataPath / "ResourcesOnBranch" / "introMovie.txt"; + std::filesystem::path nonexistantFilePath = testDataPath / "ResourcesOnBranch" / "thisFileDoesNotExist.txt"; std::filesystem::path binaryFilePath = std::filesystem::temp_directory_path() / "CarbonResources" / "binary.exe"; std::ofstream binaryFile( binaryFilePath ); binaryFile.close(); @@ -1028,7 +1028,7 @@ TEST_F( ResourceToolsTest, GzipStreams ) stream.Start(); ResourceTools::FileDataStreamIn fileStreamIn( 50 ); std::filesystem::path testDataPath = TEST_DATA_BASE_PATH; - std::filesystem::path testFile = testDataPath / "resourcesOnBranch" / "introMovie.txt"; + std::filesystem::path testFile = testDataPath / "ResourcesOnBranch" / "introMovie.txt"; fileStreamIn.StartRead( testFile ); ResourceTools::Md5ChecksumStream originalMd5Stream; diff --git a/tests/src/ResourcesCliTest.cpp b/tests/src/ResourcesCliTest.cpp index b8782ab..a91ee5b 100644 --- a/tests/src/ResourcesCliTest.cpp +++ b/tests/src/ResourcesCliTest.cpp @@ -319,7 +319,7 @@ TEST_F( ResourcesCliTest, CreateBundle ) arguments.push_back( "--verbosity-level" ); arguments.push_back( "-1" ); - arguments.push_back( GetTestFileAbsolutePath( "Bundle/resfileindexShort.txt" ).string() ); + arguments.push_back( GetTestFileAbsolutePath( "Bundle/resFileIndexShort.txt" ).string() ); arguments.push_back( "--resource-source-path" ); arguments.push_back( GetTestFileAbsolutePath( "Bundle/Res" ).string() ); @@ -645,11 +645,11 @@ TEST_F( ResourcesCliTest, CreatePatch ) arguments.push_back( "--verbosity-level" ); arguments.push_back( "-1" ); - std::string previousResourceGroupPath = GetTestFileAbsolutePath( "Patch/resfileindexShort_build_previous.txt" ).string(); + std::string previousResourceGroupPath = GetTestFileAbsolutePath( "Patch/resFileIndexShort_build_previous.txt" ).string(); arguments.push_back( previousResourceGroupPath ); - std::string nextResourceGroupPath = GetTestFileAbsolutePath( "Patch/resfileindexShort_build_next.txt" ).string(); + std::string nextResourceGroupPath = GetTestFileAbsolutePath( "Patch/resFileIndexShort_build_next.txt" ).string(); arguments.push_back( nextResourceGroupPath ); @@ -670,7 +670,7 @@ TEST_F( ResourcesCliTest, CreatePatch ) arguments.push_back( "PatchOut" ); arguments.push_back( "--patch-destination-base-path" ); - arguments.push_back( "Patchout/Patches" ); + arguments.push_back( "PatchOut/Patches" ); arguments.push_back( "--patch-destination-type" ); arguments.push_back( "LOCAL_CDN" ); diff --git a/tests/src/ResourcesLibraryTest.cpp b/tests/src/ResourcesLibraryTest.cpp index 964d0ca..dd1b739 100644 --- a/tests/src/ResourcesLibraryTest.cpp +++ b/tests/src/ResourcesLibraryTest.cpp @@ -423,7 +423,7 @@ TEST_F( ResourcesLibraryTest, UnpackRemoteBundleAsLocal ) // Import ResourceGroup CarbonResources::ResourceGroup resourceGroup; CarbonResources::ResourceGroupImportFromFileParams importParams; - importParams.filename = GetTestFileAbsolutePath( "Bundle/resfileindexShort.txt" ); + importParams.filename = GetTestFileAbsolutePath( "Bundle/resFileIndexShort.txt" ); importParams.callbackSettings.statusCallback = StatusUpdate; @@ -479,7 +479,7 @@ TEST_F( ResourcesLibraryTest, CreateBundleWithZeroChunkSize ) CarbonResources::ResourceGroupImportFromFileParams importParams; - importParams.filename = GetTestFileAbsolutePath( "Bundle/resfileindexShort.txt" ); + importParams.filename = GetTestFileAbsolutePath( "Bundle/resFileIndexShort.txt" ); importParams.callbackSettings.statusCallback = StatusUpdate; @@ -523,7 +523,7 @@ TEST_F( ResourcesLibraryTest, CreateBundleRemoteCDN ) CarbonResources::ResourceGroupImportFromFileParams importParams; - importParams.filename = GetTestFileAbsolutePath( "Bundle/resfileindexShort.txt" ); + importParams.filename = GetTestFileAbsolutePath( "Bundle/resFileIndexShort.txt" ); importParams.callbackSettings.statusCallback = StatusUpdate; @@ -569,7 +569,7 @@ TEST_F( ResourcesLibraryTest, CreateBundle ) CarbonResources::ResourceGroupImportFromFileParams importParams; - importParams.filename = GetTestFileAbsolutePath( "Bundle/resfileindexShort.txt" ); + importParams.filename = GetTestFileAbsolutePath( "Bundle/resFileIndexShort.txt" ); importParams.callbackSettings.statusCallback = StatusUpdate; @@ -616,7 +616,7 @@ TEST_F( ResourcesLibraryTest, CreateAndUnpackBundle ) CarbonResources::ResourceGroupImportFromFileParams importParams; - importParams.filename = GetTestFileAbsolutePath( "Bundle/resfileindexShort.txt" ); + importParams.filename = GetTestFileAbsolutePath( "Bundle/resFileIndexShort.txt" ); importParams.callbackSettings.statusCallback = StatusUpdate; @@ -751,7 +751,7 @@ TEST_F( ResourcesLibraryTest, CreatePatchWhereBuildsHaveNoChanges ) CarbonResources::ResourceGroupImportFromFileParams importParamsPrevious; - importParamsPrevious.filename = GetTestFileAbsolutePath( "Patch/resfileindexShort_build_previous.txt" ); + importParamsPrevious.filename = GetTestFileAbsolutePath( "Patch/resFileIndexShort_build_previous.txt" ); importParamsPrevious.callbackSettings.statusCallback = StatusUpdate; @@ -764,7 +764,7 @@ TEST_F( ResourcesLibraryTest, CreatePatchWhereBuildsHaveNoChanges ) CarbonResources::ResourceGroupImportFromFileParams importParamsLatest; - importParamsLatest.filename = GetTestFileAbsolutePath( "Patch/resfileindexShort_build_previous.txt" ); + importParamsLatest.filename = GetTestFileAbsolutePath( "Patch/resFileIndexShort_build_previous.txt" ); importParamsLatest.callbackSettings.statusCallback = StatusUpdate; @@ -817,7 +817,7 @@ TEST_F( ResourcesLibraryTest, CreatePatch ) CarbonResources::ResourceGroupImportFromFileParams importParamsPrevious; - importParamsPrevious.filename = GetTestFileAbsolutePath( "Patch/resfileindexShort_build_previous.txt" ); + importParamsPrevious.filename = GetTestFileAbsolutePath( "Patch/resFileIndexShort_build_previous.txt" ); importParamsPrevious.callbackSettings.statusCallback = StatusUpdate; @@ -831,7 +831,7 @@ TEST_F( ResourcesLibraryTest, CreatePatch ) CarbonResources::ResourceGroupImportFromFileParams importParamsLatest; - importParamsLatest.filename = GetTestFileAbsolutePath( "Patch/resfileindexShort_build_next.txt" ); + importParamsLatest.filename = GetTestFileAbsolutePath( "Patch/resFileIndexShort_build_next.txt" ); importParamsLatest.callbackSettings.statusCallback = StatusUpdate; @@ -889,7 +889,7 @@ TEST_F( ResourcesLibraryTest, CreatePatchZeroInputChunkSize ) CarbonResources::ResourceGroupImportFromFileParams importParamsPrevious; - importParamsPrevious.filename = GetTestFileAbsolutePath( "Patch/resfileindexShort_build_previous.txt" ); + importParamsPrevious.filename = GetTestFileAbsolutePath( "Patch/resFileIndexShort_build_previous.txt" ); importParamsPrevious.callbackSettings.statusCallback = StatusUpdate; @@ -903,7 +903,7 @@ TEST_F( ResourcesLibraryTest, CreatePatchZeroInputChunkSize ) CarbonResources::ResourceGroupImportFromFileParams importParamsLatest; - importParamsLatest.filename = GetTestFileAbsolutePath( "Patch/resfileindexShort_build_next.txt" ); + importParamsLatest.filename = GetTestFileAbsolutePath( "Patch/resFileIndexShort_build_next.txt" ); importParamsLatest.callbackSettings.statusCallback = StatusUpdate; @@ -991,10 +991,10 @@ TEST_F( ResourcesLibraryTest, ApplyPatchWithChunking ) EXPECT_TRUE( StatusIsValid() ); std::filesystem::path nextIntroMovie = GetTestFileAbsolutePath( "PatchWithInputChunk/NextBuildResources/introMovie.txt" ); - EXPECT_TRUE( FilesMatch( nextIntroMovie, patchApplyParams.resourcesToPatchDestinationSettings.basePath / "introMovie.txt" ) ); + EXPECT_TRUE( FilesMatch( nextIntroMovie, patchApplyParams.resourcesToPatchDestinationSettings.basePath / "intromovie.txt" ) ); std::filesystem::path nextIntroMoviePrefixed = GetTestFileAbsolutePath( "PatchWithInputChunk/NextBuildResources/introMoviePrefixed.txt" ); EXPECT_TRUE( FilesMatch( nextIntroMoviePrefixed, patchApplyParams.resourcesToPatchDestinationSettings.basePath / "introMoviePrefixed.txt" ) ); - std::filesystem::path nextTestResource = GetTestFileAbsolutePath( "PatchWithInputChunk/NextBuildResources/testresource2.txt" ); + std::filesystem::path nextTestResource = GetTestFileAbsolutePath( "PatchWithInputChunk/NextBuildResources/testResource2.txt" ); EXPECT_TRUE( FilesMatch( nextTestResource, patchApplyParams.resourcesToPatchDestinationSettings.basePath / "testresource2.txt" ) ); } @@ -1005,7 +1005,7 @@ TEST_F( ResourcesLibraryTest, CreatePatchWithChunking ) CarbonResources::ResourceGroupImportFromFileParams importParamsPrevious; - importParamsPrevious.filename = GetTestFileAbsolutePath( "PatchWithInputChunk/resfileindexShort_build_previous.txt" ); + importParamsPrevious.filename = GetTestFileAbsolutePath( "PatchWithInputChunk/resFileIndexShort_build_previous.txt" ); importParamsPrevious.callbackSettings.statusCallback = StatusUpdate; @@ -1018,7 +1018,7 @@ TEST_F( ResourcesLibraryTest, CreatePatchWithChunking ) CarbonResources::ResourceGroupImportFromFileParams importParamsLatest; - importParamsLatest.filename = GetTestFileAbsolutePath( "PatchWithInputChunk/resfileindexShort_build_next.txt" ); + importParamsLatest.filename = GetTestFileAbsolutePath( "PatchWithInputChunk/resFileIndexShort_build_next.txt" ); importParamsLatest.callbackSettings.statusCallback = StatusUpdate; diff --git a/tests/testData/resourcesLocal/a9/a9d1721dd5cc6d54_e6bbb2df307e5a9527159a4c971034b5 b/tests/testData/ResourcesLocal/a9/a9d1721dd5cc6d54_e6bbb2df307e5a9527159a4c971034b5 similarity index 100% rename from tests/testData/resourcesLocal/a9/a9d1721dd5cc6d54_e6bbb2df307e5a9527159a4c971034b5 rename to tests/testData/ResourcesLocal/a9/a9d1721dd5cc6d54_e6bbb2df307e5a9527159a4c971034b5 diff --git a/tests/testData/resourcesLocal/ab/ab5cde4fbbf82fb6_6a9d6d4c6015616877b77865209c5064 b/tests/testData/ResourcesLocal/ab/ab5cde4fbbf82fb6_6a9d6d4c6015616877b77865209c5064 similarity index 100% rename from tests/testData/resourcesLocal/ab/ab5cde4fbbf82fb6_6a9d6d4c6015616877b77865209c5064 rename to tests/testData/ResourcesLocal/ab/ab5cde4fbbf82fb6_6a9d6d4c6015616877b77865209c5064 diff --git a/tests/testData/resourcesLocal/d2/d27f229b13a3c94a_61a31331c3c602e8cfa6857e2897677b b/tests/testData/ResourcesLocal/d2/d27f229b13a3c94a_61a31331c3c602e8cfa6857e2897677b similarity index 100% rename from tests/testData/resourcesLocal/d2/d27f229b13a3c94a_61a31331c3c602e8cfa6857e2897677b rename to tests/testData/ResourcesLocal/d2/d27f229b13a3c94a_61a31331c3c602e8cfa6857e2897677b diff --git a/tests/testData/resourcesOnBranch/introMovie.txt b/tests/testData/ResourcesOnBranch/introMovie.txt similarity index 100% rename from tests/testData/resourcesOnBranch/introMovie.txt rename to tests/testData/ResourcesOnBranch/introMovie.txt diff --git a/tests/testData/resourcesOnBranch/videoCardCategories.yaml b/tests/testData/ResourcesOnBranch/videoCardCategories.yaml similarity index 100% rename from tests/testData/resourcesOnBranch/videoCardCategories.yaml rename to tests/testData/ResourcesOnBranch/videoCardCategories.yaml diff --git a/tests/testData/resourcesRemote/a9/a9d1721dd5cc6d54_4d7a8d216f4c8c5c6379476c0668fe84 b/tests/testData/ResourcesRemote/a9/a9d1721dd5cc6d54_4d7a8d216f4c8c5c6379476c0668fe84 similarity index 100% rename from tests/testData/resourcesRemote/a9/a9d1721dd5cc6d54_4d7a8d216f4c8c5c6379476c0668fe84 rename to tests/testData/ResourcesRemote/a9/a9d1721dd5cc6d54_4d7a8d216f4c8c5c6379476c0668fe84 diff --git a/tests/testData/resourcesRemote/ab/ab5cde4fbbf82fb6_6a9d6d4c6015616877b77865209c5064 b/tests/testData/ResourcesRemote/ab/ab5cde4fbbf82fb6_6a9d6d4c6015616877b77865209c5064 similarity index 100% rename from tests/testData/resourcesRemote/ab/ab5cde4fbbf82fb6_6a9d6d4c6015616877b77865209c5064 rename to tests/testData/ResourcesRemote/ab/ab5cde4fbbf82fb6_6a9d6d4c6015616877b77865209c5064 diff --git a/tests/testData/resourcesRemote/e9/e9f7b62a4b490c58_271c8036e4eae5515053e924a0a39e0f b/tests/testData/ResourcesRemote/e9/e9f7b62a4b490c58_271c8036e4eae5515053e924a0a39e0f similarity index 100% rename from tests/testData/resourcesRemote/e9/e9f7b62a4b490c58_271c8036e4eae5515053e924a0a39e0f rename to tests/testData/ResourcesRemote/e9/e9f7b62a4b490c58_271c8036e4eae5515053e924a0a39e0f