V17 - Testproject Update

This commit is contained in:
FlorianDahn 2021-11-26 17:58:49 +01:00
parent 31e52887ba
commit 1fc581b959
5 changed files with 20 additions and 14 deletions

View File

@ -21,6 +21,7 @@ namespace TelegramBotBaseTest
var bb = BotBaseBuilder var bb = BotBaseBuilder
.Create() .Create()
.WithAPIKey(APIKey) .WithAPIKey(APIKey)
.DefaultMessageLoop()
.WithStartForm<Start>() .WithStartForm<Start>()
.NoProxy() .NoProxy()
.CustomCommands(a => .CustomCommands(a =>
@ -37,6 +38,7 @@ namespace TelegramBotBaseTest
bb.BotCommand += async (s, en) => bb.BotCommand += async (s, en) =>
{ {
switch (en.Command) switch (en.Command)
@ -67,7 +69,7 @@ namespace TelegramBotBaseTest
case "/params": case "/params":
String m = en.Parameters.DefaultIfEmpty("").Aggregate((a, b) => a + " and " + b); String m = en.Parameters.DefaultIfEmpty("").Aggregate((a, b) => a + " and " + b);
await en.Device.Send("Your parameters are: " + m, replyTo: en.Device.LastMessageId); await en.Device.Send("Your parameters are: " + m, replyTo: en.Device.LastMessageId);
en.Handled = true; en.Handled = true;
@ -82,7 +84,7 @@ namespace TelegramBotBaseTest
bb.SetSetting(TelegramBotBase.Enums.eSettings.LogAllMessages, true); bb.SetSetting(TelegramBotBase.Enums.eSettings.LogAllMessages, true);
bb.Message += (s,en) => bb.Message += (s, en) =>
{ {
Console.WriteLine(en.DeviceId + " " + en.Message.MessageText + " " + (en.Message.RawData ?? "")); Console.WriteLine(en.DeviceId + " " + en.Message.MessageText + " " + (en.Message.RawData ?? ""));
}; };

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.1;net5</TargetFrameworks> <TargetFrameworks>netcoreapp3.1;net5;net472;net6</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<Configurations>Debug;Release</Configurations> <Configurations>Debug;Release</Configurations>
</PropertyGroup> </PropertyGroup>

View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Telegram.Bot;
using Telegram.Bot.Types; using Telegram.Bot.Types;
using Telegram.Bot.Types.InputFiles; using Telegram.Bot.Types.InputFiles;
using Telegram.Bot.Types.ReplyMarkups; using Telegram.Bot.Types.ReplyMarkups;

View File

@ -16,16 +16,9 @@ namespace TelegramBotBaseTest.Tests.Navigation
public Start() public Start()
{ {
this.Closed += Start_Closed;
} }
private async Task Start_Closed(object sender, EventArgs e)
{
if (msg == null)
return;
await Device.DeleteMessage(msg);
}
public override async Task Load(MessageResult message) public override async Task Load(MessageResult message)
{ {
@ -49,12 +42,18 @@ namespace TelegramBotBaseTest.Tests.Navigation
//Create navigation controller and navigate to it, keep the current form as root form so we can get back to here later //Create navigation controller and navigate to it, keep the current form as root form so we can get back to here later
var nc = new CustomController(this); var nc = new CustomController(this);
nc.ForceCleanupOnLastPop = true;
var f1 = new Form1(); var f1 = new Form1();
await nc.PushAsync(f1);
await NavigateTo(nc); await NavigateTo(nc);
await nc.PushAsync(f1); if (msg == null)
return;
await Device.DeleteMessage(msg);
break; break;
@ -66,6 +65,10 @@ namespace TelegramBotBaseTest.Tests.Navigation
await NavigateTo(mn); await NavigateTo(mn);
if (msg == null)
return;
await Device.DeleteMessage(msg);
break; break;
} }

View File

@ -51,10 +51,10 @@ namespace TelegramBotBaseTest.Tests
default: default:
if (message.RawMessageData == null) if (message.UpdateData == null)
return; return;
this.LastMessage = message.RawMessageData.Message.Text; this.LastMessage = message.Message.Text;
break; break;
} }