AssetPath - initialization order fiasco fixed

nieznanysprawiciel · Oct 11, 2019 · 9f1da40 · 9f1da40
1 parent ccff075
commit 9f1da40
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/ResourceManager/PathTranslators/AssetPath.cpp b/ResourceManager/PathTranslators/AssetPath.cpp
@@ -15,20 +15,15 @@
 namespace sw
 {
 
-
-namespace impl
-{
-	std::regex		sAssetPathRegex( "^(.*?)(?:::(.*))?$" );
-}
-
-
 // ================================ //
 //
 Nullable< AssetPath >			AssetPath::FromString		( const std::string& assetPath )
 {
+    static std::regex sAssetPathRegex( "^(.*?)(?:::(.*))?$" );
+
 	std::smatch match;
 
-	if( std::regex_match( assetPath, match, impl::sAssetPathRegex ) )
+	if( std::regex_match( assetPath, match, sAssetPathRegex ) )
 	{
 		// Ignore first match, it represents full match, that is full string.
 		return AssetPath( match[ 1 ], match[ 2 ] );

diff --git a/Tests/TestResourceManager/TestAssetPath.cpp b/Tests/TestResourceManager/TestAssetPath.cpp
@@ -107,6 +107,31 @@ TEST_CASE( "GraphicAPI.AssetPath.FromString.TwoSeparators", "[GraphicAPI]" )
 	CHECK( path.GetInternalPath() == "materials::checker" );
 }
 
+// ================================ //
+///
+TEST_CASE( "GraphicAPI.AssetPath.FromString.3Separators", "[GraphicAPI]" )
+{
+    auto nullablePath = AssetPath::FromString( "C://temp/newfolder/file.mesh::gui::materials::checker" );
+
+    REQUIRE( nullablePath.IsValid() == true );
+    auto path = nullablePath.Get();
+
+    CHECK( path.GetFile() == "C://temp/newfolder/file.mesh" );
+    CHECK( path.GetInternalPath() == "gui::materials::checker" );
+}
+
+// ================================ //
+// 
+TEST_CASE( "GraphicAPI.AssetPath.FromString.OnlyInternalPath.3Separators", "[GraphicAPI]" )
+{
+    auto nullablePath = AssetPath::FromString( "::gui::materials::checker" );
+
+    REQUIRE( nullablePath.IsValid() == true );
+    auto path = nullablePath.Get();
+
+    CHECK( path.GetFile() == "" );
+    CHECK( path.GetInternalPath() == "gui::materials::checker" );
+}
 
 //====================================================================================//
 //			Operators