Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
linphone-windows10
Commits
ac498067
Commit
ac498067
authored
Jan 26, 2016
by
Ghislain MARY
Browse files
Use correct namespaces in testers.
parent
2db649a6
Changes
10
Hide whitespace changes
Inline
Side-by-side
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
b
elle
_sip_tester_runtime
;
using
B
elle
donneCommunications.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
.
BelleSip
Tester
tester
)
public
static
IEnumerable
<
UnitTestSuite
>
GetSuites
(
Native
Tester
tester
)
{
return
_unitTestDataSource
.
FillSuites
(
tester
);
}
private
IEnumerable
<
UnitTestSuite
>
FillSuites
(
belle_sip_tester_runtime
.
BelleSip
Tester
tester
)
private
IEnumerable
<
UnitTestSuite
>
FillSuites
(
Native
Tester
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
.
BelleSip
Tester
.
Instance
.
initialize
(
ApplicationData
.
Current
.
LocalFolder
,
true
);
_suites
=
UnitTestDataSource
.
GetSuites
(
belle_sip_tester_runtime
.
BelleSip
Tester
.
Instance
);
Native
Tester
.
Instance
.
initialize
(
ApplicationData
.
Current
.
LocalFolder
,
true
);
_suites
=
UnitTestDataSource
.
GetSuites
(
Native
Tester
.
Instance
);
}
}
...
...
@@ -115,7 +116,7 @@ namespace BelleSipTester
ProgressIndicator
.
Minimum
=
0
;
ProgressIndicator
.
Maximum
=
nbCases
;
ProgressIndicator
.
Value
=
0
;
belle_sip_tester_runtime
.
BelleSip
Tester
.
Instance
.
setOutputTraceListener
(
this
);
Native
Tester
.
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
.
BelleSip
Tester
.
Instance
.
run
(
c
.
Suite
.
Name
,
c
.
Name
,
verbose
))
if
(
Native
Tester
.
Instance
.
run
(
c
.
Suite
.
Name
,
c
.
Name
,
verbose
))
{
newState
=
UnitTestCaseState
.
Failure
;
}
...
...
@@ -151,7 +152,7 @@ namespace BelleSipTester
private
void
UnprepareRun
()
{
belle_sip_tester_runtime
.
BelleSip
Tester
.
Instance
.
setOutputTraceListener
(
null
);
Native
Tester
.
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
.
BelleSip
Tester
.
Instance
.
initialize
(
ApplicationData
.
Current
.
LocalFolder
,
false
);
belle_sip_tester_runtime
.
BelleSip
Tester
.
Instance
.
runAllToXml
();
if
(
belle_sip_tester_runtime
.
BelleSip
Tester
.
Instance
.
AsyncAction
!=
null
)
Native
Tester
.
Instance
.
initialize
(
ApplicationData
.
Current
.
LocalFolder
,
false
);
Native
Tester
.
Instance
.
runAllToXml
();
if
(
Native
Tester
.
Instance
.
AsyncAction
!=
null
)
{
belle_sip_tester_runtime
.
BelleSip
Tester
.
Instance
.
AsyncAction
.
Completed
+=
(
asyncInfo
,
asyncStatus
)
=>
{
Native
Tester
.
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
l
inphone
_t
ester
_runtime
;
using
BelledonneCommunications.L
inphone
.T
ester
;
namespace
LibLinphoneTester.DataModel
{
...
...
@@ -130,12 +130,12 @@ namespace LibLinphoneTester.DataModel
get
{
return
this
.
_suites
;
}
}
public
static
IEnumerable
<
UnitTestSuite
>
GetSuites
(
linphone_tester_runtime
.
LibLinphon
eTester
tester
)
public
static
IEnumerable
<
UnitTestSuite
>
GetSuites
(
Nativ
eTester
tester
)
{
return
_unitTestDataSource
.
FillSuites
(
tester
);
}
private
IEnumerable
<
UnitTestSuite
>
FillSuites
(
linphone_tester_runtime
.
LibLinphon
eTester
tester
)
private
IEnumerable
<
UnitTestSuite
>
FillSuites
(
Nativ
eTester
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
l
inphone
_t
ester
_runtime
;
using
BelledonneCommunications.L
inphone
.T
ester
;
// 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
.
LibLinphon
eTester
.
Instance
.
initialize
(
ApplicationData
.
Current
.
LocalFolder
,
true
);
_suites
=
UnitTestDataSource
.
GetSuites
(
linphone_tester_runtime
.
LibLinphon
eTester
.
Instance
);
Nativ
eTester
.
Instance
.
initialize
(
ApplicationData
.
Current
.
LocalFolder
,
true
);
_suites
=
UnitTestDataSource
.
GetSuites
(
Nativ
eTester
.
Instance
);
}
}
...
...
@@ -116,7 +116,7 @@ namespace LibLinphoneTester
ProgressIndicator
.
Minimum
=
0
;
ProgressIndicator
.
Maximum
=
nbCases
;
ProgressIndicator
.
Value
=
0
;
linphone_tester_runtime
.
LibLinphon
eTester
.
Instance
.
setOutputTraceListener
(
this
);
Nativ
eTester
.
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
.
LibLinphon
eTester
.
Instance
.
run
(
c
.
Suite
.
Name
,
c
.
Name
,
verbose
))
if
(
Nativ
eTester
.
Instance
.
run
(
c
.
Suite
.
Name
,
c
.
Name
,
verbose
))
{
newState
=
UnitTestCaseState
.
Failure
;
}
...
...
@@ -152,7 +152,7 @@ namespace LibLinphoneTester
private
void
UnprepareRun
()
{
linphone_tester_runtime
.
LibLinphon
eTester
.
Instance
.
setOutputTraceListener
(
null
);
Nativ
eTester
.
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
.
LibLinphon
eTester
.
Instance
.
initialize
(
ApplicationData
.
Current
.
LocalFolder
,
false
);
linphone_tester_runtime
.
LibLinphon
eTester
.
Instance
.
runAllToXml
();
if
(
linphone_tester_runtime
.
LibLinphon
eTester
.
Instance
.
AsyncAction
!=
null
)
Nativ
eTester
.
Instance
.
initialize
(
ApplicationData
.
Current
.
LocalFolder
,
false
);
Nativ
eTester
.
Instance
.
runAllToXml
();
if
(
Nativ
eTester
.
Instance
.
AsyncAction
!=
null
)
{
linphone_tester_runtime
.
LibLinphon
eTester
.
Instance
.
AsyncAction
.
Completed
+=
(
asyncInfo
,
asyncStatus
)
=>
{
Nativ
eTester
.
Instance
.
AsyncAction
.
Completed
+=
(
asyncInfo
,
asyncStatus
)
=>
{
App
.
Current
.
Exit
();
};
}
...
...
testers/LibLinphoneTester/project.json
View file @
ac498067
{
"dependencies"
:
{
"
Lib
LinphoneTesterSDK"
:
"
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
m
ediastreamer2
_t
ester
_runtime
;
using
BelledonneCommunications.M
ediastreamer2
.T
ester
;
namespace
MS2Tester.DataModel
{
...
...
@@ -130,12 +130,12 @@ namespace MS2Tester.DataModel
get
{
return
this
.
_suites
;
}
}
public
static
IEnumerable
<
UnitTestSuite
>
GetSuites
(
mediastreamer2_tester_runtime
.
MS2
Tester
tester
)
public
static
IEnumerable
<
UnitTestSuite
>
GetSuites
(
Native
Tester
tester
)
{
return
_unitTestDataSource
.
FillSuites
(
tester
);
}
private
IEnumerable
<
UnitTestSuite
>
FillSuites
(
mediastreamer2_tester_runtime
.
MS2
Tester
tester
)
private
IEnumerable
<
UnitTestSuite
>
FillSuites
(
Native
Tester
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
m
ediastreamer2
_t
ester
_runtime
;
using
BelledonneCommunications.M
ediastreamer2
.T
ester
;
// 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
.
MS2
Tester
.
Instance
.
initialize
(
ApplicationData
.
Current
.
LocalFolder
,
true
);
_suites
=
UnitTestDataSource
.
GetSuites
(
mediastreamer2_tester_runtime
.
MS2
Tester
.
Instance
);
Native
Tester
.
Instance
.
initialize
(
ApplicationData
.
Current
.
LocalFolder
,
true
);
_suites
=
UnitTestDataSource
.
GetSuites
(
Native
Tester
.
Instance
);
}
}
...
...
@@ -116,7 +116,7 @@ namespace MS2Tester
ProgressIndicator
.
Minimum
=
0
;
ProgressIndicator
.
Maximum
=
nbCases
;
ProgressIndicator
.
Value
=
0
;
mediastreamer2_tester_runtime
.
MS2
Tester
.
Instance
.
setOutputTraceListener
(
this
);
Native
Tester
.
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
.
MS2
Tester
.
Instance
.
run
(
c
.
Suite
.
Name
,
c
.
Name
,
verbose
))
if
(
Native
Tester
.
Instance
.
run
(
c
.
Suite
.
Name
,
c
.
Name
,
verbose
))
{
newState
=
UnitTestCaseState
.
Failure
;
}
...
...
@@ -152,7 +152,7 @@ namespace MS2Tester
private
void
UnprepareRun
()
{
mediastreamer2_tester_runtime
.
MS2
Tester
.
Instance
.
setOutputTraceListener
(
null
);
Native
Tester
.
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
.
MS2
Tester
.
Instance
.
initialize
(
ApplicationData
.
Current
.
LocalFolder
,
false
);
mediastreamer2_tester_runtime
.
MS2
Tester
.
Instance
.
runAllToXml
();
if
(
mediastreamer2_tester_runtime
.
MS2
Tester
.
Instance
.
AsyncAction
!=
null
)
Native
Tester
.
Instance
.
initialize
(
ApplicationData
.
Current
.
LocalFolder
,
false
);
Native
Tester
.
Instance
.
runAllToXml
();
if
(
Native
Tester
.
Instance
.
AsyncAction
!=
null
)
{
mediastreamer2_tester_runtime
.
MS2
Tester
.
Instance
.
AsyncAction
.
Completed
+=
(
asyncInfo
,
asyncStatus
)
=>
Native
Tester
.
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
m
ediastreamer2
_t
ester
_runtime
;
using
BelledonneCommunications.M
ediastreamer2
.T
ester
;
// 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
.
MS2
Tester
.
Instance
.
initVideo
();
Native
Tester
.
Instance
.
initVideo
();
bool
isSelected
=
true
;
foreach
(
String
device
in
mediastreamer2_tester_runtime
.
MS2
Tester
.
Instance
.
VideoDevices
)
foreach
(
String
device
in
Native
Tester
.
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
.
MS2
Tester
.
Instance
.
uninitVideo
();
Native
Tester
.
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
.
MS2
Tester
.
Instance
.
startVideoStream
(
LocalVideo
,
RemoteVideo
,
camera
,
codec
,
videoSize
,
frameRate
,
bitRate
);
Native
Tester
.
Instance
.
startVideoStream
(
LocalVideo
,
RemoteVideo
,
camera
,
codec
,
videoSize
,
frameRate
,
bitRate
);
}
else
{
mediastreamer2_tester_runtime
.
MS2
Tester
.
Instance
.
stopVideoStream
();
Native
Tester
.
Instance
.
stopVideoStream
();
}
}
private
void
ChangeCameraButton_Click
(
object
sender
,
RoutedEventArgs
e
)
{
String
camera
=
(
CameraComboBox
.
SelectedItem
as
ComboBoxItem
).
Content
as
String
;
mediastreamer2_tester_runtime
.
MS2
Tester
.
Instance
.
changeCamera
(
camera
);
Native
Tester
.
Instance
.
changeCamera
(
camera
);
}
private
void
SetVideoOrientation
()
...
...
@@ -190,9 +190,9 @@ namespace MS2Tester
break
;
}
if
(
mediastreamer2_tester_runtime
.
MS2
Tester
.
Instance
.
getOrientation
()
!=
degrees
)
if
(
Native
Tester
.
Instance
.
getOrientation
()
!=
degrees
)
{
mediastreamer2_tester_runtime
.
MS2
Tester
.
Instance
.
setOrientation
(
degrees
);
Native
Tester
.
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"
:
{}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment