From cf95d264b694dd6bd5ba146831bf0748814966a1 Mon Sep 17 00:00:00 2001 From: varinotmUnity Date: Mon, 26 Jan 2026 14:39:32 -0500 Subject: [PATCH 1/3] update tests --- Tests/Editor/Editor/MeshSyncTests.cs | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/Tests/Editor/Editor/MeshSyncTests.cs b/Tests/Editor/Editor/MeshSyncTests.cs index f072bc6b2..05a829910 100644 --- a/Tests/Editor/Editor/MeshSyncTests.cs +++ b/Tests/Editor/Editor/MeshSyncTests.cs @@ -52,7 +52,11 @@ public void ExecuteCopyPasteDuplicate_CreatesUniqueMesh(string[] commands) var cube = ShapeGenerator.CreateShape(ShapeType.Cube, PivotLocation.FirstVertex); cube.transform.parent = parent; Assume.That(parent.childCount, Is.EqualTo(1)); - int originalMeshId = cube.GetComponent().sharedMesh.GetObjectId(); +#if UNITY_6000_4_OR_NEWER + var originalMeshId = cube.GetComponent().sharedMesh.GetObjectId().GetRawData(); +#else + var originalMeshId = (ulong)cube.GetComponent().sharedMesh.GetObjectId(); +#endif Selection.activeObject = cube.gameObject; @@ -72,7 +76,12 @@ public void ExecuteCopyPasteDuplicate_CreatesUniqueMesh(string[] commands) HierarchyListener.OnObjectCreated(copy); Assume.That(copy, Is.Not.EqualTo(cube)); - Assert.That(copy.GetComponent().sharedMesh.GetObjectId(), Is.Not.EqualTo(originalMeshId)); +#if UNITY_6000_4_OR_NEWER + var copyMeshId = copy.GetComponent().sharedMesh.GetObjectId().GetRawData(); +#else + var copyMeshId = (ulong)copy.GetComponent().sharedMesh.GetObjectId(); +#endif + Assert.That(copyMeshId, Is.Not.EqualTo(originalMeshId)); } //[PBLD-75] Sending the event to the scene view is needed as just calling HierarchyListener.OnObjectCreated @@ -89,7 +98,11 @@ public IEnumerator ExecuteCopyPasteDuplicateOnParent_CreatesUniqueMesh() cube.transform.parent = emptyGO; Assume.That(parent.childCount, Is.EqualTo(1)); - int originalMeshId = cube.GetComponent().sharedMesh.GetObjectId(); +#if UNITY_6000_4_OR_NEWER + var originalMeshId = cube.GetComponent().sharedMesh.GetObjectId().GetRawData(); +#else + var originalMeshId = (ulong)cube.GetComponent().sharedMesh.GetObjectId(); +#endif Selection.objects = new[] { emptyGO.gameObject }; ActiveEditorTracker.sharedTracker.ForceRebuild(); @@ -117,7 +130,12 @@ public IEnumerator ExecuteCopyPasteDuplicateOnParent_CreatesUniqueMesh() HierarchyListener.OnObjectCreated(copy); Assume.That(copy, Is.Not.EqualTo(cube)); - Assert.That(copy.GetComponent().sharedMesh.GetObjectId(), Is.Not.EqualTo(originalMeshId)); +#if UNITY_6004_0_OR_NEWER + var copyMeshId = copy.GetComponent().sharedMesh.GetObjectId().GetRawData(); +#else + var copyMeshId = (ulong)copy.GetComponent().sharedMesh.GetObjectId(); +#endif + Assert.That(copyMeshId, Is.Not.EqualTo(originalMeshId)); } [Test] From 26198479ba909d76dd0d0d2d7974a9cf5a2411b8 Mon Sep 17 00:00:00 2001 From: varinotmUnity Date: Mon, 26 Jan 2026 14:45:24 -0500 Subject: [PATCH 2/3] simplify, and fix mistake --- Tests/Editor/Editor/MeshSyncTests.cs | 38 ++++++++++++---------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/Tests/Editor/Editor/MeshSyncTests.cs b/Tests/Editor/Editor/MeshSyncTests.cs index 05a829910..d5781237d 100644 --- a/Tests/Editor/Editor/MeshSyncTests.cs +++ b/Tests/Editor/Editor/MeshSyncTests.cs @@ -44,6 +44,18 @@ static IEnumerable CopyPasteDuplicate } } + static ulong GetRawId(Object obj) + { + var id = obj.GetObjectId(); + +#if UNITY_6000_4_OR_NEWER + return id.GetRawData(); +#else + // If it returns int + return (ulong)id; +#endif + } + [Test] [TestCaseSource(nameof(CopyPasteDuplicate))] public void ExecuteCopyPasteDuplicate_CreatesUniqueMesh(string[] commands) @@ -52,11 +64,7 @@ public void ExecuteCopyPasteDuplicate_CreatesUniqueMesh(string[] commands) var cube = ShapeGenerator.CreateShape(ShapeType.Cube, PivotLocation.FirstVertex); cube.transform.parent = parent; Assume.That(parent.childCount, Is.EqualTo(1)); -#if UNITY_6000_4_OR_NEWER - var originalMeshId = cube.GetComponent().sharedMesh.GetObjectId().GetRawData(); -#else - var originalMeshId = (ulong)cube.GetComponent().sharedMesh.GetObjectId(); -#endif + ulong originalMeshId = GetRawId(cube.GetComponent().sharedMesh); Selection.activeObject = cube.gameObject; @@ -76,12 +84,7 @@ public void ExecuteCopyPasteDuplicate_CreatesUniqueMesh(string[] commands) HierarchyListener.OnObjectCreated(copy); Assume.That(copy, Is.Not.EqualTo(cube)); -#if UNITY_6000_4_OR_NEWER - var copyMeshId = copy.GetComponent().sharedMesh.GetObjectId().GetRawData(); -#else - var copyMeshId = (ulong)copy.GetComponent().sharedMesh.GetObjectId(); -#endif - Assert.That(copyMeshId, Is.Not.EqualTo(originalMeshId)); + Assert.That(GetRawId(copy.GetComponent().sharedMesh), Is.Not.EqualTo(originalMeshId)); } //[PBLD-75] Sending the event to the scene view is needed as just calling HierarchyListener.OnObjectCreated @@ -98,11 +101,7 @@ public IEnumerator ExecuteCopyPasteDuplicateOnParent_CreatesUniqueMesh() cube.transform.parent = emptyGO; Assume.That(parent.childCount, Is.EqualTo(1)); -#if UNITY_6000_4_OR_NEWER - var originalMeshId = cube.GetComponent().sharedMesh.GetObjectId().GetRawData(); -#else - var originalMeshId = (ulong)cube.GetComponent().sharedMesh.GetObjectId(); -#endif + ulong originalMeshId = GetRawId(cube.GetComponent().sharedMesh); Selection.objects = new[] { emptyGO.gameObject }; ActiveEditorTracker.sharedTracker.ForceRebuild(); @@ -130,12 +129,7 @@ public IEnumerator ExecuteCopyPasteDuplicateOnParent_CreatesUniqueMesh() HierarchyListener.OnObjectCreated(copy); Assume.That(copy, Is.Not.EqualTo(cube)); -#if UNITY_6004_0_OR_NEWER - var copyMeshId = copy.GetComponent().sharedMesh.GetObjectId().GetRawData(); -#else - var copyMeshId = (ulong)copy.GetComponent().sharedMesh.GetObjectId(); -#endif - Assert.That(copyMeshId, Is.Not.EqualTo(originalMeshId)); + Assert.That(GetRawId(copy.GetComponent().sharedMesh), Is.Not.EqualTo(originalMeshId)); } [Test] From 7d62c282e22f046e7578d246473162ca479230ef Mon Sep 17 00:00:00 2001 From: varinotmUnity Date: Mon, 26 Jan 2026 14:46:30 -0500 Subject: [PATCH 3/3] remove comment --- Tests/Editor/Editor/MeshSyncTests.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Tests/Editor/Editor/MeshSyncTests.cs b/Tests/Editor/Editor/MeshSyncTests.cs index d5781237d..3a9d53760 100644 --- a/Tests/Editor/Editor/MeshSyncTests.cs +++ b/Tests/Editor/Editor/MeshSyncTests.cs @@ -51,7 +51,6 @@ static ulong GetRawId(Object obj) #if UNITY_6000_4_OR_NEWER return id.GetRawData(); #else - // If it returns int return (ulong)id; #endif }