Skip to content

Commit

Permalink
feat(swipecontrol): Add source commit id in headers
Browse files Browse the repository at this point in the history
  • Loading branch information
dr1rrb committed Apr 19, 2021
1 parent 3bfc847 commit bd2371c
Show file tree
Hide file tree
Showing 28 changed files with 2,141 additions and 2,154 deletions.
7 changes: 0 additions & 7 deletions src/SamplesApp/UITests.Shared/UITests.Shared.projitems
Original file line number Diff line number Diff line change
Expand Up @@ -1501,10 +1501,6 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\SwipeControlTests\SwipePage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\SymbolIconTests\SymbolIcon_Generic.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
Expand Down Expand Up @@ -5069,9 +5065,6 @@
<Compile Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\SwipeControlTests\SwipeControlPage2.xaml.cs">
<DependentUpon>SwipeControlPage2.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\SwipeControlTests\SwipePage.xaml.cs">
<DependentUpon>SwipePage.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\SwipeControlTests\TestCommand.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\SymbolIconTests\SymbolIcon_Generic.xaml.cs">
<DependentUpon>SymbolIcon_Generic.xaml</DependentUpon>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

// Imported in uno on 2021/03/21 from commit 307bd99682cccaa128483036b764c0b7c862d666
// https://github.com/microsoft/microsoft-ui-xaml/blob/307bd99682cccaa128483036b764c0b7c862d666/dev/SwipeControl/SwipeControl_TestUI/SwipeControlClearPage.xaml.cs

using System;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;

