diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestLoadBundleFile.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestLoadBundleFile.cs
index 6db485fd..b0f8612b 100644
--- a/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestLoadBundleFile.cs
+++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestLoadBundleFile.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Text;
-using System.IO;
using System.Collections;
using UnityEngine.TestTools;
using NUnit.Framework;
@@ -10,12 +7,10 @@ using YooAsset;
/// 测试 Bundle 文件加载
///
///
-/// 覆盖 API: LoadBundleFileAsync / LoadBundleFileSync / LoadAssetAsync(RawFileObject) / LoadAssetSync(RawFileObject)
+/// 覆盖 API: LoadBundleFileAsync / LoadBundleFileSync
/// 测试内容:
/// 1. 异步加载 Bundle 文件(raw_file_a)
/// 2. 同步加载 Bundle 文件(raw_file_b)
-/// 3. 异步通过 RawFileObject 加载,验证 GetBytes() 和 GetText() 均返回有效数据(raw_file_c)
-/// 4. 同步通过 RawFileObject 加载,验证 GetBytes() 和 GetText() 均返回有效数据(raw_file_d)
///
public class TestLoadBundleFile
{
@@ -38,42 +33,5 @@ public class TestLoadBundleFile
Assert.AreEqual(EOperationStatus.Succeeded, bundleFileHandle.Status);
bundleFileHandle.Release();
}
-
- // 测试异步加载:通过 RawFileObject 获取二进制数据和文本数据
- {
- var assetHandle = package.LoadAssetAsync("raw_file_c");
- yield return assetHandle;
- Assert.AreEqual(EOperationStatus.Succeeded, assetHandle.Status);
-
- var rawFileObject = assetHandle.GetAssetObject();
- Assert.IsNotNull(rawFileObject);
-
- byte[] fileBytes = rawFileObject.GetBytes();
- Assert.IsNotNull(fileBytes);
- Assert.Greater(fileBytes.Length, 0);
-
- string fileText = rawFileObject.GetText();
- Assert.IsNotNull(fileText);
- Assert.IsNotEmpty(fileText);
- assetHandle.Release();
- }
-
- // 测试同步加载:通过 RawFileObject 获取二进制数据和文本数据
- {
- var assetHandle = package.LoadAssetSync("raw_file_d");
- Assert.AreEqual(EOperationStatus.Succeeded, assetHandle.Status);
-
- var rawFileObject = assetHandle.GetAssetObject();
- Assert.IsNotNull(rawFileObject);
-
- byte[] fileBytes = rawFileObject.GetBytes();
- Assert.IsNotNull(fileBytes);
- Assert.Greater(fileBytes.Length, 0);
-
- string fileText = rawFileObject.GetText();
- Assert.IsNotNull(fileText);
- Assert.IsNotEmpty(fileText);
- assetHandle.Release();
- }
}
}
diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestLoadRawFileObject.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestLoadRawFileObject.cs
new file mode 100644
index 00000000..440714e6
--- /dev/null
+++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestLoadRawFileObject.cs
@@ -0,0 +1,59 @@
+using System.Collections;
+using UnityEngine.TestTools;
+using NUnit.Framework;
+using YooAsset;
+
+///
+/// 测试 RawFileObject 加载
+///
+///
+/// 覆盖 API: LoadAssetAsync(RawFileObject) / LoadAssetSync(RawFileObject)
+/// 测试内容:
+/// 1. 异步通过 RawFileObject 加载,验证 GetBytes() 和 GetText() 均返回有效数据(raw_file_c)
+/// 2. 同步通过 RawFileObject 加载,验证 GetBytes() 和 GetText() 均返回有效数据(raw_file_d)
+///
+public class TestLoadRawFileObject
+{
+ public IEnumerator RuntimeTester()
+ {
+ ResourcePackage package = YooAssets.GetPackage(TestConsts.RawBundlePackageName);
+ Assert.IsNotNull(package);
+
+ // 测试异步加载:通过 RawFileObject 获取二进制数据和文本数据
+ {
+ var assetHandle = package.LoadAssetAsync("raw_file_c");
+ yield return assetHandle;
+ Assert.AreEqual(EOperationStatus.Succeeded, assetHandle.Status);
+
+ var rawFileObject = assetHandle.GetAssetObject();
+ Assert.IsNotNull(rawFileObject);
+
+ byte[] fileBytes = rawFileObject.GetBytes();
+ Assert.IsNotNull(fileBytes);
+ Assert.Greater(fileBytes.Length, 0);
+
+ string fileText = rawFileObject.GetText();
+ Assert.IsNotNull(fileText);
+ Assert.IsNotEmpty(fileText);
+ assetHandle.Release();
+ }
+
+ // 测试同步加载:通过 RawFileObject 获取二进制数据和文本数据
+ {
+ var assetHandle = package.LoadAssetSync("raw_file_d");
+ Assert.AreEqual(EOperationStatus.Succeeded, assetHandle.Status);
+
+ var rawFileObject = assetHandle.GetAssetObject();
+ Assert.IsNotNull(rawFileObject);
+
+ byte[] fileBytes = rawFileObject.GetBytes();
+ Assert.IsNotNull(fileBytes);
+ Assert.Greater(fileBytes.Length, 0);
+
+ string fileText = rawFileObject.GetText();
+ Assert.IsNotNull(fileText);
+ Assert.IsNotEmpty(fileText);
+ assetHandle.Release();
+ }
+ }
+}
diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestLoadRawFileObject.cs.meta b/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestLoadRawFileObject.cs.meta
new file mode 100644
index 00000000..51cf0fea
--- /dev/null
+++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestLoadRawFileObject.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9d03e8f2341d4c74886f1e7aef83d0c6
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/T1_TestEditorFileSystem/T1_TestEditorFileSystem.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/T1_TestEditorFileSystem/T1_TestEditorFileSystem.cs
index f1dbbcb9..4162c89d 100644
--- a/Assets/YooAsset/Samples~/Test Sample/Runtime/T1_TestEditorFileSystem/T1_TestEditorFileSystem.cs
+++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/T1_TestEditorFileSystem/T1_TestEditorFileSystem.cs
@@ -248,35 +248,42 @@ public class T1_TestEditorFileSystem : IPrebuildSetup, IPostBuildCleanup
}
[UnityTest]
- public IEnumerator B11_TestLoadArchiveBundle()
+ public IEnumerator B11_TestLoadRawFileObject()
+ {
+ var tester = new TestLoadRawFileObject();
+ yield return tester.RuntimeTester();
+ }
+
+ [UnityTest]
+ public IEnumerator B12_TestLoadArchiveBundle()
{
var tester = new TestLoadArchiveBundle();
yield return tester.RuntimeTester();
}
[UnityTest]
- public IEnumerator B12_TestEnsureBundleFile_RawBundle()
+ public IEnumerator B13_TestEnsureBundleFile_RawBundle()
{
var tester = new TestEnsureBundleFile();
yield return tester.RuntimeTester_RawBundle();
}
[UnityTest]
- public IEnumerator B13_TestEnsureBundleFile_AssetBundle()
+ public IEnumerator B14_TestEnsureBundleFile_AssetBundle()
{
var tester = new TestEnsureBundleFile();
yield return tester.RuntimeTester_AssetBundle();
}
[UnityTest]
- public IEnumerator B14_TestEnsureBundleFile_ArchiveBundle()
+ public IEnumerator B15_TestEnsureBundleFile_ArchiveBundle()
{
var tester = new TestEnsureBundleFile();
yield return tester.RuntimeTester_ArchiveBundle();
}
[UnityTest]
- public IEnumerator B15_TestUniTask()
+ public IEnumerator B16_TestUniTask()
{
var tester = new TestUniTask();
yield return tester.RuntimeTester();
diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuiltinFileSystem/T2_TestBuiltinFileSystem.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuiltinFileSystem/T2_TestBuiltinFileSystem.cs
index 4f2c2beb..5f8dc062 100644
--- a/Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuiltinFileSystem/T2_TestBuiltinFileSystem.cs
+++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuiltinFileSystem/T2_TestBuiltinFileSystem.cs
@@ -248,35 +248,42 @@ public class T2_TestBuiltinFileSystem : IPrebuildSetup, IPostBuildCleanup
}
[UnityTest]
- public IEnumerator B11_TestLoadArchiveBundle()
+ public IEnumerator B11_TestLoadRawFileObject()
+ {
+ var tester = new TestLoadRawFileObject();
+ yield return tester.RuntimeTester();
+ }
+
+ [UnityTest]
+ public IEnumerator B12_TestLoadArchiveBundle()
{
var tester = new TestLoadArchiveBundle();
yield return tester.RuntimeTester();
}
[UnityTest]
- public IEnumerator B12_TestEnsureBundleFile_RawBundle()
+ public IEnumerator B13_TestEnsureBundleFile_RawBundle()
{
var tester = new TestEnsureBundleFile();
yield return tester.RuntimeTester_RawBundle();
}
[UnityTest]
- public IEnumerator B13_TestEnsureBundleFile_AssetBundle()
+ public IEnumerator B14_TestEnsureBundleFile_AssetBundle()
{
var tester = new TestEnsureBundleFile();
yield return tester.RuntimeTester_AssetBundle();
}
[UnityTest]
- public IEnumerator B14_TestEnsureBundleFile_ArchiveBundle()
+ public IEnumerator B15_TestEnsureBundleFile_ArchiveBundle()
{
var tester = new TestEnsureBundleFile();
yield return tester.RuntimeTester_ArchiveBundle();
}
[UnityTest]
- public IEnumerator B15_TestUniTask()
+ public IEnumerator B16_TestUniTask()
{
var tester = new TestUniTask();
yield return tester.RuntimeTester();