Mirror com.unity.ugui package (Unity 6000.4.0a2)

Unity CI Bot · Unity CI Bot · commit 6239abee783c · 2025-09-27T06:37:52.000Z
diff --git a/com.unity.ugui/Tests/Editor/TMP/FontEngineTests.cs b/com.unity.ugui/Tests/Editor/TMP/FontEngineTests.cs
@@ -3,11 +3,10 @@
 using NUnit.Framework;
 using UnityEngine.TextCore.LowLevel;
 
-
 namespace TMPro
 {
     [Category("Text Parsing & Layout")]
-    class FontEngineTests
+    internal class FontEngineTests
     {
         [OneTimeSetUp]
         public void Setup()
diff --git a/com.unity.ugui/Tests/Editor/TMP/TMP_ControlTests.cs b/com.unity.ugui/Tests/Editor/TMP/TMP_ControlTests.cs
@@ -5,7 +5,7 @@
 
 namespace TMPro
 {
-    public class TMP_ControlTests
+    internal class TMP_ControlTests
     {
         Scene scene;
         [SetUp]
diff --git a/com.unity.ugui/Tests/Editor/TMP/TMP_EditorTests.cs b/com.unity.ugui/Tests/Editor/TMP/TMP_EditorTests.cs
@@ -3,11 +3,10 @@
 using NUnit.Framework;
 using System.IO;
 
-
 namespace TMPro
 {
     [Category("Text Parsing & Layout")]
-    class TMP_EditorTests
+    internal class TMP_EditorTests
     {
         private TextMeshPro m_TextComponent;
 
diff --git a/com.unity.ugui/Tests/Runtime/TMP/TMP_CanvasTests.cs b/com.unity.ugui/Tests/Runtime/TMP/TMP_CanvasTests.cs
@@ -5,10 +5,9 @@
 using UnityEngine.UI;
 using UnityEngine.EventSystems;
 
-
 namespace TMPro
 {
-    public class TMP_CanvasTests
+    internal class TMP_CanvasTests
     {
         [OneTimeSetUp]
         public void Setup()
diff --git a/com.unity.ugui/Tests/Runtime/TMP/TMP_RuntimeTests.cs b/com.unity.ugui/Tests/Runtime/TMP/TMP_RuntimeTests.cs
@@ -9,7 +9,7 @@
 namespace TMPro
 {
     [Category("Text Parsing & Layout")]
-    class TMP_RuntimeTests
+    internal class TMP_RuntimeTests
     {
         private TextMeshPro m_TextComponent;
 
diff --git a/com.unity.ugui/Tests/Runtime/UGUI/ScrollRect/ScrollRectTests.cs b/com.unity.ugui/Tests/Runtime/UGUI/ScrollRect/ScrollRectTests.cs
@@ -83,7 +83,6 @@ public void OneTimeTearDown()
 
     #region Enable disable scrollbars
 
-    [UnityTest, Ignore("Disabled for Instability https://jira.unity3d.com/browse/UUM-42513")]
     [TestCase(true, ExpectedResult = null)]
     [TestCase(false, ExpectedResult = null)]
     public IEnumerator OnEnableShouldAddListeners(bool isHorizontal)
@@ -107,7 +106,6 @@ public IEnumerator OnEnableShouldAddListeners(bool isHorizontal)
         Assert.AreEqual(callCount + 1, (int)property.GetValue(invokeableCallList, null));
     }
 
-    [UnityTest, Ignore("Disabled for Instability https://jira.unity3d.com/browse/UUM-42513")]
     [TestCase(true, ExpectedResult = null)]
     [TestCase(false, ExpectedResult = null)]
     public IEnumerator OnDisableShouldRemoveListeners(bool isHorizontal)
@@ -129,7 +127,6 @@ public IEnumerator OnDisableShouldRemoveListeners(bool isHorizontal)
         Assert.AreEqual(0, (int)property.GetValue(invokeableCallList, null));
     }
 
-    [Test, Ignore("Disabled for Instability https://jira.unity3d.com/browse/UUM-42513")]
     [TestCase(true)]
     [TestCase(false)]
     public void SettingScrollbarShouldRemoveThenAddListeners(bool testHorizontal)

Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,10 @@`
`3`	`3`	`using NUnit.Framework;`
`4`	`4`	`using UnityEngine.TextCore.LowLevel;`
`5`	`5`
`6`		`-`
`7`	`6`	`namespace TMPro`
`8`	`7`	`{`
`9`	`8`	`[Category("Text Parsing & Layout")]`
`10`		`- class FontEngineTests`
	`9`	`+ internal class FontEngineTests`
`11`	`10`	`{`
`12`	`11`	`[OneTimeSetUp]`
`13`	`12`	`public void Setup()`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace TMPro`
`7`	`7`	`{`
`8`		`- public class TMP_ControlTests`
	`8`	`+ internal class TMP_ControlTests`
`9`	`9`	`{`
`10`	`10`	`Scene scene;`
`11`	`11`	`[SetUp]`
Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,10 @@`
`3`	`3`	`using NUnit.Framework;`
`4`	`4`	`using System.IO;`
`5`	`5`
`6`		`-`
`7`	`6`	`namespace TMPro`
`8`	`7`	`{`
`9`	`8`	`[Category("Text Parsing & Layout")]`
`10`		`- class TMP_EditorTests`
	`9`	`+ internal class TMP_EditorTests`
`11`	`10`	`{`
`12`	`11`	`private TextMeshPro m_TextComponent;`
`13`	`12`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,9 @@`
`5`	`5`	`using UnityEngine.UI;`
`6`	`6`	`using UnityEngine.EventSystems;`
`7`	`7`
`8`		`-`
`9`	`8`	`namespace TMPro`
`10`	`9`	`{`
`11`		`- public class TMP_CanvasTests`
	`10`	`+ internal class TMP_CanvasTests`
`12`	`11`	`{`
`13`	`12`	`[OneTimeSetUp]`
`14`	`13`	`public void Setup()`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`namespace TMPro`
`10`	`10`	`{`
`11`	`11`	`[Category("Text Parsing & Layout")]`
`12`		`- class TMP_RuntimeTests`
	`12`	`+ internal class TMP_RuntimeTests`
`13`	`13`	`{`
`14`	`14`	`private TextMeshPro m_TextComponent;`
`15`	`15`