unitycoder
diff --git a/‎Analyzer.Tests/ExpectedDataGenerator.cs‎
Lines changed: 4 additions & 12 deletions b/‎Analyzer.Tests/ExpectedDataGenerator.cs‎
Lines changed: 4 additions & 12 deletions
diff --git a/‎Analyzer.Tests/SerializedObjectsTests.cs‎
Lines changed: 4 additions & 4 deletions b/‎Analyzer.Tests/SerializedObjectsTests.cs‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎Analyzer/AnalyzerTool.cs‎
Lines changed: 1 addition & 1 deletion b/‎Analyzer/AnalyzerTool.cs‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎TestCommon/Context.cs‎
Lines changed: 13 additions & 22 deletions b/‎TestCommon/Context.cs‎
Lines changed: 13 additions & 22 deletions
diff --git a/‎…Data/2019.4.0f1/AssetBundles/assetbundle‎ ‎…Data/AssetBundles/2019.4.0f1/assetbundle‎TestCommon/Data/2019.4.0f1/AssetBundles/assetbundle renamed to TestCommon/Data/AssetBundles/2019.4.0f1/assetbundle b/‎…Data/2019.4.0f1/AssetBundles/assetbundle‎ ‎…Data/AssetBundles/2019.4.0f1/assetbundle‎TestCommon/Data/2019.4.0f1/AssetBundles/assetbundle renamed to TestCommon/Data/AssetBundles/2019.4.0f1/assetbundle
diff --git a/‎…mmon/Data/2019.4.0f1/AssetBundles/scenes‎ ‎…mmon/Data/AssetBundles/2019.4.0f1/scenes‎TestCommon/Data/2019.4.0f1/AssetBundles/scenes renamed to TestCommon/Data/AssetBundles/2019.4.0f1/scenes b/‎…mmon/Data/2019.4.0f1/AssetBundles/scenes‎ ‎…mmon/Data/AssetBundles/2019.4.0f1/scenes‎TestCommon/Data/2019.4.0f1/AssetBundles/scenes renamed to TestCommon/Data/AssetBundles/2019.4.0f1/scenes
diff --git a/‎…Data/2020.3.0f1/AssetBundles/assetbundle‎ ‎…Data/AssetBundles/2020.3.0f1/assetbundle‎TestCommon/Data/2020.3.0f1/AssetBundles/assetbundle renamed to TestCommon/Data/AssetBundles/2020.3.0f1/assetbundle b/‎…Data/2020.3.0f1/AssetBundles/assetbundle‎ ‎…Data/AssetBundles/2020.3.0f1/assetbundle‎TestCommon/Data/2020.3.0f1/AssetBundles/assetbundle renamed to TestCommon/Data/AssetBundles/2020.3.0f1/assetbundle
diff --git a/‎…mmon/Data/2020.3.0f1/AssetBundles/scenes‎ ‎…mmon/Data/AssetBundles/2020.3.0f1/scenes‎TestCommon/Data/2020.3.0f1/AssetBundles/scenes renamed to TestCommon/Data/AssetBundles/2020.3.0f1/scenes b/‎…mmon/Data/2020.3.0f1/AssetBundles/scenes‎ ‎…mmon/Data/AssetBundles/2020.3.0f1/scenes‎TestCommon/Data/2020.3.0f1/AssetBundles/scenes renamed to TestCommon/Data/AssetBundles/2020.3.0f1/scenes
diff --git a/‎…Data/2021.3.0f1/AssetBundles/assetbundle‎ ‎…Data/AssetBundles/2021.3.0f1/assetbundle‎TestCommon/Data/2021.3.0f1/AssetBundles/assetbundle renamed to TestCommon/Data/AssetBundles/2021.3.0f1/assetbundle b/‎…Data/2021.3.0f1/AssetBundles/assetbundle‎ ‎…Data/AssetBundles/2021.3.0f1/assetbundle‎TestCommon/Data/2021.3.0f1/AssetBundles/assetbundle renamed to TestCommon/Data/AssetBundles/2021.3.0f1/assetbundle
diff --git a/‎…mmon/Data/2021.3.0f1/AssetBundles/scenes‎ ‎…mmon/Data/AssetBundles/2021.3.0f1/scenes‎TestCommon/Data/2021.3.0f1/AssetBundles/scenes renamed to TestCommon/Data/AssetBundles/2021.3.0f1/scenes b/‎…mmon/Data/2021.3.0f1/AssetBundles/scenes‎ ‎…mmon/Data/AssetBundles/2021.3.0f1/scenes‎TestCommon/Data/2021.3.0f1/AssetBundles/scenes renamed to TestCommon/Data/AssetBundles/2021.3.0f1/scenes
@@ -7,18 +7,10 @@ namespace UnityDataTools.UnityDataTool.Tests;
 
 public static class ExpectedDataGenerator
 {
-    public static void GenerateAll()
-    {
-        foreach (var context in Context.GetAll())
-        {
-            Generate(context);
-        }
-    }
-    
     public static void Generate(Context context)
     {
         UnityFileSystem.Init();
-        using var archive = UnityFileSystem.MountArchive(Path.Combine(context.UnityDataFolder, "AssetBundles", "assetbundle"), "/");
+        using var archive = UnityFileSystem.MountArchive(Path.Combine(context.UnityDataFolder, "assetbundle"), "/");
 
         using var serializedFile = UnityFileSystem.OpenSerializedFile("/CAB-5d40f7cad7c871cf2ad2af19ac542994");
         using var fileReader = new UnityFileReader("archive:/CAB-5d40f7cad7c871cf2ad2af19ac542994", 1024*1024);
@@ -30,9 +22,9 @@ public static void Generate(Context context)
         AddObject(4693305862354978555, "Mesh", serializedFile, fileReader, context, Mesh.Read);
         AddObject(-8074603400156879931, "AudioClip", serializedFile, fileReader, context, AudioClip.Read);
         AddObject(1, "AssetBundle", serializedFile, fileReader, context, AssetBundle.Read);
-
-        var di = new DirectoryInfo(context.TestDataFolder);
-        var outputFolder = Path.Combine(di.Parent.Parent.Parent.Parent.FullName, "ExpectedData", context.UnityDataVersion);
+        
+        var csprojFolder = Directory.GetParent(context.TestDataFolder).Parent.Parent.Parent.FullName;
+        var outputFolder = Path.Combine(csprojFolder, "ExpectedData", context.UnityDataVersion);
 
         Directory.CreateDirectory(outputFolder);
         context.ExpectedData.Save(outputFolder);
 
@@ -9,7 +9,7 @@ namespace UnityDataTools.Analyzer.Tests;
 
 #pragma warning disable NUnit2005, NUnit2006
 
-public class SerializedObjectsTests : TestForAllVersions
+public class SerializedObjectsTests : AssetBundleTestFixture
 {
     private UnityArchive m_Archive;
     private SerializedFile m_SerializedFile;
@@ -19,18 +19,18 @@ public SerializedObjectsTests(Context context) : base(context)
     {
     }
 
-    protected override void OnCreate()
+    protected override void OnLoadExpectedData(Context context)
     {
         // Uncomment to regenerate expected data.
-        //ExpectedDataGenerator.GenerateAll();
+        //ExpectedDataGenerator.Generate(context);
     }
 
     [OneTimeSetUp]
     public void OneTimeSetup()
     {
         UnityFileSystem.Init();
 
-        var path = Path.Combine(Context.UnityDataFolder, "AssetBundles", "assetbundle");
+        var path = Path.Combine(Context.UnityDataFolder, "assetbundle");
         m_Archive = UnityFileSystem.MountArchive(path, "archive:/");
         m_SerializedFile = UnityFileSystem.OpenSerializedFile("archive:/CAB-5d40f7cad7c871cf2ad2af19ac542994");
         m_FileReader = new UnityFileReader("archive:/CAB-5d40f7cad7c871cf2ad2af19ac542994", 1024*1024);
 
@@ -61,7 +61,7 @@ public int Analyze(string path, string databaseName, string searchPattern, bool
                     Console.Write(new string(' ', Console.BufferWidth));
                     Console.Write($"\rProcessing {i * 100 / files.Length}% ({i}/{files.Length}) {file}");
 
-                    writer.WriteSerializedFile(serializedFileName, path);
+                    writer.WriteSerializedFile(serializedFileName, file);
                 }
             }
             catch (Exception e)
 
@@ -4,39 +4,30 @@ namespace UnityDataTools.TestCommon;
 
 public class Context
 {
+    // e.g. <CurrentProjectFolder>/bin/Debug/net6.0/Data/AssetBundles/2021.1.0f1
     public string UnityDataFolder { get; }
+    
+    // e.g. 2021.1.0f1
     public string UnityDataVersion { get; }
+    
+    // e.g. <CurrentProjectFolder>/bin/Debug/net6.0/Data
     public string TestDataFolder { get; }
+    
+    // e.g. <CurrentProjectFolder>/bin/Debug/net6.0/ExpectedData/2021.1.0f1
     public string ExpectedDataFolder { get; }
+    
     public ExpectedData ExpectedData { get; } = new();
 
-    private static Dictionary<string, List<Context>> m_Cache = new();
-
-    private Context(string folder)
+    public Context(string folder)
     {
         var di = new DirectoryInfo(folder);
 
         UnityDataFolder = folder;
         UnityDataVersion = di.Name;
-        TestDataFolder = di.Parent.FullName;
-        ExpectedDataFolder = Path.Combine(di.Parent.Parent.FullName, "ExpectedData", UnityDataVersion);
-    }
-
-    public static IEnumerable<Context> GetAll()
-    {
-        if (m_Cache.TryGetValue(TestContext.CurrentContext.TestDirectory, out var cases))
-        {
-            return cases;
-        }
-
-        cases = new List<Context>();
-        m_Cache[TestContext.CurrentContext.TestDirectory] = cases;
-        foreach (var folder in Directory.EnumerateDirectories(Path.Combine(TestContext.CurrentContext.TestDirectory, "Data")))
-        {
-            cases.Add(new Context(folder));
-        }
-
-        return cases;
+        TestDataFolder = di.Parent.Parent.FullName;
+        ExpectedDataFolder = Path.Combine(di.Parent.Parent.Parent.FullName, "ExpectedData", UnityDataVersion);
+        
+        ExpectedData.Load(ExpectedDataFolder);
     }
 
     public override string ToString()
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace UnityDataTools.Analyzer.Tests;`
`9`	`9`
`10`	`10`	`#pragma warning disable NUnit2005, NUnit2006`
`11`	`11`
`12`		`-public class SerializedObjectsTests : TestForAllVersions`
	`12`	`+public class SerializedObjectsTests : AssetBundleTestFixture`
`13`	`13`	`{`
`14`	`14`	`private UnityArchive m_Archive;`
`15`	`15`	`private SerializedFile m_SerializedFile;`
`@@ -19,18 +19,18 @@ public SerializedObjectsTests(Context context) : base(context)`
`19`	`19`	`{`
`20`	`20`	`}`
`21`	`21`
`22`		`- protected override void OnCreate()`
	`22`	`+ protected override void OnLoadExpectedData(Context context)`
`23`	`23`	`{`
`24`	`24`	`// Uncomment to regenerate expected data.`
`25`		`- //ExpectedDataGenerator.GenerateAll();`
	`25`	`+ //ExpectedDataGenerator.Generate(context);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`[OneTimeSetUp]`
`29`	`29`	`public void OneTimeSetup()`
`30`	`30`	`{`
`31`	`31`	`UnityFileSystem.Init();`
`32`	`32`
`33`		`- var path = Path.Combine(Context.UnityDataFolder, "AssetBundles", "assetbundle");`
	`33`	`+ var path = Path.Combine(Context.UnityDataFolder, "assetbundle");`
`34`	`34`	`m_Archive = UnityFileSystem.MountArchive(path, "archive:/");`
`35`	`35`	`m_SerializedFile = UnityFileSystem.OpenSerializedFile("archive:/CAB-5d40f7cad7c871cf2ad2af19ac542994");`
`36`	`36`	`m_FileReader = new UnityFileReader("archive:/CAB-5d40f7cad7c871cf2ad2af19ac542994", 1024*1024);`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public int Analyze(string path, string databaseName, string searchPattern, bool`
`61`	`61`	`Console.Write(new string(' ', Console.BufferWidth));`
`62`	`62`	`Console.Write($"\rProcessing {i * 100 / files.Length}% ({i}/{files.Length}) {file}");`
`63`	`63`
`64`		`- writer.WriteSerializedFile(serializedFileName, path);`
	`64`	`+ writer.WriteSerializedFile(serializedFileName, file);`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`catch (Exception e)`