Skip to content

Commit 5b3c9b7

Browse files
JongChernJongChern
authored
Merge pull request #61 from ShimmerEngineering/VCBA-4
VCBA-4
2 parents 70ba79d + 7a16268 commit 5b3c9b7

File tree

17 files changed

+315
-35
lines changed

17 files changed

+315
-35
lines changed

‎.github/workflows/dotnet.yml‎ renamed to ‎.github/workflows/ShimmerBLEAPIUnitTest.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: .NET
1+
name: ShimmerBLEAPIUnitTest
22

33
on:
44
push:

‎.github/workflows/ShimmerBluetoothAPIUnitTest.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: ShimmerBluetoothAPIUnitTest
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
build:
11+
12+
runs-on: windows-latest
13+
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: Setup .NET
17+
uses: actions/setup-dotnet@v1
18+
with:
19+
dotnet-version: 5.0.x
20+
- name: Setup VSTest Path
21+
uses: darenm/Setup-VSTest@v1
22+
- name: Setup MSBuild Path
23+
uses: microsoft/setup-msbuild@v1
24+
- name: Setup Nuget
25+
uses: Nuget/[email protected]
26+
- name: Restore nuget packages
27+
run: nuget restore ./ShimmerAPI/ShimmerAPITest.sln
28+
- name: Build
29+
run: msbuild ./ShimmerAPI/ShimmerAPITest.sln
30+
- name: VSTest
31+
run: vstest.console.exe ./ShimmerAPI/ShimmerUnitTests/bin/Debug/ShimmerBluetoothTests.dll
32+
33+

‎.github/workflows/dotnet472.yml‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎ShimmerAPI/ShimmerAPI.sln‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shimmer32FeetAPI", "..\Shim
2525
EndProject
2626
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShimmerAPI", "ShimmerAPI\ShimmerAPI.csproj", "{6E320423-1D88-47EE-97BA-51113E538D33}"
2727
EndProject
28+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShimmerUnitTests", "ShimmerUnitTests\ShimmerUnitTests.csproj", "{30C7273A-87CC-499F-9206-48F89082AE0C}"
29+
EndProject
2830
Global
2931
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3032
Debug|Any CPU = Debug|Any CPU
@@ -304,6 +306,30 @@ Global
304306
{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|x64.Build.0 = Debug|Any CPU
305307
{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|x86.ActiveCfg = Debug|Any CPU
306308
{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|x86.Build.0 = Debug|Any CPU
309+
{30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
310+
{30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
311+
{30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x64.ActiveCfg = Debug|Any CPU
312+
{30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x64.Build.0 = Debug|Any CPU
313+
{30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x86.ActiveCfg = Debug|Any CPU
314+
{30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x86.Build.0 = Debug|Any CPU
315+
{30C7273A-87CC-499F-9206-48F89082AE0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
316+
{30C7273A-87CC-499F-9206-48F89082AE0C}.Release|Any CPU.Build.0 = Release|Any CPU
317+
{30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x64.ActiveCfg = Release|Any CPU
318+
{30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x64.Build.0 = Release|Any CPU
319+
{30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x86.ActiveCfg = Release|Any CPU
320+
{30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x86.Build.0 = Release|Any CPU
321+
{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|Any CPU.ActiveCfg = Debug|Any CPU
322+
{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|Any CPU.Build.0 = Debug|Any CPU
323+
{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x64.ActiveCfg = Debug|Any CPU
324+
{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x64.Build.0 = Debug|Any CPU
325+
{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x86.ActiveCfg = Debug|Any CPU
326+
{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x86.Build.0 = Debug|Any CPU
327+
{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|Any CPU.ActiveCfg = Debug|Any CPU
328+
{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|Any CPU.Build.0 = Debug|Any CPU
329+
{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x64.ActiveCfg = Debug|Any CPU
330+
{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x64.Build.0 = Debug|Any CPU
331+
{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x86.ActiveCfg = Debug|Any CPU
332+
{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x86.Build.0 = Debug|Any CPU
307333
EndGlobalSection
308334
GlobalSection(SolutionProperties) = preSolution
309335
HideSolutionNode = FALSE

‎ShimmerAPI/ShimmerAPITest.sln‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.30907.101
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShimmerAPI", "ShimmerAPI\ShimmerAPI.csproj", "{6E320423-1D88-47EE-97BA-51113E538D33}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShimmerUnitTests", "ShimmerUnitTests\ShimmerUnitTests.csproj", "{30C7273A-87CC-499F-9206-48F89082AE0C}"
9+
EndProject
10+
Global
11+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12+
Debug|Any CPU = Debug|Any CPU
13+
Debug|x64 = Debug|x64
14+
Debug|x86 = Debug|x86
15+
Release|Any CPU = Release|Any CPU
16+
Release|x64 = Release|x64
17+
Release|x86 = Release|x86
18+
ShimmerAPI|Any CPU = ShimmerAPI|Any CPU
19+
ShimmerAPI|x64 = ShimmerAPI|x64
20+
ShimmerAPI|x86 = ShimmerAPI|x86
21+
ShimmerAPIBasic|Any CPU = ShimmerAPIBasic|Any CPU
22+
ShimmerAPIBasic|x64 = ShimmerAPIBasic|x64
23+
ShimmerAPIBasic|x86 = ShimmerAPIBasic|x86
24+
EndGlobalSection
25+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
26+
{6E320423-1D88-47EE-97BA-51113E538D33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27+
{6E320423-1D88-47EE-97BA-51113E538D33}.Debug|Any CPU.Build.0 = Debug|Any CPU
28+
{6E320423-1D88-47EE-97BA-51113E538D33}.Debug|x64.ActiveCfg = Debug|Any CPU
29+
{6E320423-1D88-47EE-97BA-51113E538D33}.Debug|x64.Build.0 = Debug|Any CPU
30+
{6E320423-1D88-47EE-97BA-51113E538D33}.Debug|x86.ActiveCfg = Debug|Any CPU
31+
{6E320423-1D88-47EE-97BA-51113E538D33}.Debug|x86.Build.0 = Debug|Any CPU
32+
{6E320423-1D88-47EE-97BA-51113E538D33}.Release|Any CPU.ActiveCfg = Release|Any CPU
33+
{6E320423-1D88-47EE-97BA-51113E538D33}.Release|Any CPU.Build.0 = Release|Any CPU
34+
{6E320423-1D88-47EE-97BA-51113E538D33}.Release|x64.ActiveCfg = Release|Any CPU
35+
{6E320423-1D88-47EE-97BA-51113E538D33}.Release|x64.Build.0 = Release|Any CPU
36+
{6E320423-1D88-47EE-97BA-51113E538D33}.Release|x86.ActiveCfg = Release|Any CPU
37+
{6E320423-1D88-47EE-97BA-51113E538D33}.Release|x86.Build.0 = Release|Any CPU
38+
{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPI|Any CPU.ActiveCfg = Debug|Any CPU
39+
{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPI|Any CPU.Build.0 = Debug|Any CPU
40+
{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPI|x64.ActiveCfg = Debug|Any CPU
41+
{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPI|x64.Build.0 = Debug|Any CPU
42+
{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPI|x86.ActiveCfg = Debug|Any CPU
43+
{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPI|x86.Build.0 = Debug|Any CPU
44+
{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|Any CPU.ActiveCfg = Debug|Any CPU
45+
{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|Any CPU.Build.0 = Debug|Any CPU
46+
{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|x64.ActiveCfg = Debug|Any CPU
47+
{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|x64.Build.0 = Debug|Any CPU
48+
{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|x86.ActiveCfg = Debug|Any CPU
49+
{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|x86.Build.0 = Debug|Any CPU
50+
{30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
51+
{30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
52+
{30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x64.ActiveCfg = Debug|Any CPU
53+
{30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x64.Build.0 = Debug|Any CPU
54+
{30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x86.ActiveCfg = Debug|Any CPU
55+
{30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x86.Build.0 = Debug|Any CPU
56+
{30C7273A-87CC-499F-9206-48F89082AE0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
57+
{30C7273A-87CC-499F-9206-48F89082AE0C}.Release|Any CPU.Build.0 = Release|Any CPU
58+
{30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x64.ActiveCfg = Release|Any CPU
59+
{30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x64.Build.0 = Release|Any CPU
60+
{30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x86.ActiveCfg = Release|Any CPU
61+
{30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x86.Build.0 = Release|Any CPU
62+
{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|Any CPU.ActiveCfg = Debug|Any CPU
63+
{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|Any CPU.Build.0 = Debug|Any CPU
64+
{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x64.ActiveCfg = Debug|Any CPU
65+
{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x64.Build.0 = Debug|Any CPU
66+
{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x86.ActiveCfg = Debug|Any CPU
67+
{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x86.Build.0 = Debug|Any CPU
68+
{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|Any CPU.ActiveCfg = Debug|Any CPU
69+
{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|Any CPU.Build.0 = Debug|Any CPU
70+
{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x64.ActiveCfg = Debug|Any CPU
71+
{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x64.Build.0 = Debug|Any CPU
72+
{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x86.ActiveCfg = Debug|Any CPU
73+
{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x86.Build.0 = Debug|Any CPU
74+
EndGlobalSection
75+
GlobalSection(SolutionProperties) = preSolution
76+
HideSolutionNode = FALSE
77+
EndGlobalSection
78+
GlobalSection(ExtensibilityGlobals) = postSolution
79+
SolutionGuid = {0118CC67-3FFA-4D59-B6DD-22E5138CDBBC}
80+
EndGlobalSection
81+
EndGlobal

‎ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothTests.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,9 @@
5656
</Otherwise>
5757
</Choose>
5858
<ItemGroup>
59-
<Compile Include="ShimmerBluetoothReadData.cs" />
6059
<Compile Include="ShimmerBluetoothStreamingUnitTest.cs" />
6160
<Compile Include="ShimmerBluetoothCommandsUnitTest.cs" />
6261
<Compile Include="Properties\AssemblyInfo.cs" />
63-
<Compile Include="ShimmerTest.cs" />
64-
<Compile Include="ShimmerReadDataPacketTest.cs" />
6562
<Compile Include="ShimmerECGMDConstructor.cs" />
6663
</ItemGroup>
6764
<ItemGroup>

‎ShimmerAPI/ShimmerUnitTests/Properties/AssemblyInfo.cs‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using System.Runtime.InteropServices;
4+
5+
// General Information about an assembly is controlled through the following
6+
// set of attributes. Change these attribute values to modify the information
7+
// associated with an assembly.
8+
[assembly: AssemblyTitle("ShimmerBluetoothTests")]
9+
[assembly: AssemblyDescription("")]
10+
[assembly: AssemblyConfiguration("")]
11+
[assembly: AssemblyCompany("")]
12+
[assembly: AssemblyProduct("ShimmerBluetoothTests")]
13+
[assembly: AssemblyCopyright("Copyright © 2018")]
14+
[assembly: AssemblyTrademark("")]
15+
[assembly: AssemblyCulture("")]
16+
17+
// Setting ComVisible to false makes the types in this assembly not visible
18+
// to COM components. If you need to access a type in this assembly from
19+
// COM, set the ComVisible attribute to true on that type.
20+
[assembly: ComVisible(false)]
21+
22+
// The following GUID is for the ID of the typelib if this project is exposed to COM
23+
[assembly: Guid("f5dd4aa6-b826-49cb-96e2-a6dae01a1c47")]
24+
25+
// Version information for an assembly consists of the following four values:
26+
//
27+
// Major Version
28+
// Minor Version
29+
// Build Number
30+
// Revision
31+
//
32+
// You can specify all the values or you can default the Build and Revision Numbers
33+
// by using the '*' as shown below:
34+
// [assembly: AssemblyVersion("1.0.*")]
35+
[assembly: AssemblyVersion("1.0.0.0")]
36+
[assembly: AssemblyFileVersion("1.0.0.0")]

‎ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothReadData.cs‎ renamed to ‎ShimmerAPI/ShimmerUnitTests/ShimmerBluetoothReadData.cs‎

File renamed without changes.

‎ShimmerAPI/ShimmerBluetoothTests/ShimmerReadDataPacketTest.cs‎ renamed to ‎ShimmerAPI/ShimmerUnitTests/ShimmerReadDataPacketTest.cs‎

File renamed without changes.

‎ShimmerAPI/ShimmerBluetoothTests/ShimmerTest.cs‎ renamed to ‎ShimmerAPI/ShimmerUnitTests/ShimmerTest.cs‎

File renamed without changes.

0 commit comments

Comments
 (0)