Fix: Build error

nutti · May 3, 2024 · c5bb1be · c5bb1be
1 parent d358756
commit c5bb1be
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 7 deletions.
diff --git a/BlueprintToRSTDoc/Source/BlueprintToRSTDoc/Private/BPLibrary.cpp b/BlueprintToRSTDoc/Source/BlueprintToRSTDoc/Private/BPLibrary.cpp
@@ -467,7 +467,11 @@ bool GetBlueprintAssets(TArray<FAssetData>& Blueprints, const TArray<FString>& E
 	FARFilter Filter;
 	Filter.bRecursivePaths = true;
 	Filter.bIncludeOnlyOnDiskAssets = true;
+#if UE_VERSION_NEWER_THAN(5, 1, 0)
+	Filter.ClassPaths.Add(UBlueprint::StaticClass()->GetClassPathName());
+#else
 	Filter.ClassNames.Add(UBlueprint::StaticClass()->GetFName());
+#endif
 	Filter.bRecursiveClasses = true;
 
 	if (!AssetRegistry.GetAssets(Filter, Blueprints))
@@ -510,7 +514,11 @@ bool GetStructureAssets(TArray<FAssetData>& ScriptStructs, const TArray<FString>
 	FARFilter Filter;
 	Filter.bRecursivePaths = true;
 	Filter.bIncludeOnlyOnDiskAssets = true;
+#if UE_VERSION_NEWER_THAN(5, 1, 0)
+	Filter.ClassPaths.Add(UUserDefinedStruct::StaticClass()->GetClassPathName());
+#else
 	Filter.ClassNames.Add(UUserDefinedStruct::StaticClass()->GetFName());
+#endif
 	Filter.bRecursiveClasses = true;
 
 	if (!AssetRegistry.GetAssets(Filter, ScriptStructs))
@@ -553,7 +561,11 @@ bool GetEnumerationAssets(TArray<FAssetData>& Enums, const TArray<FString>& Excl
 	FARFilter Filter;
 	Filter.bRecursivePaths = true;
 	Filter.bIncludeOnlyOnDiskAssets = true;
+#if UE_VERSION_NEWER_THAN(5, 1, 0)
+	Filter.ClassPaths.Add(UUserDefinedEnum::StaticClass()->GetClassPathName());
+#else
 	Filter.ClassNames.Add(UUserDefinedEnum::StaticClass()->GetFName());
+#endif
 	Filter.bRecursiveClasses = true;
 
 	if (!AssetRegistry.GetAssets(Filter, Enums))

diff --git a/tests/functional_test/FunctionalTest/Source/FunctionalTest/FunctionalTestAutomationTest.cpp b/tests/functional_test/FunctionalTest/Source/FunctionalTest/FunctionalTestAutomationTest.cpp
@@ -31,12 +31,23 @@ bool FFuntionalTestSyncVersion::RunTest(const FString& Parameters)
 	// Generate RST documents.
 	bool bSuccess;
 	FString ErrorMessage;
-	UBlueprintToRSTDocBPLibrary::GenerateRSTDoc(
-		OutputDirectory, {"ChaosNiagara", "Engine", "DatasmithContent", "Niagara"}, bSuccess, ErrorMessage);
+	TArray<FString> ExcludePaths = {
+		"ChaosNiagara",
+		"Engine",
+		"DatasmithContent",
+		"Niagara",
+		"ChaosVD",
+		"Takes",
+		"AudioWidgets",
+		"ControlRig",
+		"ControlRigModules",
+		"ControlRigSpline",
+	};
+	UBlueprintToRSTDocBPLibrary::GenerateRSTDoc(OutputDirectory, ExcludePaths, bSuccess, ErrorMessage);
 	if (!bSuccess)
 	{
 		UE_LOG(LogTemp, Error, TEXT("%s"), *ErrorMessage);
-		return 1;
+		return false;
 	}
 
 	IFileManager& FileManager = FFileManagerGeneric::Get();
@@ -51,7 +62,7 @@ bool FFuntionalTestSyncVersion::RunTest(const FString& Parameters)
 	{
 		UE_LOG(LogTemp, Error, TEXT("Number of Files is not matched: %d (Expected) vs %d (Actual)"), ExpectedFiles.Num(),
 			ActualFiles.Num());
-		return 1;
+		return false;
 	}
 
 	TMap<FString, FString> FilePairs;
@@ -62,7 +73,7 @@ bool FFuntionalTestSyncVersion::RunTest(const FString& Parameters)
 		if (Index == INDEX_NONE)
 		{
 			UE_LOG(LogTemp, Error, TEXT("Not Found: %s"), *FileName);
-			return 1;
+			return false;
 		}
 
 		FString Expected;
@@ -72,11 +83,11 @@ bool FFuntionalTestSyncVersion::RunTest(const FString& Parameters)
 		if (Expected != Actual)
 		{
 			UE_LOG(LogTemp, Error, TEXT("File Content does not match (File: %s)"), *E);
-			return 1;
+			return false;
 		}
 	}
 
 	PlatformFile.DeleteDirectoryRecursively(*OutputDirectory);
 
-	return 0;
+	return true;
 }