[149] Cover dotted folder names in the AssetBundle variant check

Author: SkowronskiAndrew

Analyzer/SQLite/Writers/SerializedFileSQLiteWriter.cs

@@ -180,6 +180,9 @@ public void EndArchive()
     // AssetBundle variants are named "<bundle>.<variant>", and every variant of a bundle contains
     // a SerializedFile with the same name. Two archives that differ only in their extension and
     // share a SerializedFile are therefore taken to be variants of the same bundle.
+    //
+    // The names are paths, and the Path methods below only consider the last segment, so a dot in
+    // a folder name ("v1.2/main") is not mistaken for a variant suffix.
     private static bool LooksLikeAssetBundleVariantPair(string archiveA, string archiveB)
     {
         if (archiveA == null || archiveB == null || archiveA == archiveB)

UnityDataTool.Tests/AnalyzeDuplicateNameTests.cs

@@ -214,4 +214,30 @@ public async Task Analyze_FileNamedDirectly_KeepsBareFileName()
         SQLTestHelper.AssertQueryString(db, "SELECT name FROM archives", "main",
             "a directly-named archive keeps its bare file name");
     }
+
+    // The variant check compares the extensions of two archive names, which are now paths. A dot
+    // in a folder name is not an extension, so two bundles under "v1.2" and "v1.3" must be
+    // reported as a plain duplicate rather than as variants of each other.
+    [Test]
+    public async Task Analyze_DottedFolderNames_NotReportedAsVariants()
+    {
+        var source = Path.Combine(m_AssetBundlesFolder, "2019.4.0f1", "assetbundle");
+        foreach (var folder in new[] { "v1.2", "v1.3" })
+        {
+            Directory.CreateDirectory(Path.Combine(m_TestOutputFolder, folder));
+            File.Copy(source, Path.Combine(m_TestOutputFolder, folder, "main"));
+        }
+        var databasePath = SQLTestHelper.GetDatabasePath(m_TestOutputFolder);
+
+        var (exitCode, stderr) = await RunAnalyze(m_TestOutputFolder, "-o", databasePath);
+
+        Assert.AreEqual(0, exitCode);
+        StringAssert.Contains("Duplicate SerializedFile name", stderr);
+        StringAssert.DoesNotContain("AssetBundle variant", stderr);
+
+        using var db = SQLTestHelper.OpenDatabase(databasePath);
+        SQLTestHelper.AssertQueryInt(db,
+            "SELECT COUNT(*) FROM archives WHERE name IN ('v1.2/main', 'v1.3/main')",
+            2, "both archives should be recorded under their dotted-folder relative path");
+    }
 }