Skip to content

Commit 9895a9e

Browse files
conflict code changes
1 parent 66c4e51 commit 9895a9e

File tree

3 files changed

+0
-13
lines changed

3 files changed

+0
-13
lines changed

src/Controls/tests/DeviceTests/Elements/Image/ImageTests.Android.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using System.ComponentModel;
44
using System.IO;
55
using System.Linq;
6-
using System.Runtime.Intrinsics.Arm;
76
using System.Text;
87
using System.Threading.Tasks;
98
using Android.Graphics.Drawables;

src/Controls/tests/DeviceTests/Elements/Label/LabelTests.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -759,17 +759,6 @@ await InvokeOnMainThreadAsync(async () =>
759759
Assert.Equal(expectedValue, nativeOpacityValue);
760760
});
761761
}
762-
763-
[Fact]
764-
[Description("Basic sanity check that Label text matches renderer text")]
765-
public async Task LabelTextMatchesRendererText()
766-
{
767-
var label = new Label { Text = "foo" };
768-
var expected = label.Text;
769-
var handler = await CreateHandlerAsync<LabelHandler>(label);
770-
var platformText = await InvokeOnMainThreadAsync(() => TextForHandler(handler));
771-
Assert.Equal(expected, platformText);
772-
}
773762
Color TextColor(LabelHandler handler)
774763
{
775764
#if __IOS__

src/Controls/tests/DeviceTests/Elements/SwipeView/SwipeViewTests.Android.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using Microsoft.Maui.Platform;
88
using Xunit;
99
using static Microsoft.Maui.DeviceTests.AssertHelpers;
10-
using System.ComponentModel;
1110

1211
namespace Microsoft.Maui.DeviceTests
1312
{

0 commit comments

Comments
 (0)