namespace MUXControlsTestApp
{
/// <summary>
/// Test page used for clearing existing SwipeControls
/// </summary>
public sealed partial class SwipeControlClearPage : TestPage
public sealed partial class SwipeControlClearPage : Page //: TestPage
{
private string[] items = new string[] { "some text" };

Expand All @@ -29,7 +33,7 @@ public void AddSwipeItemsButton_Click(object sender, RoutedEventArgs e)
DefaultSwipeItemsHorizontal.Clear();
DefaultSwipeItemsVertical.Clear();

DefaultSwipeItemsHorizontal.Mode = Microsoft.UI.Xaml.Controls.SwipeMode.Reveal;
DefaultSwipeItemsHorizontal.Mode = SwipeMode.Reveal;
DefaultSwipeItemsHorizontal.Add(DefaultSwipeItemHorizontal);

// Using swipecontrol inside datatemplate prevents us from setting that:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

// Imported in uno on 2021/03/21 from commit 307bd99682cccaa128483036b764c0b7c862d666
// https://github.com/microsoft/microsoft-ui-xaml/blob/307bd99682cccaa128483036b764c0b7c862d666/dev/SwipeControl/SwipeControl_TestUI/SwipeControlPage.xaml.cs

using System;
using System.Collections.Generic;
using System.Numerics;
Expand All @@ -15,18 +18,18 @@
using Windows.UI.Xaml.Navigation;
using SwipeControl_TestUI;

using IconSource = Microsoft.UI.Xaml.Controls.IconSource;
using SwipeItem = Microsoft.UI.Xaml.Controls.SwipeItem;
using SwipeControl = Microsoft.UI.Xaml.Controls.SwipeControl;
using SwipeItemInvokedEventArgs = Microsoft.UI.Xaml.Controls.SwipeItemInvokedEventArgs;
using MaterialHelperTestApi = Microsoft.UI.Private.Media.MaterialHelperTestApi;
using SwipeTestHooks = Microsoft.UI.Private.Controls.SwipeTestHooks;
using MUXControlsTestHooks = Microsoft.UI.Private.Controls.MUXControlsTestHooks;
using MUXControlsTestHooksLoggingMessageEventArgs = Microsoft.UI.Private.Controls.MUXControlsTestHooksLoggingMessageEventArgs;
//using IconSource = Microsoft.UI.Xaml.Controls.IconSource;
//using SwipeItem = Microsoft.UI.Xaml.Controls.SwipeItem;
//using SwipeControl = Microsoft.UI.Xaml.Controls.SwipeControl;
//using SwipeItemInvokedEventArgs = Microsoft.UI.Xaml.Controls.SwipeItemInvokedEventArgs;
//using MaterialHelperTestApi = Microsoft.UI.Private.Media.MaterialHelperTestApi;
//using SwipeTestHooks = Microsoft.UI.Private.Controls.SwipeTestHooks;
//using MUXControlsTestHooks = Microsoft.UI.Private.Controls.MUXControlsTestHooks;
//using MUXControlsTestHooksLoggingMessageEventArgs = Microsoft.UI.Private.Controls.MUXControlsTestHooksLoggingMessageEventArgs;

namespace MUXControlsTestApp
{
public sealed partial class SwipeControlPage : TestPage
public sealed partial class SwipeControlPage : Page //: TestPage
{
object asyncEventReportingLock = new object();
List<string> lstAsyncEventMessage = new List<string>();
Expand All @@ -44,7 +47,7 @@ public SwipeControlPage()

this.InitializeComponent();
Container.SizeChanged += ContainerSizeChangedHandler;
SwipeTestHooks.LastInteractedWithSwipeControlChanged += SwipeTestHooks_LastInteractedWithSwipeControlChanged;
SwipeTestHooks.LastInteractedWithSwipeControlChanged += SwipeTestHooks_LastInteractedWithSwipeControlChanged;
MaterialHelperTestApiSetup();

if (ApiInformation.IsTypePresent("Windows.UI.Xaml.Input.XamlUICommand"))
Expand All @@ -66,8 +69,9 @@ public SwipeControlPage()

if (chkLogSwipeControlMessages.IsChecked == true)
{
MUXControlsTestHooks.SetLoggingLevelForType("SwipeControl", isLoggingInfoLevel: true, isLoggingVerboseLevel: true);
MUXControlsTestHooks.LoggingMessage += MUXControlsTestHooks_LoggingMessage;
// TODO UNO
//MUXControlsTestHooks.SetLoggingLevelForType("SwipeControl", isLoggingInfoLevel: true, isLoggingVerboseLevel: true);
//MUXControlsTestHooks.LoggingMessage += MUXControlsTestHooks_LoggingMessage;
}
}

Expand Down Expand Up @@ -797,4 +801,4 @@ private void BtnClearFullLog_Click(object sender, RoutedEventArgs e)
cmbFullLog.Items.Clear();
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

// Imported in uno on 2021/03/21 from commit 307bd99682cccaa128483036b764c0b7c862d666
// https://github.com/microsoft/microsoft-ui-xaml/blob/307bd99682cccaa128483036b764c0b7c862d666/dev/SwipeControl/SwipeControl_TestUI/SwipeControlPage2.xaml.cs

using System;
using System.Collections.Generic;
using System.IO;
Expand All @@ -18,17 +21,17 @@
using Windows.UI.Xaml.Automation.Peers;
using Windows.UI;

using IconSource = Microsoft.UI.Xaml.Controls.IconSource;
using SwipeItem = Microsoft.UI.Xaml.Controls.SwipeItem;
using SwipeItems = Microsoft.UI.Xaml.Controls.SwipeItems;
using SwipeMode = Microsoft.UI.Xaml.Controls.SwipeMode;
using SwipeBehaviorOnInvoked = Microsoft.UI.Xaml.Controls.SwipeBehaviorOnInvoked;
using SwipeItemInvokedEventArgs = Microsoft.UI.Xaml.Controls.SwipeItemInvokedEventArgs;
using MaterialHelperTestApi = Microsoft.UI.Private.Media.MaterialHelperTestApi;
//using IconSource = Microsoft.UI.Xaml.Controls.IconSource;
//using SwipeItem = Microsoft.UI.Xaml.Controls.SwipeItem;
//using SwipeItems = Microsoft.UI.Xaml.Controls.SwipeItems;
//using SwipeMode = Microsoft.UI.Xaml.Controls.SwipeMode;
//using SwipeBehaviorOnInvoked = Microsoft.UI.Xaml.Controls.SwipeBehaviorOnInvoked;
//using SwipeItemInvokedEventArgs = Microsoft.UI.Xaml.Controls.SwipeItemInvokedEventArgs;
//using MaterialHelperTestApi = Microsoft.UI.Private.Media.MaterialHelperTestApi;

namespace MUXControlsTestApp
{
public sealed partial class SwipeControlPage2 : TestPage
public sealed partial class SwipeControlPage2 : Page //: TestPage
{
SwipeItem pastSender;
public SwipeControlPage2()
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

// Imported in uno on 2021/03/21 from commit 307bd99682cccaa128483036b764c0b7c862d666
// https://github.com/microsoft/microsoft-ui-xaml/blob/307bd99682cccaa128483036b764c0b7c862d666/dev/SwipeControl/SwipeControl_TestUI/TestCommand.cs

using MUXControlsTestApp;
using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

// Imported in uno on 2021/03/21 from commit 307bd99682cccaa128483036b764c0b7c862d666
// https://github.com/microsoft/microsoft-ui-xaml/blob/307bd99682cccaa128483036b764c0b7c862d666/dev/SwipeControl/SwipeControl_APITests/SwipeControlTests.cs

using MUXControlsTestApp.Utilities;
using System;
using System.Threading;
Expand All @@ -19,16 +22,16 @@
using Microsoft.VisualStudio.TestTools.UnitTesting.Logging;
#endif

using SwipeMode = Microsoft.UI.Xaml.Controls.SwipeMode;
using SwipeItem = Microsoft.UI.Xaml.Controls.SwipeItem;
using SwipeItems = Microsoft.UI.Xaml.Controls.SwipeItems;
using SwipeControl = Microsoft.UI.Xaml.Controls.SwipeControl;
using FontIconSource = Microsoft.UI.Xaml.Controls.FontIconSource;
//using SwipeMode = Microsoft.UI.Xaml.Controls.SwipeMode;
//using SwipeItem = Microsoft.UI.Xaml.Controls.SwipeItem;
//using SwipeItems = Microsoft.UI.Xaml.Controls.SwipeItems;
//using SwipeControl = Microsoft.UI.Xaml.Controls.SwipeControl;
//using FontIconSource = Microsoft.UI.Xaml.Controls.FontIconSource;

namespace Windows.UI.Xaml.Tests.MUXControls.ApiTests
{
[TestClass]
public class SwipeControlTests : ApiTestBase
public class SwipeControlTests : MUXApiTestBase
{
[TestMethod]
public void SwipeItemTest()
Expand Down
Loading

0 comments on commit bd2371c

Please sign in to comment.