VCBA-4

.github/workflows/dotnet.yml → .github/workflows/ShimmerBLEAPIUnitTest.yml

@@ -1,4 +1,4 @@
-name: .NET
+name: ShimmerBLEAPIUnitTest
 
 on:
   push:

.github/workflows/ShimmerBluetoothAPIUnitTest.yml

@@ -0,0 +1,33 @@
+name: ShimmerBluetoothAPIUnitTest
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 5.0.x
+    - name: Setup VSTest Path
+      uses: darenm/Setup-VSTest@v1
+    - name: Setup MSBuild Path
+      uses: microsoft/setup-msbuild@v1    
+    - name: Setup Nuget
+      uses: Nuget/setup-nuget@v1.0.5
+    - name: Restore nuget packages
+      run: nuget restore ./ShimmerAPI/ShimmerAPITest.sln
+    - name: Build 
+      run: msbuild ./ShimmerAPI/ShimmerAPITest.sln
+    - name: VSTest
+      run: vstest.console.exe ./ShimmerAPI/ShimmerUnitTests/bin/Debug/ShimmerBluetoothTests.dll
+
+

ShimmerAPI/ShimmerAPI.sln

@@ -25,6 +25,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shimmer32FeetAPI", "..\Shim
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShimmerAPI", "ShimmerAPI\ShimmerAPI.csproj", "{6E320423-1D88-47EE-97BA-51113E538D33}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShimmerUnitTests", "ShimmerUnitTests\ShimmerUnitTests.csproj", "{30C7273A-87CC-499F-9206-48F89082AE0C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -304,6 +306,30 @@ Global
 		{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|x64.Build.0 = Debug|Any CPU
 		{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|x86.ActiveCfg = Debug|Any CPU
 		{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|x86.Build.0 = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x64.Build.0 = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x86.Build.0 = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x64.ActiveCfg = Release|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x64.Build.0 = Release|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x86.ActiveCfg = Release|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x86.Build.0 = Release|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|Any CPU.ActiveCfg = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|Any CPU.Build.0 = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x64.ActiveCfg = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x64.Build.0 = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x86.ActiveCfg = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x86.Build.0 = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|Any CPU.ActiveCfg = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|Any CPU.Build.0 = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x64.ActiveCfg = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x64.Build.0 = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x86.ActiveCfg = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

ShimmerAPI/ShimmerAPITest.sln

@@ -0,0 +1,81 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30907.101
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShimmerAPI", "ShimmerAPI\ShimmerAPI.csproj", "{6E320423-1D88-47EE-97BA-51113E538D33}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShimmerUnitTests", "ShimmerUnitTests\ShimmerUnitTests.csproj", "{30C7273A-87CC-499F-9206-48F89082AE0C}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		ShimmerAPI|Any CPU = ShimmerAPI|Any CPU
+		ShimmerAPI|x64 = ShimmerAPI|x64
+		ShimmerAPI|x86 = ShimmerAPI|x86
+		ShimmerAPIBasic|Any CPU = ShimmerAPIBasic|Any CPU
+		ShimmerAPIBasic|x64 = ShimmerAPIBasic|x64
+		ShimmerAPIBasic|x86 = ShimmerAPIBasic|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6E320423-1D88-47EE-97BA-51113E538D33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E320423-1D88-47EE-97BA-51113E538D33}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E320423-1D88-47EE-97BA-51113E538D33}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6E320423-1D88-47EE-97BA-51113E538D33}.Debug|x64.Build.0 = Debug|Any CPU
+		{6E320423-1D88-47EE-97BA-51113E538D33}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6E320423-1D88-47EE-97BA-51113E538D33}.Debug|x86.Build.0 = Debug|Any CPU
+		{6E320423-1D88-47EE-97BA-51113E538D33}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E320423-1D88-47EE-97BA-51113E538D33}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E320423-1D88-47EE-97BA-51113E538D33}.Release|x64.ActiveCfg = Release|Any CPU
+		{6E320423-1D88-47EE-97BA-51113E538D33}.Release|x64.Build.0 = Release|Any CPU
+		{6E320423-1D88-47EE-97BA-51113E538D33}.Release|x86.ActiveCfg = Release|Any CPU
+		{6E320423-1D88-47EE-97BA-51113E538D33}.Release|x86.Build.0 = Release|Any CPU
+		{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPI|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPI|Any CPU.Build.0 = Debug|Any CPU
+		{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPI|x64.ActiveCfg = Debug|Any CPU
+		{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPI|x64.Build.0 = Debug|Any CPU
+		{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPI|x86.ActiveCfg = Debug|Any CPU
+		{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPI|x86.Build.0 = Debug|Any CPU
+		{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|Any CPU.Build.0 = Debug|Any CPU
+		{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|x64.ActiveCfg = Debug|Any CPU
+		{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|x64.Build.0 = Debug|Any CPU
+		{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|x86.ActiveCfg = Debug|Any CPU
+		{6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|x86.Build.0 = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x64.Build.0 = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x86.Build.0 = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x64.ActiveCfg = Release|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x64.Build.0 = Release|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x86.ActiveCfg = Release|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x86.Build.0 = Release|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|Any CPU.ActiveCfg = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|Any CPU.Build.0 = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x64.ActiveCfg = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x64.Build.0 = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x86.ActiveCfg = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x86.Build.0 = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|Any CPU.ActiveCfg = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|Any CPU.Build.0 = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x64.ActiveCfg = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x64.Build.0 = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x86.ActiveCfg = Debug|Any CPU
+		{30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x86.Build.0 = Debug|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {0118CC67-3FFA-4D59-B6DD-22E5138CDBBC}
+	EndGlobalSection
+EndGlobal

ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothTests.csproj

@@ -56,12 +56,9 @@
     </Otherwise>
   </Choose>
   <ItemGroup>
-    <Compile Include="ShimmerBluetoothReadData.cs" />
     <Compile Include="ShimmerBluetoothStreamingUnitTest.cs" />
     <Compile Include="ShimmerBluetoothCommandsUnitTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ShimmerTest.cs" />
-    <Compile Include="ShimmerReadDataPacketTest.cs" />
     <Compile Include="ShimmerECGMDConstructor.cs" />
   </ItemGroup>
   <ItemGroup>

ShimmerAPI/ShimmerUnitTests/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("ShimmerBluetoothTests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ShimmerBluetoothTests")]
+[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("f5dd4aa6-b826-49cb-96e2-a6dae01a1c47")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

ShimmerAPI/ShimmerUnitTests/ShimmerUnitTests.csproj

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{30C7273A-87CC-499F-9206-48F89082AE0C}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ShimmerBluetoothTests</RootNamespace>
+    <AssemblyName>ShimmerBluetoothTests</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+    <IsCodedUITest>False</IsCodedUITest>
+    <TestProjectType>UnitTest</TestProjectType>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.IO.Ports, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Ports.5.0.1\lib\net461\System.IO.Ports.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <Choose>
+    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
+      <ItemGroup>
+        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework">
+          <Private>False</Private>
+        </Reference>
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+  <ItemGroup>
+    <Compile Include="ShimmerBluetoothReadData.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ShimmerTest.cs" />
+    <Compile Include="ShimmerReadDataPacketTest.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ShimmerAPI\ShimmerAPI.csproj">
+      <Project>{6e320423-1d88-47ee-97ba-51113e538d33}</Project>
+      <Name>ShimmerAPI</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
+      <ItemGroup>
+        <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+      </ItemGroup>
+    </When>
+  </Choose>
+  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

ShimmerAPI/ShimmerUnitTests/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="System.IO.Ports" version="5.0.1" targetFramework="net472" />
+</packages>

ShimmerBLE/ShimmerBLEAPI/FodyWeavers.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
   <PropertyChanged />
-  <RealmWeaver />
 </Weavers>