Skip to content

GitLab

Commit ac498067 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Use correct namespaces in testers.

parent 2db649a6
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 51 deletions
testers/BelleSipTester/DataModel/UnitTestDataSource.cs
View file @ ac498067
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using belle_sip_tester_runtime;
using BelledonneCommunications.BelleSip.Tester;
using System.Collections.ObjectModel;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
......@@ -130,12 +130,12 @@ namespace belle_sip_tester.DataModel
get { return this._suites; }
}
public static IEnumerable<UnitTestSuite> GetSuites(belle_sip_tester_runtime.BelleSipTester tester)
public static IEnumerable<UnitTestSuite> GetSuites(NativeTester tester)
{
return _unitTestDataSource.FillSuites(tester);
}
private IEnumerable<UnitTestSuite> FillSuites(belle_sip_tester_runtime.BelleSipTester tester)
private IEnumerable<UnitTestSuite> FillSuites(NativeTester tester)
{
if (this.Suites.Count != 0) return this.Suites;
for (int i = 0; i < tester.nbTestSuites(); i++)
......
testers/BelleSipTester/MainPage.xaml.cs
View file @ ac498067
......@@ -16,6 +16,7 @@ using Windows.UI.Xaml.Input;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Navigation;
using belle_sip_tester.DataModel;
using BelledonneCommunications.BelleSip.Tester;
// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409
......@@ -24,7 +25,7 @@ namespace BelleSipTester
/// <summary>
/// An empty page that can be used on its own or navigated to within a Frame.
/// </summary>
public sealed partial class MainPage : Page, belle_sip_tester_runtime.OutputTraceListener
public sealed partial class MainPage : Page, OutputTraceListener
{
public MainPage()
{
......@@ -40,8 +41,8 @@ namespace BelleSipTester
}
else
{
belle_sip_tester_runtime.BelleSipTester.Instance.initialize(ApplicationData.Current.LocalFolder, true);
_suites = UnitTestDataSource.GetSuites(belle_sip_tester_runtime.BelleSipTester.Instance);
NativeTester.Instance.initialize(ApplicationData.Current.LocalFolder, true);
_suites = UnitTestDataSource.GetSuites(NativeTester.Instance);
}
}
......@@ -115,7 +116,7 @@ namespace BelleSipTester
ProgressIndicator.Minimum = 0;
ProgressIndicator.Maximum = nbCases;
ProgressIndicator.Value = 0;
belle_sip_tester_runtime.BelleSipTester.Instance.setOutputTraceListener(this);
NativeTester.Instance.setOutputTraceListener(this);
}
private async Task RunUnitTestCase(UnitTestCase c, bool verbose)
......@@ -130,7 +131,7 @@ namespace BelleSipTester
c.Traces.Clear();
});
c.Dispatcher = Dispatcher;
if (belle_sip_tester_runtime.BelleSipTester.Instance.run(c.Suite.Name, c.Name, verbose))
if (NativeTester.Instance.run(c.Suite.Name, c.Name, verbose))
{
newState = UnitTestCaseState.Failure;
}
......@@ -151,7 +152,7 @@ namespace BelleSipTester
private void UnprepareRun()
{
belle_sip_tester_runtime.BelleSipTester.Instance.setOutputTraceListener(null);
NativeTester.Instance.setOutputTraceListener(null);
RunningTestCase = null;
ProgressIndicator.IsEnabled = false;
CommandBar.IsEnabled = true;
......@@ -181,11 +182,11 @@ namespace BelleSipTester
CommandBar.IsEnabled = false;
ProgressIndicator.IsIndeterminate = true;
ProgressIndicator.IsEnabled = true;
belle_sip_tester_runtime.BelleSipTester.Instance.initialize(ApplicationData.Current.LocalFolder, false);
belle_sip_tester_runtime.BelleSipTester.Instance.runAllToXml();
if (belle_sip_tester_runtime.BelleSipTester.Instance.AsyncAction != null)
NativeTester.Instance.initialize(ApplicationData.Current.LocalFolder, false);
NativeTester.Instance.runAllToXml();
if (NativeTester.Instance.AsyncAction != null)
{
belle_sip_tester_runtime.BelleSipTester.Instance.AsyncAction.Completed += (asyncInfo, asyncStatus) => {
NativeTester.Instance.AsyncAction.Completed += (asyncInfo, asyncStatus) => {
App.Current.Exit();
};
}
......
testers/BelleSipTester/project.json
View file @ ac498067
{
"dependencies": {
"BelleSipTesterSDK": "1.0.0",
"BelleSipTesterSDK": "1.4.2.41",
"Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0"
},
"frameworks": {
......
testers/LibLinphoneTester/DataModel/UnitTestDataSource.cs
View file @ ac498067
......@@ -12,7 +12,7 @@ using System.ComponentModel;
using Windows.UI;
using Windows.UI.Xaml.Documents;
using Windows.UI.Core;
using linphone_tester_runtime;
using BelledonneCommunications.Linphone.Tester;
namespace LibLinphoneTester.DataModel
{
......@@ -130,12 +130,12 @@ namespace LibLinphoneTester.DataModel
get { return this._suites; }
}
public static IEnumerable<UnitTestSuite> GetSuites(linphone_tester_runtime.LibLinphoneTester tester)
public static IEnumerable<UnitTestSuite> GetSuites(NativeTester tester)
{
return _unitTestDataSource.FillSuites(tester);
}
private IEnumerable<UnitTestSuite> FillSuites(linphone_tester_runtime.LibLinphoneTester tester)
private IEnumerable<UnitTestSuite> FillSuites(NativeTester tester)
{
if (this.Suites.Count != 0) return this.Suites;
for (int i = 0; i < tester.nbTestSuites(); i++)
......
testers/LibLinphoneTester/MainPage.xaml.cs
View file @ ac498067
......@@ -16,7 +16,7 @@ using Windows.UI.Xaml.Input;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Navigation;
using LibLinphoneTester.DataModel;
using linphone_tester_runtime;
using BelledonneCommunications.Linphone.Tester;
// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409
......@@ -41,8 +41,8 @@ namespace LibLinphoneTester
}
else
{
linphone_tester_runtime.LibLinphoneTester.Instance.initialize(ApplicationData.Current.LocalFolder, true);
_suites = UnitTestDataSource.GetSuites(linphone_tester_runtime.LibLinphoneTester.Instance);
NativeTester.Instance.initialize(ApplicationData.Current.LocalFolder, true);
_suites = UnitTestDataSource.GetSuites(NativeTester.Instance);
}
}
......@@ -116,7 +116,7 @@ namespace LibLinphoneTester
ProgressIndicator.Minimum = 0;
ProgressIndicator.Maximum = nbCases;
ProgressIndicator.Value = 0;
linphone_tester_runtime.LibLinphoneTester.Instance.setOutputTraceListener(this);
NativeTester.Instance.setOutputTraceListener(this);
}
private async Task RunUnitTestCase(UnitTestCase c, bool verbose)
......@@ -131,7 +131,7 @@ namespace LibLinphoneTester
c.Traces.Clear();
});
c.Dispatcher = Dispatcher;
if (linphone_tester_runtime.LibLinphoneTester.Instance.run(c.Suite.Name, c.Name, verbose))
if (NativeTester.Instance.run(c.Suite.Name, c.Name, verbose))
{
newState = UnitTestCaseState.Failure;
}
......@@ -152,7 +152,7 @@ namespace LibLinphoneTester
private void UnprepareRun()
{
linphone_tester_runtime.LibLinphoneTester.Instance.setOutputTraceListener(null);
NativeTester.Instance.setOutputTraceListener(null);
RunningTestCase = null;
ProgressIndicator.IsEnabled = false;
CommandBar.IsEnabled = true;
......@@ -182,11 +182,11 @@ namespace LibLinphoneTester
CommandBar.IsEnabled = false;
ProgressIndicator.IsIndeterminate = true;
ProgressIndicator.IsEnabled = true;
linphone_tester_runtime.LibLinphoneTester.Instance.initialize(ApplicationData.Current.LocalFolder, false);
linphone_tester_runtime.LibLinphoneTester.Instance.runAllToXml();
if (linphone_tester_runtime.LibLinphoneTester.Instance.AsyncAction != null)
NativeTester.Instance.initialize(ApplicationData.Current.LocalFolder, false);
NativeTester.Instance.runAllToXml();
if (NativeTester.Instance.AsyncAction != null)
{
linphone_tester_runtime.LibLinphoneTester.Instance.AsyncAction.Completed += (asyncInfo, asyncStatus) => {
NativeTester.Instance.AsyncAction.Completed += (asyncInfo, asyncStatus) => {
App.Current.Exit();
};
}
......
testers/LibLinphoneTester/project.json
View file @ ac498067
{
"dependencies": {
"LibLinphoneTesterSDK": "1.0.0",
"LinphoneTesterSDK": "3.9.1.375",
"Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0"
},
"frameworks": {
......
testers/MS2Tester/DataModel/UnitTestDataSource.cs
View file @ ac498067
......@@ -12,7 +12,7 @@ using System.ComponentModel;
using Windows.UI;
using Windows.UI.Xaml.Documents;
using Windows.UI.Core;
using mediastreamer2_tester_runtime;
using BelledonneCommunications.Mediastreamer2.Tester;
namespace MS2Tester.DataModel
{
......@@ -130,12 +130,12 @@ namespace MS2Tester.DataModel
get { return this._suites; }
}
public static IEnumerable<UnitTestSuite> GetSuites(mediastreamer2_tester_runtime.MS2Tester tester)
public static IEnumerable<UnitTestSuite> GetSuites(NativeTester tester)
{
return _unitTestDataSource.FillSuites(tester);
}
private IEnumerable<UnitTestSuite> FillSuites(mediastreamer2_tester_runtime.MS2Tester tester)
private IEnumerable<UnitTestSuite> FillSuites(NativeTester tester)
{
if (this.Suites.Count != 0) return this.Suites;
for (int i = 0; i < tester.nbTestSuites(); i++)
......
testers/MS2Tester/MainPage.xaml.cs
View file @ ac498067
......@@ -16,7 +16,7 @@ using Windows.UI.Xaml.Input;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Navigation;
using MS2Tester.DataModel;
using mediastreamer2_tester_runtime;
using BelledonneCommunications.Mediastreamer2.Tester;
// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409
......@@ -41,8 +41,8 @@ namespace MS2Tester
}
else
{
mediastreamer2_tester_runtime.MS2Tester.Instance.initialize(ApplicationData.Current.LocalFolder, true);
_suites = UnitTestDataSource.GetSuites(mediastreamer2_tester_runtime.MS2Tester.Instance);
NativeTester.Instance.initialize(ApplicationData.Current.LocalFolder, true);
_suites = UnitTestDataSource.GetSuites(NativeTester.Instance);
}
}
......@@ -116,7 +116,7 @@ namespace MS2Tester
ProgressIndicator.Minimum = 0;
ProgressIndicator.Maximum = nbCases;
ProgressIndicator.Value = 0;
mediastreamer2_tester_runtime.MS2Tester.Instance.setOutputTraceListener(this);
NativeTester.Instance.setOutputTraceListener(this);
}
private async Task RunUnitTestCase(UnitTestCase c, bool verbose)
......@@ -131,7 +131,7 @@ namespace MS2Tester
c.Traces.Clear();
});
c.Dispatcher = Dispatcher;
if (mediastreamer2_tester_runtime.MS2Tester.Instance.run(c.Suite.Name, c.Name, verbose))
if (NativeTester.Instance.run(c.Suite.Name, c.Name, verbose))
{
newState = UnitTestCaseState.Failure;
}
......@@ -152,7 +152,7 @@ namespace MS2Tester
private void UnprepareRun()
{
mediastreamer2_tester_runtime.MS2Tester.Instance.setOutputTraceListener(null);
NativeTester.Instance.setOutputTraceListener(null);
RunningTestCase = null;
ProgressIndicator.IsEnabled = false;
CommandBar.IsEnabled = true;
......@@ -182,11 +182,11 @@ namespace MS2Tester
CommandBar.IsEnabled = false;
ProgressIndicator.IsIndeterminate = true;
ProgressIndicator.IsEnabled = true;
mediastreamer2_tester_runtime.MS2Tester.Instance.initialize(ApplicationData.Current.LocalFolder, false);
mediastreamer2_tester_runtime.MS2Tester.Instance.runAllToXml();
if (mediastreamer2_tester_runtime.MS2Tester.Instance.AsyncAction != null)
NativeTester.Instance.initialize(ApplicationData.Current.LocalFolder, false);
NativeTester.Instance.runAllToXml();
if (NativeTester.Instance.AsyncAction != null)
{
mediastreamer2_tester_runtime.MS2Tester.Instance.AsyncAction.Completed += (asyncInfo, asyncStatus) =>
NativeTester.Instance.AsyncAction.Completed += (asyncInfo, asyncStatus) =>
{
App.Current.Exit();
};
......
testers/MS2Tester/VideoPage.xaml.cs
View file @ ac498067
......@@ -15,7 +15,7 @@ using Windows.UI.Xaml.Data;
using Windows.UI.Xaml.Input;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Navigation;
using mediastreamer2_tester_runtime;
using BelledonneCommunications.Mediastreamer2.Tester;
// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
......@@ -29,9 +29,9 @@ namespace MS2Tester
public VideoPage()
{
this.InitializeComponent();
mediastreamer2_tester_runtime.MS2Tester.Instance.initVideo();
NativeTester.Instance.initVideo();
bool isSelected = true;
foreach (String device in mediastreamer2_tester_runtime.MS2Tester.Instance.VideoDevices)
foreach (String device in NativeTester.Instance.VideoDevices)
{
ComboBoxItem item = new ComboBoxItem();
item.Content = device;
......@@ -84,7 +84,7 @@ namespace MS2Tester
private void BackButton_Click(object sender, RoutedEventArgs e)
{
mediastreamer2_tester_runtime.MS2Tester.Instance.uninitVideo();
NativeTester.Instance.uninitVideo();
((Frame)Window.Current.Content).GoBack();
}
......@@ -136,18 +136,18 @@ namespace MS2Tester
UInt32.TryParse((FramerateComboBox.SelectedItem as ComboBoxItem).Content as String, out frameRate);
UInt32 bitRate = 1500;
UInt32.TryParse(BitrateTextBox.Text, out bitRate);
mediastreamer2_tester_runtime.MS2Tester.Instance.startVideoStream(LocalVideo, RemoteVideo, camera, codec, videoSize, frameRate, bitRate);
NativeTester.Instance.startVideoStream(LocalVideo, RemoteVideo, camera, codec, videoSize, frameRate, bitRate);
}
else
{
mediastreamer2_tester_runtime.MS2Tester.Instance.stopVideoStream();
NativeTester.Instance.stopVideoStream();
}
}
private void ChangeCameraButton_Click(object sender, RoutedEventArgs e)
{
String camera = (CameraComboBox.SelectedItem as ComboBoxItem).Content as String;
mediastreamer2_tester_runtime.MS2Tester.Instance.changeCamera(camera);
NativeTester.Instance.changeCamera(camera);
}
private void SetVideoOrientation()
......@@ -190,9 +190,9 @@ namespace MS2Tester
break;
}
if (mediastreamer2_tester_runtime.MS2Tester.Instance.getOrientation() != degrees)
if (NativeTester.Instance.getOrientation() != degrees)
{
mediastreamer2_tester_runtime.MS2Tester.Instance.setOrientation(degrees);
NativeTester.Instance.setOrientation(degrees);
}
}
......
testers/MS2Tester/project.json
View file @ ac498067
{
"dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0",
"MS2TesterSDK": "1.0.0"
"MS2TesterSDK": "2.12.1.112"
},
"frameworks": {
"uap10.0": {}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment