microsoft
/
cpp_client_telemetry
зеркало из https://github.com/microsoft/cpp_client_telemetry.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

2nd round of Unit and Functional test fixes after refactor; plus add mocks for System

This commit is contained in:
Max Golovanov 2018-04-06 18:17:59 -07:00
Родитель a9ad03d1fe
Коммит 04b3db4135
44 изменённых файлов: 2321 добавлений и 1949 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

200
Solutions/AriaSDK.sln
Просмотреть файл

@ -35,10 +35,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\zlib\contrib\vst
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PAL", "PAL", "{34B3E59D-E740-4C23-ACEE-E94C80E83A18}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTestApp", "UnitTestApp\UnitTestApp.vcxproj", "{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win10-lib", "win10-lib\win10-lib.vcxproj", "{6A75748D-5D6B-48A5-83CB-F5F439133D59}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{EB2950D7-DF24-4079-BF8B-29338DD602A0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build-sdk", "build\build-sdk\build-sdk.vcxproj", "{7A9D3496-DA4E-4D1D-BC83-5527E865B8DF}"
@ -77,12 +73,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{A176E75D
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloAria", "..\examples\HelloAria\HelloAria.vcxproj", "{86AC752C-5687-4377-841E-943D9BEEF360}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FuncTests", "..\tests\functests\FuncTests.vcxproj", "{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "..\tests\unittests\UnitTests.vcxproj", "{434C594F-CDE0-3690-AC0A-9ED854B74092}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloAriaCS", "..\examples\HelloAriaCS\HelloAriaCS.csproj", "{65AFA0E2-F9A2-4309-87E7-E419D59583C1}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FuncTests", "..\tests\functests\FuncTests.vcxproj", "{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win10-lib", "win10-lib\win10-lib.vcxproj", "{7A75748D-5D6B-48A5-83CB-F5F439133D59}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
..\lib\pal\winrt\winrt.vcxitems*{10e9165b-49d1-4d1c-8248-334b9905b9cc}*SharedItemsImports = 9
@ -91,14 +89,16 @@ Global
Clienttelemetry\Clienttelemetry.vcxitems*{1dc6b38a-b390-34ce-907f-4958807a3d42}*SharedItemsImports = 4
..\lib\pal\win32\win32.vcxitems*{216a8e97-21f7-4bef-9e52-7f772c177c32}*SharedItemsImports = 4
Clienttelemetry\Clienttelemetry.vcxitems*{216a8e97-21f7-4bef-9e52-7f772c177c32}*SharedItemsImports = 4
..\lib\pal\win32\win32.vcxitems*{434c594f-cde0-3690-ac0a-9ed854b74092}*SharedItemsImports = 4
Clienttelemetry\Clienttelemetry.vcxitems*{434c594f-cde0-3690-ac0a-9ed854b74092}*SharedItemsImports = 4
Clienttelemetry\Clienttelemetry.vcxitems*{45d41acc-2c3c-43d2-bc10-02aa73ffc7c7}*SharedItemsImports = 9
..\lib\pal\winrt\winrt.vcxitems*{49077dbf-e363-4d2d-8334-636569a771b6}*SharedItemsImports = 4
..\lib\shared\Shared.vcxitems*{49077dbf-e363-4d2d-8334-636569a771b6}*SharedItemsImports = 4
Clienttelemetry\Clienttelemetry.vcxitems*{49077dbf-e363-4d2d-8334-636569a771b6}*SharedItemsImports = 4
..\lib\pal\winrt\winrt.vcxitems*{57a81ed9-5603-471f-afee-9656da74178d}*SharedItemsImports = 4
Clienttelemetry\Clienttelemetry.vcxitems*{57a81ed9-5603-471f-afee-9656da74178d}*SharedItemsImports = 4
..\lib\pal\winrt\winrt.vcxitems*{6a75748d-5d6b-48a5-83cb-f5f439133d59}*SharedItemsImports = 4
Clienttelemetry\Clienttelemetry.vcxitems*{6a75748d-5d6b-48a5-83cb-f5f439133d59}*SharedItemsImports = 4
..\lib\pal\winrt\winrt.vcxitems*{7a75748d-5d6b-48a5-83cb-f5f439133d59}*SharedItemsImports = 4
Clienttelemetry\Clienttelemetry.vcxitems*{7a75748d-5d6b-48a5-83cb-f5f439133d59}*SharedItemsImports = 4
..\lib\shared\Shared.vcxitems*{dc91621e-a203-42df-8e03-3a23dd0602b1}*SharedItemsImports = 4
..\lib\shared\Shared.vcxitems*{ef859326-2a11-481c-ae8c-03d754f1c412}*SharedItemsImports = 9
..\lib\pal\win32\win32.vcxitems*{fe79fb3a-b3ef-38df-b7a4-11277db72b39}*SharedItemsImports = 4
@ -437,83 +437,6 @@ Global
{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32
{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64
{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Debug.vs2013|ARM.ActiveCfg = Debug|ARM
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Debug.vs2013|Win32.ActiveCfg = Debug|Win32
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Debug.vs2013|x64.ActiveCfg = Debug|x64
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Debug.vs2015.MT-sqlite|ARM.ActiveCfg = Debug|ARM
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Debug.vs2015.MT-sqlite|ARM.Build.0 = Debug|ARM
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Debug.vs2015.MT-sqlite|ARM.Deploy.0 = Debug|ARM
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Debug.vs2015.MT-sqlite|Win32.ActiveCfg = Debug|Win32
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Debug.vs2015.MT-sqlite|Win32.Build.0 = Debug|Win32
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Debug.vs2015.MT-sqlite|Win32.Deploy.0 = Debug|Win32
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Debug.vs2015.MT-sqlite|x64.ActiveCfg = Debug|x64
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Debug.vs2015.MT-sqlite|x64.Build.0 = Debug|x64
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Debug.vs2015.MT-sqlite|x64.Deploy.0 = Debug|x64
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Debug|ARM.ActiveCfg = Debug|ARM
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Debug|ARM.Build.0 = Debug|ARM
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Debug|ARM.Deploy.0 = Debug|ARM
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Debug|Win32.ActiveCfg = Debug|Win32
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Debug|Win32.Build.0 = Debug|Win32
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Debug|Win32.Deploy.0 = Debug|Win32
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Debug|x64.ActiveCfg = Debug|x64
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Debug|x64.Build.0 = Debug|x64
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Debug|x64.Deploy.0 = Debug|x64
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Release.vs2013|ARM.ActiveCfg = Release|ARM
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Release.vs2013|Win32.ActiveCfg = Release|Win32
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Release.vs2013|x64.ActiveCfg = Release|x64
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Release.vs2015.MT-sqlite|ARM.ActiveCfg = Release|ARM
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Release.vs2015.MT-sqlite|ARM.Build.0 = Release|ARM
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Release.vs2015.MT-sqlite|ARM.Deploy.0 = Release|ARM
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Release.vs2015.MT-sqlite|Win32.ActiveCfg = Release|Win32
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Release.vs2015.MT-sqlite|Win32.Build.0 = Release|Win32
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Release.vs2015.MT-sqlite|Win32.Deploy.0 = Release|Win32
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Release.vs2015.MT-sqlite|x64.ActiveCfg = Release|x64
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Release.vs2015.MT-sqlite|x64.Build.0 = Release|x64
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Release.vs2015.MT-sqlite|x64.Deploy.0 = Release|x64
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Release|ARM.ActiveCfg = Release|ARM
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Release|ARM.Build.0 = Release|ARM
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Release|Win32.ActiveCfg = Release|Win32
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Release|Win32.Build.0 = Release|Win32
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Release|Win32.Deploy.0 = Release|Win32
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Release|x64.ActiveCfg = Release|x64
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Release|x64.Build.0 = Release|x64
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267}.Release|x64.Deploy.0 = Release|x64
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug.vs2013|ARM.ActiveCfg = Debug|ARM
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug.vs2013|ARM.Build.0 = Debug|ARM
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug.vs2013|Win32.ActiveCfg = Debug|Win32
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug.vs2013|Win32.Build.0 = Debug|Win32
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug.vs2013|x64.ActiveCfg = Debug|x64
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug.vs2013|x64.Build.0 = Debug|x64
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug.vs2015.MT-sqlite|ARM.ActiveCfg = Debug|ARM
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug.vs2015.MT-sqlite|ARM.Build.0 = Debug|ARM
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug.vs2015.MT-sqlite|Win32.ActiveCfg = Debug|Win32
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug.vs2015.MT-sqlite|Win32.Build.0 = Debug|Win32
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug.vs2015.MT-sqlite|x64.ActiveCfg = Debug|x64
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug.vs2015.MT-sqlite|x64.Build.0 = Debug|x64
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug|ARM.ActiveCfg = Debug|ARM
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug|ARM.Build.0 = Debug|ARM
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug|Win32.ActiveCfg = Debug|Win32
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug|Win32.Build.0 = Debug|Win32
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug|x64.ActiveCfg = Debug|x64
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug|x64.Build.0 = Debug|x64
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Release.vs2013|ARM.ActiveCfg = Release|ARM
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Release.vs2013|ARM.Build.0 = Release|ARM
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Release.vs2013|Win32.ActiveCfg = Release|Win32
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Release.vs2013|Win32.Build.0 = Release|Win32
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Release.vs2013|x64.ActiveCfg = Release|x64
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Release.vs2013|x64.Build.0 = Release|x64
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Release.vs2015.MT-sqlite|ARM.ActiveCfg = Release|ARM
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Release.vs2015.MT-sqlite|ARM.Build.0 = Release|ARM
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Release.vs2015.MT-sqlite|Win32.ActiveCfg = Release|Win32
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Release.vs2015.MT-sqlite|Win32.Build.0 = Release|Win32
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Release.vs2015.MT-sqlite|x64.ActiveCfg = Release|x64
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Release.vs2015.MT-sqlite|x64.Build.0 = Release|x64
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Release|ARM.ActiveCfg = Release|ARM
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Release|ARM.Build.0 = Release|ARM
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Release|Win32.ActiveCfg = Release|Win32
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Release|Win32.Build.0 = Release|Win32
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Release|x64.ActiveCfg = Release|x64
{6A75748D-5D6B-48A5-83CB-F5F439133D59}.Release|x64.Build.0 = Release|x64
{7A9D3496-DA4E-4D1D-BC83-5527E865B8DF}.Debug.vs2013|ARM.ActiveCfg = Debug|ARM
{7A9D3496-DA4E-4D1D-BC83-5527E865B8DF}.Debug.vs2013|ARM.Build.0 = Debug|ARM
{7A9D3496-DA4E-4D1D-BC83-5527E865B8DF}.Debug.vs2013|Win32.ActiveCfg = Debug|Win32
@ -718,40 +641,6 @@ Global
{86AC752C-5687-4377-841E-943D9BEEF360}.Release|Win32.Build.0 = Release|Win32
{86AC752C-5687-4377-841E-943D9BEEF360}.Release|x64.ActiveCfg = Release|x64
{86AC752C-5687-4377-841E-943D9BEEF360}.Release|x64.Build.0 = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.vs2013|ARM.ActiveCfg = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.vs2013|ARM.Build.0 = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.vs2013|Win32.ActiveCfg = Debug|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.vs2013|Win32.Build.0 = Debug|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.vs2013|x64.ActiveCfg = Debug|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.vs2013|x64.Build.0 = Debug|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.vs2015.MT-sqlite|ARM.ActiveCfg = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.vs2015.MT-sqlite|ARM.Build.0 = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.vs2015.MT-sqlite|Win32.ActiveCfg = Debug|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.vs2015.MT-sqlite|Win32.Build.0 = Debug|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.vs2015.MT-sqlite|x64.ActiveCfg = Debug|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.vs2015.MT-sqlite|x64.Build.0 = Debug|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug|ARM.ActiveCfg = Debug|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug|Win32.ActiveCfg = Debug|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug|Win32.Build.0 = Debug|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug|x64.ActiveCfg = Debug|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug|x64.Build.0 = Debug|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release.vs2013|ARM.ActiveCfg = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release.vs2013|ARM.Build.0 = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release.vs2013|Win32.ActiveCfg = Release|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release.vs2013|Win32.Build.0 = Release|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release.vs2013|x64.ActiveCfg = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release.vs2013|x64.Build.0 = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release.vs2015.MT-sqlite|ARM.ActiveCfg = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release.vs2015.MT-sqlite|ARM.Build.0 = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release.vs2015.MT-sqlite|Win32.ActiveCfg = Release|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release.vs2015.MT-sqlite|Win32.Build.0 = Release|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release.vs2015.MT-sqlite|x64.ActiveCfg = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release.vs2015.MT-sqlite|x64.Build.0 = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release|ARM.ActiveCfg = Release|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release|Win32.ActiveCfg = Release|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release|Win32.Build.0 = Release|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release|x64.ActiveCfg = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release|x64.Build.0 = Release|x64
{434C594F-CDE0-3690-AC0A-9ED854B74092}.Debug.vs2013|ARM.ActiveCfg = Release|x64
{434C594F-CDE0-3690-AC0A-9ED854B74092}.Debug.vs2013|ARM.Build.0 = Release|x64
{434C594F-CDE0-3690-AC0A-9ED854B74092}.Debug.vs2013|Win32.ActiveCfg = Debug|Win32
@ -818,6 +707,76 @@ Global
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Release|Win32.Build.0 = Release|x86
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Release|x64.ActiveCfg = Release|x64
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Release|x64.Build.0 = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.vs2013|ARM.ActiveCfg = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.vs2013|ARM.Build.0 = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.vs2013|Win32.ActiveCfg = Debug|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.vs2013|Win32.Build.0 = Debug|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.vs2013|x64.ActiveCfg = Debug|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.vs2013|x64.Build.0 = Debug|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.vs2015.MT-sqlite|ARM.ActiveCfg = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.vs2015.MT-sqlite|ARM.Build.0 = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.vs2015.MT-sqlite|Win32.ActiveCfg = Debug|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.vs2015.MT-sqlite|Win32.Build.0 = Debug|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.vs2015.MT-sqlite|x64.ActiveCfg = Debug|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.vs2015.MT-sqlite|x64.Build.0 = Debug|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug|ARM.ActiveCfg = Debug|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug|Win32.ActiveCfg = Debug|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug|Win32.Build.0 = Debug|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug|x64.ActiveCfg = Debug|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug|x64.Build.0 = Debug|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release.vs2013|ARM.ActiveCfg = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release.vs2013|ARM.Build.0 = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release.vs2013|Win32.ActiveCfg = Release|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release.vs2013|Win32.Build.0 = Release|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release.vs2013|x64.ActiveCfg = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release.vs2013|x64.Build.0 = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release.vs2015.MT-sqlite|ARM.ActiveCfg = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release.vs2015.MT-sqlite|ARM.Build.0 = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release.vs2015.MT-sqlite|Win32.ActiveCfg = Release|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release.vs2015.MT-sqlite|Win32.Build.0 = Release|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release.vs2015.MT-sqlite|x64.ActiveCfg = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release.vs2015.MT-sqlite|x64.Build.0 = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release|ARM.ActiveCfg = Release|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release|Win32.ActiveCfg = Release|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release|Win32.Build.0 = Release|Win32
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release|x64.ActiveCfg = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Release|x64.Build.0 = Release|x64
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug.vs2013|ARM.ActiveCfg = Debug|ARM
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug.vs2013|ARM.Build.0 = Debug|ARM
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug.vs2013|Win32.ActiveCfg = Debug|Win32
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug.vs2013|Win32.Build.0 = Debug|Win32
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug.vs2013|x64.ActiveCfg = Debug|x64
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug.vs2013|x64.Build.0 = Debug|x64
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug.vs2015.MT-sqlite|ARM.ActiveCfg = Debug|ARM
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug.vs2015.MT-sqlite|ARM.Build.0 = Debug|ARM
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug.vs2015.MT-sqlite|Win32.ActiveCfg = Debug|Win32
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug.vs2015.MT-sqlite|Win32.Build.0 = Debug|Win32
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug.vs2015.MT-sqlite|x64.ActiveCfg = Debug|x64
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug.vs2015.MT-sqlite|x64.Build.0 = Debug|x64
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug|ARM.ActiveCfg = Debug|ARM
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug|ARM.Build.0 = Debug|ARM
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug|Win32.ActiveCfg = Debug|Win32
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug|Win32.Build.0 = Debug|Win32
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug|x64.ActiveCfg = Debug|x64
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Debug|x64.Build.0 = Debug|x64
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Release.vs2013|ARM.ActiveCfg = Release|ARM
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Release.vs2013|ARM.Build.0 = Release|ARM
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Release.vs2013|Win32.ActiveCfg = Release|Win32
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Release.vs2013|Win32.Build.0 = Release|Win32
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Release.vs2013|x64.ActiveCfg = Release|x64
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Release.vs2013|x64.Build.0 = Release|x64
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Release.vs2015.MT-sqlite|ARM.ActiveCfg = Release|ARM
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Release.vs2015.MT-sqlite|ARM.Build.0 = Release|ARM
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Release.vs2015.MT-sqlite|Win32.ActiveCfg = Release|Win32
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Release.vs2015.MT-sqlite|Win32.Build.0 = Release|Win32
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Release.vs2015.MT-sqlite|x64.ActiveCfg = Release|x64
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Release.vs2015.MT-sqlite|x64.Build.0 = Release|x64
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Release|ARM.ActiveCfg = Release|ARM
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Release|ARM.Build.0 = Release|ARM
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Release|Win32.ActiveCfg = Release|Win32
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Release|Win32.Build.0 = Release|Win32
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Release|x64.ActiveCfg = Release|x64
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -828,15 +787,14 @@ Global
{5803295C-975F-43E5-A962-289153C0D6E4} = {250EFB82-2F0E-4781-94BB-8313201ABDF0}
{34681F0D-CE45-415D-B5F2-5C662DFE3BD5} = {A176E75D-5470-4D6E-A409-BDC950BE3AC4}
{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {A176E75D-5470-4D6E-A409-BDC950BE3AC4}
{C0578F2C-59B2-49D4-B3AA-C043F6AE5267} = {A176E75D-5470-4D6E-A409-BDC950BE3AC4}
{7A9D3496-DA4E-4D1D-BC83-5527E865B8DF} = {EB2950D7-DF24-4079-BF8B-29338DD602A0}
{39DBD601-4D79-49F9-AD18-065404DBA273} = {250EFB82-2F0E-4781-94BB-8313201ABDF0}
{A6CB242F-C3D4-473A-8BC2-95589A794C2A} = {250EFB82-2F0E-4781-94BB-8313201ABDF0}
{EF859326-2A11-481C-AE8C-03D754F1C412} = {34B3E59D-E740-4C23-ACEE-E94C80E83A18}
{86AC752C-5687-4377-841E-943D9BEEF360} = {250EFB82-2F0E-4781-94BB-8313201ABDF0}
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39} = {A176E75D-5470-4D6E-A409-BDC950BE3AC4}
{434C594F-CDE0-3690-AC0A-9ED854B74092} = {A176E75D-5470-4D6E-A409-BDC950BE3AC4}
{65AFA0E2-F9A2-4309-87E7-E419D59583C1} = {250EFB82-2F0E-4781-94BB-8313201ABDF0}
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39} = {A176E75D-5470-4D6E-A409-BDC950BE3AC4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {7EE8585B-C10F-4DAC-BDAF-3726EDF8FCD7}

2
Solutions/bondlite/tests/BondLiteUnitTests.vcxproj
Просмотреть файл

@ -108,7 +108,7 @@
</Midl>
<Link>
<AdditionalOptions> /machine:X86 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;$(ProjectDir)..\..\..\sysroot\lib\$(Configuration)\$(Platform)\gtestd.lib</AdditionalDependencies>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>Debug</GenerateDebugInformation>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

24
Solutions/lib/aria.vcxproj
Просмотреть файл

@ -71,7 +71,7 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AssemblerListingLocation>Debug/</AssemblerListingLocation>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<CompileAs>CompileAsCpp</CompileAs>
@ -89,10 +89,10 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>ARIASDK_PLATFORM_WINDOWS=1;WIN32;_WINDOWS;_DEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX=\"Aria\";CMAKE_INTDIR=\"Debug\";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Midl>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
<HeaderFileName>%(Filename).h</HeaderFileName>
<TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@ -105,7 +105,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AssemblerListingLocation>Release/</AssemblerListingLocation>
<CompileAs>CompileAsCpp</CompileAs>
<ExceptionHandling>Sync</ExceptionHandling>
@ -123,10 +123,10 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>ARIASDK_PLATFORM_WINDOWS=1;WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX=\"Aria\";CMAKE_INTDIR=\"Release\";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Midl>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
<HeaderFileName>%(Filename).h</HeaderFileName>
<TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@ -139,7 +139,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AssemblerListingLocation>Debug/</AssemblerListingLocation>
<CompileAs>CompileAsCpp</CompileAs>
<ExceptionHandling>Sync</ExceptionHandling>
@ -157,10 +157,10 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>ARIASDK_PLATFORM_WINDOWS=1;WIN32;_WINDOWS;_DEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX=\"Aria\";CMAKE_INTDIR=\"Debug\";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Midl>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
<HeaderFileName>%(Filename).h</HeaderFileName>
<TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@ -173,7 +173,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AssemblerListingLocation>Release/</AssemblerListingLocation>
<CompileAs>CompileAsCpp</CompileAs>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -190,10 +190,10 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>ARIASDK_PLATFORM_WINDOWS=1;WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX=\"Aria\";CMAKE_INTDIR=\"Release\";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Midl>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
<HeaderFileName>%(Filename).h</HeaderFileName>
<TypeLibraryName>%(Filename).tlb</TypeLibraryName>

4
Solutions/net40/net40.vcxproj
Просмотреть файл

@ -113,7 +113,7 @@
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_VERSION_PREFIX="Aria";ARIASDK_PLATFORM_WINDOWS=1;ARIASDK_SHARED_LIB=1;_ARIA_UTC_SDK;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\shared\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\shared\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAsManaged>true</CompileAsManaged>
<CompileAsWinRT>false</CompileAsWinRT>
@ -194,7 +194,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>false</IntrinsicFunctions>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_VERSION_PREFIX="Aria";ARIASDK_PLATFORM_WINDOWS=1;ARIASDK_SHARED_LIB=1;_ARIA_UTC_SDK;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\shared\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\shared\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAsManaged>true</CompileAsManaged>
<CompileAsWinRT>false</CompileAsWinRT>
<AssemblerOutput>All</AssemblerOutput>

12
Solutions/win10-cs/win10-cs.vcxproj
Просмотреть файл

@ -139,7 +139,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_PLATFORM_WINDOWS=1;ARIASDK_SHARED_LIB;_ARIA_UTC_SDK;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;ARIASDK_VERSION_PREFIX="Aria";ENABLE_ECSCLIENT;_ARIA_UTC_SDK;USE_SQLITE;WIN10_CS;_CRTDBG_MAP_ALLOC;_ARIA_UTC_SDK;USE_TIMERSHIM2;USE_SQLITE;WINAPI_FAMILY=WINAPI_FAMILY_APP;_WINRT_DLL;ARIASDK_SHARED_LIB;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\shared\include;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\shared\include;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CallingConvention>Cdecl</CallingConvention>
<BrowseInformation>true</BrowseInformation>
@ -168,7 +168,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_PLATFORM_WINDOWS=1;ARIASDK_SHARED_LIB;_ARIA_UTC_SDK;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;ARIASDK_VERSION_PREFIX="Aria";ENABLE_ECSCLIENT;_ARIA_UTC_SDK;USE_SQLITE;WIN10_CS;WINAPI_FAMILY=WINAPI_FAMILY_APP;_WINRT_DLL;ARIASDK_SHARED_LIB;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\shared\include;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\shared\include;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>MinSpace</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<CallingConvention>Cdecl</CallingConvention>
@ -193,7 +193,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_PLATFORM_WINDOWS=1;ARIASDK_SHARED_LIB;_ARIA_UTC_SDK;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;ARIASDK_VERSION_PREFIX="Aria";ENABLE_ECSCLIENT;_ARIA_UTC_SDK;USE_SQLITE;WIN10_CS;_ARIA_UTC_SDK;USE_TIMERSHIM2;USE_SQLITE;WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP;_WINRT_DLL;ARIASDK_SHARED_LIB;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\shared\include;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\shared\include;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CallingConvention>Cdecl</CallingConvention>
<CompileAsManaged>false</CompileAsManaged>
<ExceptionHandling>Async</ExceptionHandling>
@ -216,7 +216,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_PLATFORM_WINDOWS=1;ARIASDK_SHARED_LIB;_ARIA_UTC_SDK;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;ARIASDK_VERSION_PREFIX="Aria";ENABLE_ECSCLIENT;_ARIA_UTC_SDK;USE_SQLITE;WIN10_CS;WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP;_WINRT_DLL;ARIASDK_SHARED_LIB;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\shared\include;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\shared\include;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>MinSpace</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<CallingConvention>Cdecl</CallingConvention>
@ -241,7 +241,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_PLATFORM_WINDOWS=1;ARIASDK_SHARED_LIB;_ARIA_UTC_SDK;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;ARIASDK_VERSION_PREFIX="Aria";ENABLE_ECSCLIENT;_ARIA_UTC_SDK;USE_SQLITE;WIN10_CS;_ARIA_UTC_SDK;USE_TIMERSHIM2;USE_SQLITE;WINAPI_FAMILY=WINAPI_FAMILY_APP;_WINRT_DLL;ARIASDK_SHARED_LIB;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\shared\include;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\shared\include;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CallingConvention>Cdecl</CallingConvention>
<CompileAsManaged>false</CompileAsManaged>
@ -265,7 +265,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_PLATFORM_WINDOWS=1;ARIASDK_SHARED_LIB;_ARIA_UTC_SDK;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;ARIASDK_VERSION_PREFIX="Aria";ENABLE_ECSCLIENT;_ARIA_UTC_SDK;USE_SQLITE;WIN10_CS;WINAPI_FAMILY=WINAPI_FAMILY_APP;_WINRT_DLL;ARIASDK_SHARED_LIB;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\shared\include;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\shared\include;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>MinSpace</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<CallingConvention>Cdecl</CallingConvention>

155
Solutions/win10-lib/win10-lib.vcxproj
Просмотреть файл

@ -27,9 +27,10 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{6a75748d-5d6b-48a5-83cb-f5f439133d59}</ProjectGuid>
<ProjectGuid>{7a75748d-5d6b-48a5-83cb-f5f439133d59}</ProjectGuid>
<Keyword>StaticLibrary</Keyword>
<RootNamespace>win10-lib</RootNamespace>
<ProjectName>win10-lib</ProjectName>
<RootNamespace>Microsoft.Applications.Telemetry.Windows</RootNamespace>
<DefaultLanguage>en-US</DefaultLanguage>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
@ -80,146 +81,208 @@
<Import Project="..\Clienttelemetry\Clienttelemetry.vcxitems" Label="Shared" />
<Import Project="..\..\lib\pal\winrt\winrt.vcxitems" Label="Shared" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros">
<OutDir>$(ProjectDir)..\out\$(Configuration)\$(Platform)\$(ProjectName)\</OutDir>
<IntDir>$(ProjectDir)..\out\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>Microsoft.Applications.Telemetry.Windows-native</TargetName>
<IncludePath>$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(SolutionDir)\..\lib\shared\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
<LibraryPath>%(AdditionalLibraryDirectories);$(AriaDepsLibPath)\zlib;$(LibraryPath);$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>Microsoft.Applications.Telemetry.Windows-native</TargetName>
<IncludePath>$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(SolutionDir)\..\lib\shared\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
<LibraryPath>%(AdditionalLibraryDirectories);$(AriaDepsLibPath)\zlib;$(LibraryPath);$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>Microsoft.Applications.Telemetry.Windows-native</TargetName>
<IncludePath>$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(SolutionDir)\..\lib\shared\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
<LibraryPath>%(AdditionalLibraryDirectories);$(AriaDepsLibPath)\zlib;$(LibraryPath);$(VC_LibraryPath_ARM);$(WindowsSDK_LibraryPath_ARM);$(NETFXKitsDir)Lib\um\arm</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>Microsoft.Applications.Telemetry.Windows-native</TargetName>
<IncludePath>$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(SolutionDir)\..\lib\shared\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
<LibraryPath>%(AdditionalLibraryDirectories);$(AriaDepsLibPath)\zlib;$(LibraryPath);$(VC_LibraryPath_ARM);$(WindowsSDK_LibraryPath_ARM);$(NETFXKitsDir)Lib\um\arm</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>Microsoft.Applications.Telemetry.Windows-native</TargetName>
<IncludePath>$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(SolutionDir)\..\lib\shared\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
<LibraryPath>%(AdditionalLibraryDirectories);$(AriaDepsLibPath)\zlib;$(LibraryPath);$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>Microsoft.Applications.Telemetry.Windows-native</TargetName>
<IncludePath>$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(SolutionDir)\..\lib\shared\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
<LibraryPath>%(AdditionalLibraryDirectories);$(AriaDepsLibPath)\zlib;$(LibraryPath);$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\zlib;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_VERSION_PREFIX="Aria";ARIASDK_PLATFORM_WINDOWS=1;ARIASDK_STATIC_LIB;_ARIA_UTC_SDK;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CallingConvention>Cdecl</CallingConvention>
<BrowseInformation>true</BrowseInformation>
<ExceptionHandling>Async</ExceptionHandling>
<WarningLevel>Level4</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>
<PreprocessorDefinitions>ZLIB_WINAPI;ARIASDK_PLATFORM_WINDOWS=1;ARIASDK_STATIC_LIB;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="Aria";WINAPI_FAMILY=WINAPI_FAMILY_APP;_WINRT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<GenerateWindowsMetadata>true</GenerateWindowsMetadata>
<AdditionalDependencies>zlib.lib;WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<DelayLoadDLLs>
</DelayLoadDLLs>
<IgnoreSpecificDefaultLibraries>NCrypt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<AdditionalLibraryDirectories>$(AriaDepsLibPath)\zlib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<Bscmake>
<PreserveSbr>true</PreserveSbr>
</Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\zlib;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_VERSION_PREFIX="Aria";ARIASDK_PLATFORM_WINDOWS=1;ARIASDK_STATIC_LIB;_ARIA_UTC_SDK;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>MinSpace</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<CallingConvention>Cdecl</CallingConvention>
<ExceptionHandling>Async</ExceptionHandling>
<WarningLevel>Level4</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>
<PreprocessorDefinitions>ZLIB_WINAPI;ARIASDK_PLATFORM_WINDOWS=1;ARIASDK_STATIC_LIB;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="Aria";WINAPI_FAMILY=WINAPI_FAMILY_APP;_WINRT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<GenerateWindowsMetadata>true</GenerateWindowsMetadata>
<AdditionalDependencies>zlib.lib;WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries>NCrypt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateMapFile>true</GenerateMapFile>
<AdditionalLibraryDirectories>$(AriaDepsLibPath)\zlib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\zlib;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_VERSION_PREFIX="Aria";ARIASDK_PLATFORM_WINDOWS=1;ARIASDK_STATIC_LIB;_ARIA_UTC_SDK;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CallingConvention>Cdecl</CallingConvention>
<ExceptionHandling>Async</ExceptionHandling>
<WarningLevel>Level4</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>
<PreprocessorDefinitions>ZLIB_WINAPI;ARIASDK_PLATFORM_WINDOWS=1;ARIASDK_STATIC_LIB;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="Aria";WINAPI_FAMILY=WINAPI_FAMILY_APP;_WINRT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<GenerateWindowsMetadata>true</GenerateWindowsMetadata>
<AdditionalDependencies>zlib.lib;WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<DelayLoadDLLs>
</DelayLoadDLLs>
<IgnoreSpecificDefaultLibraries>Ole32;NCrypt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<AdditionalLibraryDirectories>$(AriaDepsLibPath)\zlib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\zlib;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_VERSION_PREFIX="Aria";ARIASDK_PLATFORM_WINDOWS=1;ARIASDK_STATIC_LIB;_ARIA_UTC_SDK;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>MinSpace</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<CallingConvention>Cdecl</CallingConvention>
<ExceptionHandling>Async</ExceptionHandling>
<WarningLevel>Level4</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>
<PreprocessorDefinitions>ZLIB_WINAPI;ARIASDK_PLATFORM_WINDOWS=1;ARIASDK_STATIC_LIB;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="Aria";WINAPI_FAMILY=WINAPI_FAMILY_APP;_WINRT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<GenerateWindowsMetadata>true</GenerateWindowsMetadata>
<AdditionalDependencies>zlib.lib;WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<DelayLoadDLLs>
</DelayLoadDLLs>
<IgnoreSpecificDefaultLibraries>Ole32;NCrypt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateMapFile>true</GenerateMapFile>
<AdditionalLibraryDirectories>$(AriaDepsLibPath)\zlib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\zlib;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>ZLIB_WINAPI;ARIASDK_PLATFORM_WINDOWS=1;ARIASDK_STATIC_LIB;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="Aria";WINAPI_FAMILY=WINAPI_FAMILY_APP;_WINRT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_VERSION_PREFIX="Aria";ARIASDK_PLATFORM_WINDOWS=1;ARIASDK_STATIC_LIB;_ARIA_UTC_SDK;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CallingConvention>Cdecl</CallingConvention>
<ExceptionHandling>Async</ExceptionHandling>
<WarningLevel>Level4</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<GenerateWindowsMetadata>true</GenerateWindowsMetadata>
<AdditionalDependencies>zlib.lib;WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<DelayLoadDLLs>
</DelayLoadDLLs>
<IgnoreSpecificDefaultLibraries>NCrypt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<AdditionalLibraryDirectories>$(AriaDepsLibPath)\zlib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\zlib;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_VERSION_PREFIX="Aria";ARIASDK_PLATFORM_WINDOWS=1;ARIASDK_STATIC_LIB;_ARIA_UTC_SDK;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>MinSpace</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<CallingConvention>Cdecl</CallingConvention>
<ExceptionHandling>Async</ExceptionHandling>
<WarningLevel>Level4</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>
<PreprocessorDefinitions>ZLIB_WINAPI;ARIASDK_PLATFORM_WINDOWS=1;ARIASDK_STATIC_LIB;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="Aria";WINAPI_FAMILY=WINAPI_FAMILY_APP;_WINRT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<GenerateWindowsMetadata>true</GenerateWindowsMetadata>
<AdditionalDependencies>zlib.lib;WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<DelayLoadDLLs>
</DelayLoadDLLs>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateMapFile>true</GenerateMapFile>
<AdditionalLibraryDirectories>$(AriaDepsLibPath)\zlib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="targetver.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\sqliteUWP\sqlite-uwp.vcxproj">
<Project>{6883a688-89f5-424a-9bfa-50d42f691b29}</Project>
</ProjectReference>
<ProjectReference Include="..\..\zlib\contrib\vstudio\vc14\zlibvc.vcxproj">
<Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(SolutionDir)\build.props" Condition="Exists('$(SolutionDir)\build.props')" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

2
Solutions/win32-dll/win32-dll.vcxproj
Просмотреть файл

@ -86,7 +86,7 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros">
<AdditionalIncludeDirectories Condition="'$(RunOACR)'=='Yes'">$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\sysroot\include;$(ProjectDir)..\..\lib\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(RunOACR)'=='Yes'">$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<IncludePath Condition="'$(RunOACR)'!='Yes'">$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(WindowsSdk_71A_IncludePath);C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\include\;$(VC_IncludePath);$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup>

2
Solutions/win32-lib/win32-lib.vcxproj
Просмотреть файл

@ -77,7 +77,7 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros">
<AdditionalIncludeDirectories Condition="'$(RunOACR)'=='Yes'">$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\sysroot\include;$(ProjectDir)..\..\lib\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(RunOACR)'=='Yes'">$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<IncludePath Condition="'$(RunOACR)'!='Yes'">$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(WindowsSdk_71A_IncludePath);C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\include\;$(VC_IncludePath);$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup>

4
Solutions/win32-static/win32-static.vcxproj
Просмотреть файл

@ -117,7 +117,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_ARIA_UTC_SDK;NO_ROAM_SUP;USE_TIMERSHIM2;USE_SQLITE;_WIN32_WINNT=0x0601;ARIASDK_SHARED_LIB;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\include;..\..\src;..\..\internal;..\..\common;..\..\..\sysroot\$(QBConfigId)\include;..\..\src\SemanticApi\src\datamodel;..\..\src\SemanticApi\physical\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..;..\..\include;..\..\src;..\..\internal;..\..\common;..\..\src\SemanticApi\src\datamodel;..\..\src\SemanticApi\physical\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
@ -194,7 +194,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>false</IntrinsicFunctions>
<PreprocessorDefinitions>_ARIA_UTC_SDK;NO_ROAM_SUP;USE_TIMERSHIM2;USE_SQLITE;_WIN32_WINNT=0x0601;ARIASDK_SHARED_LIB;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\include;..\..\src;..\..\internal;..\..\common;..\..\..\sysroot\$(QBConfigId)\include;..\..\src\SemanticApi\src\datamodel;..\..\src\SemanticApi\physical\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..;..\..\include;..\..\src;..\..\internal;..\..\common;..\..\src\SemanticApi\src\datamodel;..\..\src\SemanticApi\physical\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAsManaged>false</CompileAsManaged>
<CompileAsWinRT>false</CompileAsWinRT>
<AssemblerOutput>NoListing</AssemblerOutput>

2
lib/config/RuntimeConfig_Default.hpp
Просмотреть файл

@ -36,7 +36,7 @@ namespace ARIASDK_NS_BEGIN {
},
{ "http",
{
{ "compress", false}
{ "compress", true} // false}
}
},
{ "tpm",

197
tests/common/Common.cpp
Просмотреть файл

@ -1,62 +1,175 @@
// Copyright (c) Microsoft. All rights reserved.
#include "Common.hpp"
#include "zlib.h"
namespace testing {
ARIASDK_LOG_INST_COMPONENT_NS("Testing", "Unit testing helpers");
ARIASDK_LOG_INST_COMPONENT_NS("Testing", "Unit testing helpers");
AriaProtocol::Value toAriaProtocolValue(std::string val)
{
AriaProtocol::Value temp;
temp.stringValue = val;
return temp;
}
AriaProtocol::Value toAriaProtocolValue(std::string val)
{
AriaProtocol::Value temp;
temp.stringValue = val;
return temp;
}
AriaProtocol::Value toAriaProtocolValue(bool val)
{
AriaProtocol::Value temp;
temp.type = AriaProtocol::ValueBool;
temp.longValue = val;
return temp;
}
AriaProtocol::Value toAriaProtocolValue(bool val)
{
AriaProtocol::Value temp;
temp.type = AriaProtocol::ValueBool;
temp.longValue = val;
return temp;
}
AriaProtocol::Value toAriaProtocolValue(double val)
{
AriaProtocol::Value temp;
temp.type = AriaProtocol::ValueDouble;
temp.doubleValue = val;
return temp;
}
AriaProtocol::Value toAriaProtocolValue(double val)
{
AriaProtocol::Value temp;
temp.type = AriaProtocol::ValueDouble;
temp.doubleValue = val;
return temp;
}
AriaProtocol::Value toAriaProtocolValue(int64_t val)
{
AriaProtocol::Value temp;
temp.type = AriaProtocol::ValueInt64;
temp.longValue = val;
return temp;
}
AriaProtocol::Value toAriaProtocolValue(int64_t val)
{
AriaProtocol::Value temp;
temp.type = AriaProtocol::ValueInt64;
temp.longValue = val;
return temp;
}
AriaProtocol::Value toAriaProtocolValue(uint64_t val)
{
AriaProtocol::Value temp;
temp.type = AriaProtocol::ValueArrayUInt64;
temp.longValue = val;
return temp;
}
AriaProtocol::Value toAriaProtocolValue(uint64_t val)
{
AriaProtocol::Value temp;
temp.type = AriaProtocol::ValueArrayUInt64;
temp.longValue = val;
return temp;
}
AriaProtocol::Value toAriaProtocolValue(Microsoft::Applications::Events::EventLatency val)
{
AriaProtocol::Value temp;
temp.type = AriaProtocol::ValueArrayInt32;
temp.longValue = (int)val;
return temp;
}
AriaProtocol::Value toAriaProtocolValue(Microsoft::Applications::Events::EventLatency val)
{
AriaProtocol::Value temp;
temp.type = AriaProtocol::ValueArrayInt32;
temp.longValue = (int)val;
return temp;
}
/// <summary>
/// Compress buffer from source to dest.
/// </summary>
/// <param name="source"></param>
/// <param name="sourceLen"></param>
/// <param name="dest"></param>
/// <param name="destLen"></param>
/// <param name="prependSize"></param>
/// <returns></returns>
bool Compress(const char* source, size_t sourceLen, char** dest, size_t& destLen, bool prependSize)
{
if ((!source) || (!sourceLen))
return false;
*dest = NULL;
destLen = 0;
// Compressing variables
uLong compSize = compressBound((uLong)sourceLen);
// Allocate memory for the new compressed buffer
size_t reserved = ((unsigned)prependSize * sizeof(uint32_t));
char* compBody = new char[std::max(compSize, ((uLong)sourceLen)) + reserved];
if (compBody != NULL)
{
if (prependSize)
{
// Remember source uncompressed size if requested
uint32_t *s = (uint32_t*)(compBody);
(*s) = (uint32_t)sourceLen; // truncate this to 32-bit, we do not support 3+ TB blobs
}
// Deflate
int res = compress2((Bytef *)(compBody + reserved), &compSize, (Bytef *)source, (uLong)sourceLen, Z_BEST_SPEED);
if (res != Z_OK)
{
LOG_ERROR("Compression failed, error=%u", res);
delete[] compBody;
compBody = NULL;
return false;
}
else
{
*dest = compBody;
destLen = compSize + reserved;
return true;
}
}
// OOM
return false;
}
/// <summary>
/// Expand buffer from source to dest.
/// </summary>
/// <param name="source"></param>
/// <param name="sourceLen"></param>
/// <param name="dest"></param>
/// <param name="destLen"></param>
/// <param name="sizeAtZeroIndex"></param>
/// <returns></returns>
bool Expand(const char* source, size_t sourceLen, char** dest, size_t& destLen, bool sizeAtZeroIndex)
{
if (!(source) || !(sourceLen))
return false;
*dest = NULL;
unsigned reserved = (unsigned)sizeAtZeroIndex * sizeof(uint32_t);
// Get uncompressed size at zero offset.
if (sizeAtZeroIndex)
{
uint32_t s32 = *((uint32_t*)(source));
uint64_t s64 = (sourceLen >= sizeof(uint64_t)) ? *((uint64_t*)(source)) : 0;
// If we are reading 64-bit generated legacy DB, step 32-bit forward to
// skip zero-padding in most-significant DWORD on Intel architecture
if ((s64 - s32) == 0)
reserved += sizeof(uint32_t);
destLen = s32;
}
// Allocate memory for the new uncompressed buffer
if (destLen > 0)
{
try {
char* decompBody = new char[destLen];
if (source != NULL)
{
// Inflate
uLongf len = (uLongf)destLen;
int res = uncompress((Bytef *)decompBody, &len, (const Bytef *)(source + reserved), (uLong)(sourceLen - reserved));
if ((res != Z_OK) || (len != destLen))
{
printf/*LOG_ERROR*/("Decompression failed, error=%d, len=%u, destLen=%u", res, len, destLen);
delete[] decompBody;
return false;
}
*dest = decompBody;
destLen = len;
return true;
}
}
catch (std::bad_alloc& ex) {
(ex);
LOG_ERROR("Decompression failed (out of memory): destLen=%u", destLen);
dest = NULL;
destLen = 0;
}
}
// OOM
return false;
}
} // namespace testing

69
tests/common/Common.hpp
Просмотреть файл

@ -13,50 +13,57 @@
#include <sstream>
#include <vector>
#include <system/ITelemetrySystem.hpp>
namespace testing {
ARIASDK_LOG_DECL_COMPONENT_NS();
extern const char *getAriaSdkLogComponent();
const int DELAY_FACTOR_FOR_SERVER = 567;
extern MAT::ITelemetrySystem & getSystem();
class OutsideSequence {
public:
OutsideSequence() { swap(); }
~OutsideSequence() { swap(); }
const int DELAY_FACTOR_FOR_SERVER = 567;
protected:
void swap() { std::swap(sequence, *testing::internal::g_gmock_implicit_sequence.pointer()); }
testing::Sequence* sequence = nullptr;
};
class OutsideSequence {
public:
OutsideSequence() { swap(); }
~OutsideSequence() { swap(); }
AriaProtocol::Value toAriaProtocolValue(std::string val);
AriaProtocol::Value toAriaProtocolValue(bool val);
AriaProtocol::Value toAriaProtocolValue(double val);
AriaProtocol::Value toAriaProtocolValue(int64_t val);
AriaProtocol::Value toAriaProtocolValue(uint64_t val);
AriaProtocol::Value toAriaProtocolValue(Microsoft::Applications::Events::EventLatency val);
protected:
void swap() { std::swap(sequence, *testing::internal::g_gmock_implicit_sequence.pointer()); }
testing::Sequence* sequence = nullptr;
};
AriaProtocol::Value toAriaProtocolValue(std::string val);
AriaProtocol::Value toAriaProtocolValue(bool val);
AriaProtocol::Value toAriaProtocolValue(double val);
AriaProtocol::Value toAriaProtocolValue(int64_t val);
AriaProtocol::Value toAriaProtocolValue(uint64_t val);
AriaProtocol::Value toAriaProtocolValue(Microsoft::Applications::Events::EventLatency val);
MATCHER_P(BinaryHasSubstr, str, "")
{
std::string haystack(reinterpret_cast<char const*>(arg.data()), arg.size());
return Matches(HasSubstr(str))(haystack);
}
MATCHER_P(BinaryHasSubstr, str, "")
{
std::string haystack(reinterpret_cast<char const*>(arg.data()), arg.size());
return Matches(HasSubstr(str))(haystack);
}
#pragma warning( push )
#pragma warning(disable: 4100)
MATCHER_P2(Near, value, range, "")
{
UNREFERENCED_PARAMETER(result_listener);
return (abs(arg - value) <= range);
}
MATCHER_P2(Near, value, range, "")
{
UNREFERENCED_PARAMETER(result_listener);
return (abs(arg - value) <= range);
}
#pragma warning( pop )
MATCHER_P(StrAsIntGt, value, "")
{
UNREFERENCED_PARAMETER(result_listener);
return std::stoi(arg) > value;
}
MATCHER_P(StrAsIntGt, value, "")
{
UNREFERENCED_PARAMETER(result_listener);
return std::stoi(arg) > value;
}
bool Compress(const char* source, size_t sourceLen, char** dest, size_t& destLen, bool prependSize);
bool Expand(const char* source, size_t sourceLen, char** dest, size_t& destLen, bool sizeAtZeroIndex);
} // namespace testing

1
tests/common/HttpServer.hpp
Просмотреть файл

@ -5,7 +5,6 @@
namespace testing {
// Simple HTTP server
// Goals:
// - Support enough of HTTP to be used as a mock

2
tests/common/MockILocalStorageReader.hpp
Просмотреть файл

@ -1,3 +1,4 @@
#if 0
// Copyright (c) Microsoft. All rights reserved.
#pragma once
@ -39,3 +40,4 @@ namespace testing
}
};
} // namespace testing
#endif

39
tests/common/MockIRuntimeConfig.hpp Normal file
Просмотреть файл

@ -0,0 +1,39 @@
// Copyright (c) Microsoft. All rights reserved.
#pragma once
#include <api/IRuntimeConfig.hpp>
namespace testing {
class MockIRuntimeConfig : public ARIASDK_NS::IRuntimeConfig {
public:
MockIRuntimeConfig();
virtual ~MockIRuntimeConfig();
MOCK_METHOD1(SetDefaultConfig, void(IRuntimeConfig &));
MOCK_METHOD3(DecorateEvent, void(std::map<std::string, std::string> &, std::string const &, std::string const &));
MOCK_METHOD0(GetCollectorUrl, std::string());
MOCK_METHOD0(GetMetaStatsTenantToken, std::string());
MOCK_METHOD2(GetEventLatency, ARIASDK_NS::EventLatency(std::string const &, std::string const &));
MOCK_METHOD0(GetMetaStatsSendIntervalSec, unsigned());
MOCK_METHOD0(GetOfflineStorageMaximumSizeBytes, unsigned());
MOCK_METHOD0(GetOfflineStorageResizeThresholdPct, unsigned());
MOCK_METHOD0(GetMaximumRetryCount, unsigned());
MOCK_METHOD0(GetUploadRetryBackoffConfig, std::string());
MOCK_METHOD0(IsHttpRequestCompressionEnabled, bool());
MOCK_METHOD0(GetMinimumUploadBandwidthBps, unsigned());
MOCK_METHOD0(GetMaximumUploadSizeBytes, unsigned());
MOCK_METHOD3(SetEventLatency, void(std::string const &, std::string const &, ARIASDK_NS::EventLatency));
MOCK_METHOD0(GetTeardownTime, uint32_t());
MOCK_METHOD0(IsClockSkewEnabled, bool());
// FIXME: Google Mock doesn't support operators
virtual ARIASDK_NS::Variant & operator[](const char* key)
{
return (*this)[key];
};
};
} // namespace testing

35
tests/common/MockITelemetrySystem.hpp Normal file
Просмотреть файл

@ -0,0 +1,35 @@
// Copyright (c) Microsoft. All rights reserved.
#pragma once
#include <system/ITelemetrySystem.hpp>
using namespace MAT;
namespace testing {
class MockITelemetrySystem : public ITelemetrySystem {
public:
MockITelemetrySystem() {};
virtual ~MockITelemetrySystem() {};
MOCK_METHOD0(start, void());
MOCK_METHOD0(stop, void());
MOCK_METHOD0(pause, void());
MOCK_METHOD0(resume, void());
MOCK_METHOD0(upload, void());
MOCK_METHOD0(getLogManager, ILogManager&());
MOCK_METHOD0(getConfig, IRuntimeConfig&());
MOCK_METHOD0(getContext, ISemanticContext&());
MOCK_METHOD1(DispatchEvent, bool(DebugEvent evt));
MOCK_METHOD1(sendEvent, void(IncomingEventContextPtr const& event));
MOCK_METHOD0(startAsync, void());
MOCK_METHOD0(stopAsync, void());
MOCK_METHOD0(handleFlushWorkerThread, void());
MOCK_METHOD0(signalDone, void());
MOCK_METHOD0(pauseAsync, void());
MOCK_METHOD0(resumeAsync, void());
MOCK_METHOD1(handleIncomingEventPrepared, void(IncomingEventContextPtr const& event));
MOCK_METHOD1(preparedIncomingEventAsync, void(IncomingEventContextPtr const& event));
};
} // namespace ARIASDK_NS_BEGIN

49
tests/common/Mocks.cpp
Просмотреть файл

@ -4,49 +4,58 @@
#include "MockILogManagerInternal.hpp"
#include "MockIOfflineStorage.hpp"
#include "MockIOfflineStorageObserver.hpp"
#include "MockIRuntimeConfig.hpp"
#include "MockISemanticContext.hpp"
#include "MockISqlite3Proxy.hpp"
#include "MockITelemetrySystem.hpp"
#ifdef ARIASDK_PAL_SKYPE
#include "MockIEcsClient.hpp"
#include "MockIEcsClient.hpp"
#endif
namespace testing {
// Constructors and destructors of mock classes are compiled separately
// to speed up compilation. See GMock documentation for the rationale:
// https://github.com/google/googlemock/blob/master/googlemock/docs/CookBook.md#making-the-compilation-faster
// Constructors and destructors of mock classes are compiled separately
// to speed up compilation. See GMock documentation for the rationale:
// https://github.com/google/googlemock/blob/master/googlemock/docs/CookBook.md#making-the-compilation-faster
MockIHttpClient::MockIHttpClient() {}
MockIHttpClient::~MockIHttpClient() {}
MockIHttpClient::MockIHttpClient() {}
MockIHttpClient::~MockIHttpClient() {}
MockILogManagerInternal::MockILogManagerInternal() {}
MockILogManagerInternal::~MockILogManagerInternal() {}
MockILogManagerInternal::MockILogManagerInternal() {}
MockILogManagerInternal::~MockILogManagerInternal() {}
MockIOfflineStorageObserver::MockIOfflineStorageObserver() {}
MockIOfflineStorageObserver::~MockIOfflineStorageObserver() {}
MockIOfflineStorageObserver::MockIOfflineStorageObserver() {}
MockIOfflineStorageObserver::~MockIOfflineStorageObserver() {}
MockIOfflineStorage::MockIOfflineStorage() {}
MockIOfflineStorage::~MockIOfflineStorage() {}
MockIOfflineStorage::MockIOfflineStorage() {}
MockIOfflineStorage::~MockIOfflineStorage() {}
MockISemanticContext::MockISemanticContext() {}
MockISemanticContext::~MockISemanticContext() {}
MockIRuntimeConfig::MockIRuntimeConfig() {}
MockIRuntimeConfig::~MockIRuntimeConfig() {}
MockISqlite3Proxy::MockISqlite3Proxy() {}
MockISqlite3Proxy::~MockISqlite3Proxy() {}
MockISemanticContext::MockISemanticContext() {}
MockISemanticContext::~MockISemanticContext() {}
MockISqlite3Proxy::MockISqlite3Proxy() {}
MockISqlite3Proxy::~MockISqlite3Proxy() {}
#ifdef ARIASDK_PAL_SKYPE
MockIEcsConfig::MockIEcsConfig() {}
MockIEcsConfig::~MockIEcsConfig() {}
MockIEcsConfig::MockIEcsConfig() {}
MockIEcsConfig::~MockIEcsConfig() {}
MockIEcsClient::MockIEcsClient() {}
MockIEcsClient::~MockIEcsClient() {}
MockIEcsClient::MockIEcsClient() {}
MockIEcsClient::~MockIEcsClient() {}
#endif
ITelemetrySystem& getSystem()
{
static testing::MockITelemetrySystem system;
return system;
}
} // namespace testing

1006
tests/common/SocketTools.hpp
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

73
tests/functests/FuncTests.vcxproj
Просмотреть файл

@ -18,6 +18,20 @@
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\googletest\googlemock\msvc\2015\gmock.vcxproj">
<Project>{34681f0d-ce45-415d-b5f2-5c662dfe3bd5}</Project>
</ProjectReference>
<ProjectReference Include="..\..\googletest\googletest\msvc\gtest.vcxproj">
<Project>{c8f6c172-56f2-4e76-b5fa-c3b423b31be7}</Project>
</ProjectReference>
<ProjectReference Include="..\..\sqlite\sqlite.vcxproj">
<Project>{2ebc7b3c-2af1-442c-9285-cab39bbb8c00}</Project>
</ProjectReference>
<ProjectReference Include="..\..\zlib\contrib\vstudio\vc14\zlibvc.vcxproj">
<Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
</ProjectReference>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGUID>{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}</ProjectGUID>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
@ -80,6 +94,11 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
</PropertyGroup>
<PropertyGroup>
<LibraryPath>$(LibraryPath)</LibraryPath>
<IncludePath>$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(WindowsSdk_71A_IncludePath);$(VC_IncludePath);$(IncludePath)</IncludePath>
<ExcludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86);$(VC_LibraryPath_x64);</ExcludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\googletest\googletest\include;$(ProjectDir)..\..\googletest\googlemock\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -94,16 +113,16 @@
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level4</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="OneSDK";CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;_WINDOWS;_DEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="OneSDK";CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName>
<TreatWarningAsError>true</TreatWarningAsError>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX=\"Aria\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Midl>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
<HeaderFileName>%(Filename).h</HeaderFileName>
<TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@ -116,15 +135,13 @@
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>Debug</GenerateDebugInformation>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ImportLibrary>$(ProjectDir)..\..\out\obj\FuncTests.dir\$(Configuration)\$(Platform)\FuncTests.lib</ImportLibrary>
<ProgramDataBaseFile>$(ProjectDir)..\..\out\obj\FuncTests.dir\$(Configuration)\$(Platform)\FuncTests.pdb</ProgramDataBaseFile>
<SubSystem>Console</SubSystem>
<Version>
</Version>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
</Link>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
</ProjectReference>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -139,7 +156,7 @@
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level4</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="OneSDK";CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="OneSDK";CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName>
<DebugInformationFormat>
</DebugInformationFormat>
@ -147,10 +164,10 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX=\"Aria\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Midl>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
<HeaderFileName>%(Filename).h</HeaderFileName>
<TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@ -163,15 +180,13 @@
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>No</GenerateDebugInformation>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ImportLibrary>$(ProjectDir)/Release/FuncTests.lib</ImportLibrary>
<ProgramDataBaseFile>$(ProjectDir)/Release/FuncTests.pdb</ProgramDataBaseFile>
<SubSystem>Console</SubSystem>
<Version>
</Version>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
</Link>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
</ProjectReference>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -186,7 +201,7 @@
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level4</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="OneSDK";CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="OneSDK";CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName>
<DebugInformationFormat>
</DebugInformationFormat>
@ -194,10 +209,10 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX=\"Aria\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Midl>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
<HeaderFileName>%(Filename).h</HeaderFileName>
<TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@ -210,15 +225,13 @@
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>No</GenerateDebugInformation>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ImportLibrary>$(ProjectDir)..\..\out\obj\FuncTests.dir\$(Configuration)\$(Platform)\FuncTests.lib</ImportLibrary>
<ProgramDataBaseFile>$(ProjectDir)..\..\out\obj\FuncTests.dir\$(Configuration)\$(Platform)\FuncTests.pdb</ProgramDataBaseFile>
<SubSystem>Console</SubSystem>
<Version>
</Version>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
</Link>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
</ProjectReference>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -234,16 +247,16 @@
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level4</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="OneSDK";CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="OneSDK";CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName>
<TreatWarningAsError>true</TreatWarningAsError>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX=\"Aria\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Midl>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
<HeaderFileName>%(Filename).h</HeaderFileName>
<TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@ -256,15 +269,13 @@
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>Debug</GenerateDebugInformation>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ImportLibrary>$(ProjectDir)/Release/FuncTests.lib</ImportLibrary>
<ProgramDataBaseFile>$(ProjectDir)/Release/FuncTests.pdb</ProgramDataBaseFile>
<SubSystem>Console</SubSystem>
<Version>
</Version>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
</Link>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
</ProjectReference>
</ItemDefinitionGroup>
<ItemGroup>
@ -289,20 +300,6 @@
<ClInclude Include="..\common\MockILocalStorageReader.hpp" />
<ClInclude Include="..\common\MockITenantDataSerializer.hpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\googletest\googlemock\msvc\2015\gmock.vcxproj">
<Project>{34681f0d-ce45-415d-b5f2-5c662dfe3bd5}</Project>
</ProjectReference>
<ProjectReference Include="..\..\googletest\googletest\msvc\gtest.vcxproj">
<Project>{c8f6c172-56f2-4e76-b5fa-c3b423b31be7}</Project>
</ProjectReference>
<ProjectReference Include="..\..\sqlite\sqlite.vcxproj">
<Project>{2ebc7b3c-2af1-442c-9285-cab39bbb8c00}</Project>
</ProjectReference>
<ProjectReference Include="..\..\zlib\contrib\vstudio\vc14\zlibvc.vcxproj">
<Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(SolutionDir)\build.props" Condition="Exists('$(SolutionDir)\build.props')" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

32
tests/functests/FuncTests.vcxproj.filters
Просмотреть файл

@ -14,20 +14,6 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(ProjectDir)..\common\HttpServer.hpp" />
<ClInclude Include="$(ProjectDir)..\common\SocketTools.hpp" />
<ClInclude Include="..\common\MockIBandwidthController.hpp">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\common\MockIEcsClient.hpp">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\common\MockILocalStorageReader.hpp">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\common\MockITenantDataSerializer.hpp">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="$(ProjectDir)..\common\MockIHttpClient.hpp">
<Filter>mocks</Filter>
</ClInclude>
@ -49,6 +35,24 @@
<ClInclude Include="$(ProjectDir)..\common\Common.hpp">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\common\MockIBandwidthController.hpp">
<Filter>mocks</Filter>
</ClInclude>
<ClInclude Include="..\common\MockIEcsClient.hpp">
<Filter>mocks</Filter>
</ClInclude>
<ClInclude Include="..\common\MockILocalStorageReader.hpp">
<Filter>mocks</Filter>
</ClInclude>
<ClInclude Include="..\common\MockITenantDataSerializer.hpp">
<Filter>mocks</Filter>
</ClInclude>
<ClInclude Include="$(ProjectDir)..\common\SocketTools.hpp">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="$(ProjectDir)..\common\HttpServer.hpp">
<Filter>common</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include=" ">

33
tests/unittests/ContextFieldsProviderTests.cpp
Просмотреть файл

@ -7,6 +7,7 @@ using namespace testing;
using namespace ARIASDK_NS;
// TODO: [MG] - this test would benefit from uncommenting a bunch of lines that have been commented by someone before..
TEST(ContextFieldsProviderTests, SetProperties)
{
ContextFieldsProvider ctx(nullptr);
@ -16,14 +17,14 @@ TEST(ContextFieldsProviderTests, SetProperties)
ctx.setCustomField("parent", "willremain");
ctx.setCustomField("empty", "");
ctx.setCustomField("parentonly", "willberemoved");
EventProperty prop("willbeoverwrittenpii", PiiKind_DistinguishedName);
EventProperty prop("willbeoverwrittenpii", PiiKind_DistinguishedName);
ctx.setCustomField("sharedpii", prop);
EventProperty prop1("willremainpii", PiiKind_GenericData);
EventProperty prop1("willremainpii", PiiKind_GenericData);
ctx.setCustomField("parentpii", prop1);
EventProperty prop2("", PiiKind_Identity);
EventProperty prop2("", PiiKind_Identity);
ctx.setCustomField("emptypii", prop2);
EventProperty prop3("willberemoved", PiiKind_GenericData);
ctx.setCustomField("parentonlypii", prop3 );
EventProperty prop3("willberemoved", PiiKind_GenericData);
ctx.setCustomField("parentonlypii", prop3);
ctx.SetAppId("appId");
ctx.SetAppExperimentIds("appExperimentIds");
@ -65,13 +66,13 @@ TEST(ContextFieldsProviderTests, SetProperties)
loggerCtx.setCustomField("shared", "latest");
loggerCtx.setCustomField("parentonly", "");
EventProperty prop10("latestpii", PiiKind_MailSubject);
loggerCtx.setCustomField("sharedpii", prop10);
EventProperty prop11("", PiiKind_IPv4Address);
loggerCtx.setCustomField("parentonlypii", prop11);
EventProperty prop10("latestpii", PiiKind_MailSubject);
loggerCtx.setCustomField("sharedpii", prop10);
EventProperty prop11("", PiiKind_IPv4Address);
loggerCtx.setCustomField("parentonlypii", prop11);
loggerCtx.setCustomField("child", "specific");
EventProperty prop12("specificpii", PiiKind_QueryString);
loggerCtx.setCustomField("childpii", prop12 );
EventProperty prop12("specificpii", PiiKind_QueryString);
loggerCtx.setCustomField("childpii", prop12);
::AriaProtocol::Record record1;
loggerCtx.writeToRecord(record1);
@ -95,7 +96,9 @@ TEST(ContextFieldsProviderTests, SetProperties)
//EXPECT_THAT(record1.data[0].properties["AppInfo.Version"].stringValue, Eq("appVersion"));
//EXPECT_THAT(record1.data[0].properties["AppInfo.Language"].stringValue, Eq("appLanguage"));
EXPECT_THAT(record1.extDevice[0].localId, Eq("deviceId"));
// XXX: [MG] - 1DS prepends m:
EXPECT_THAT(record1.extDevice[0].localId, Eq("m:deviceId"));
//EXPECT_THAT(record1.extDevice[0]..properties["DeviceInfo.Make"].stringValue, Eq("deviceMake"));
//EXPECT_THAT(record1.data[0].properties["DeviceInfo.Model"].stringValue, Eq("deviceModel"));
@ -121,9 +124,9 @@ TEST(ContextFieldsProviderTests, UsesPalValues)
::AriaProtocol::Record record;
ctx.writeToRecord(record);
EXPECT_THAT(record.extDevice[0].localId, Not(IsEmpty()));
EXPECT_THAT(record.extDevice[0].localId, Not(IsEmpty()));
//EXPECT_THAT(record.extDevice[0].authSecId, Not(IsEmpty()));
//EXPECT_THAT(record.data[0].properties["DeviceInfo.NetworkType"].stringValue, Not(IsEmpty()));
EXPECT_THAT(record.extOs[0].name, Not(IsEmpty()));
EXPECT_THAT(record.extOs[0].ver, Not(IsEmpty()));
EXPECT_THAT(record.extOs[0].name, Not(IsEmpty()));
EXPECT_THAT(record.extOs[0].ver, Not(IsEmpty()));
}

2
tests/unittests/ControlPlaneProviderTests.cpp
Просмотреть файл

@ -1,3 +1,4 @@
#if 0
// Copyright (c) Microsoft. All rights reserved.
#include "common/Common.hpp"
@ -42,3 +43,4 @@ TEST(ControlPlaneProviderTests, GetControlPlane_ConfigHasV0Size_ConfigHasCachePa
ASSERT_NE(nullptr, ControlPlaneProvider::GetControlPlane(config));
}
#endif

9
tests/unittests/DiskLocalStorageTests.cpp
Просмотреть файл

@ -1,12 +1,16 @@
#if 0
// Copyright (c) Microsoft. All rights reserved.
#include "common/Common.hpp"
#include "controlplane/DiskLocalStorage.hpp"
//#include "controlplane/DiskLocalStorage.hpp"
#include "common/MockITenantDataSerializer.hpp"
using namespace testing;
using namespace ARIASDK_NS;
using namespace ARIASDK_NS::ControlPlane;
//using namespace ARIASDK_NS::ControlPlane;
// Class to allow unit tests to test DiskLocalStorage without needing to use the file system
class TestableDiskLocalStorage : public DiskLocalStorage
@ -95,3 +99,4 @@ TEST(DiskLocalStorageTests, ReadTenantData_OpenStreamReturnsNonEmptyStream_Seria
ASSERT_EQ(&tenantData, reader.ReadTenantData(ariaTenantId));
ASSERT_EQ(expectedInput, actualInput);
}
#endif

9
tests/unittests/EventPropertiesTests.cpp
Просмотреть файл

@ -23,13 +23,16 @@ TEST(EventPropertiesTests, Name)
EXPECT_THAT(ep.GetName(), Eq("undefined"));
ep.SetName("Abcde123");
EXPECT_THAT(ep.GetName(), Eq("abcde123"));
EXPECT_THAT(ep.GetName(), Eq("Abcde123"));
ep.SetName("");
EXPECT_THAT(ep.GetName(), Eq("abcde123"));
EXPECT_THAT(ep.GetName(), Eq("Abcde123"));
ep.SetName("Weird. Characters_are_weird");
EXPECT_THAT(ep.GetName(), Eq("abcde123"));
EXPECT_THAT(ep.GetName(), Eq("Abcde123"));
ep.SetName("My.Event.Name");
EXPECT_THAT(ep.GetName(), Eq("My.Event.Name"));
}
TEST(EventPropertiesTests, Timestamp)

1370
tests/unittests/FIFOOfflineStorageTests.cpp
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

1
tests/unittests/HttpClientTests.cpp
Просмотреть файл

@ -11,6 +11,7 @@
using namespace testing;
using namespace ARIASDK_NS;
#define getAriaSdkLogComponent ::testing::getAriaSdkLogComponent
class HttpClientTests : public PAL::RefCountedImpl<HttpClientTests>,
public ::testing::Test,

88
tests/unittests/HttpDeflateCompressionTests.cpp
Просмотреть файл

@ -2,20 +2,62 @@
#include "common/Common.hpp"
#include "compression/HttpDeflateCompression.hpp"
#include "config/RuntimeConfig_Default.hpp"
#include "zlib.h"
#undef compress
using namespace testing;
using namespace ARIASDK_NS;
namespace testing {
void ExpandVector(std::vector<uint8_t> &in, std::vector<uint8_t> &out)
{
size_t destLen = out.size();
std::cout << "size=" << destLen << std::endl;
char *buffer = nullptr;
EXPECT_THAT(Expand((const char*)(in.data()), in.size(), &buffer, destLen, false), true);
out = std::vector<uint8_t>(buffer, buffer + destLen);
if (buffer)
delete[] buffer;
}
void InflateVector(std::vector<uint8_t> &in, std::vector<uint8_t> &out)
{
z_stream zs;
memset(&zs, 0, sizeof(zs));
// [MG]: must call inflateInit2 with -9 because otherwise
// it'd be searching for non-existing gzip header...
EXPECT_EQ(inflateInit2(&zs, -9), Z_OK);
zs.next_in = (Bytef *)in.data();
zs.avail_in = (uInt)in.size();
int ret;
char outbuffer[32768] = { 0 };
do {
zs.next_out = reinterpret_cast<Bytef*>(outbuffer);
zs.avail_out = sizeof(outbuffer);
ret = inflate(&zs, Z_NO_FLUSH);
out.insert(out.end(), outbuffer, outbuffer + zs.total_out);
} while (ret == Z_OK);
EXPECT_EQ(ret, Z_STREAM_END);
inflateEnd(&zs);
}
}
class HttpDeflateCompressionTests : public StrictMock<Test> {
protected:
RuntimeConfig_Default config;
HttpDeflateCompression compression;
RouteSource<EventsUploadContextPtr const&> input;
RouteSink<HttpDeflateCompressionTests, EventsUploadContextPtr const&> succeeded{this, &HttpDeflateCompressionTests::resultSucceeded};
RouteSink<HttpDeflateCompressionTests, EventsUploadContextPtr const&> failed{this, &HttpDeflateCompressionTests::resultFailed};
protected:
HttpDeflateCompressionTests()
HttpDeflateCompressionTests() :
compression(config)
{
input >> compression.compress >> succeeded;
compression.compressionFailed >> failed;
@ -25,37 +67,42 @@ class HttpDeflateCompressionTests : public StrictMock<Test> {
MOCK_METHOD1(resultFailed, void(EventsUploadContextPtr const &));
};
static std::vector<uint8_t> testPayload = { 1, 2, 3, 3, 3, 3, 3, 3, 3, 3 };
TEST_F(HttpDeflateCompressionTests, DoesNothingWhenTurnedOff)
{
config["http"]["compress"] = false;
EventsUploadContextPtr event = EventsUploadContext::create();
EXPECT_THAT(event->compressed, false);
event->body = {1, 2, 3, 3, 3, 3, 3, 3, 3, 3};
event->body = testPayload;
EXPECT_CALL(*this, resultSucceeded(event)).Times(1);
input(event);
EXPECT_THAT(event->body, Eq(std::vector<uint8_t>{1, 2, 3, 3, 3, 3, 3, 3, 3, 3}));
EXPECT_THAT(event->body, Eq(testPayload));
EXPECT_THAT(event->compressed, false);
}
TEST_F(HttpDeflateCompressionTests, CompressesCorrectly)
{
config["http"]["compress"] = true;
EventsUploadContextPtr event = EventsUploadContext::create();
EXPECT_THAT(event->compressed, false);
event->body = {1, 2, 3, 3, 3, 3, 3, 3, 3, 3};
event->body = testPayload;
EXPECT_CALL(*this, resultSucceeded(event)).Times(1);
input(event);
// Note: This is generally wrong, different compression libraries can
// return different output. The following works for zlib 1.2.8.
EXPECT_THAT(event->body, Eq(std::vector<uint8_t>{0x63, 0x64, 0x62, 0x86, 0x02, 0x00}));
std::vector<uint8_t> inflated;
testing::InflateVector(event->body, inflated);
EXPECT_THAT(inflated, Eq(testPayload));
EXPECT_THAT(event->compressed, true);
}
TEST_F(HttpDeflateCompressionTests, WorksMultipleTimes)
{
config["http"]["compress"] = true;
EventsUploadContextPtr event = EventsUploadContext::create();
EXPECT_THAT(event->compressed, false);
event->body = {};
@ -67,20 +114,29 @@ TEST_F(HttpDeflateCompressionTests, WorksMultipleTimes)
{
EventsUploadContextPtr event2 = EventsUploadContext::create();
EXPECT_THAT(event2->compressed, false);
event2->body = {1, 2, 3, 3, 3, 3, 3, 3, 3, 3};
event2->body = testPayload;
EXPECT_CALL(*this, resultSucceeded(event2)).Times(1);
input(event2);
EXPECT_THAT(event2->body, Eq(std::vector<uint8_t>{0x63, 0x64, 0x62, 0x86, 0x02, 0x00}));
std::vector<uint8_t> inflated;
testing::InflateVector(event2->body, inflated);
EXPECT_THAT(inflated, Eq(testPayload));
EXPECT_THAT(event2->compressed, true);
}
EventsUploadContextPtr event3 = EventsUploadContext::create();
EXPECT_THAT(event3->compressed, false);
event3->body = {};
EXPECT_CALL(*this, resultSucceeded(event3)).Times(1);
input(event3);
EXPECT_THAT(event3->body, Eq(std::vector<uint8_t>{0x03, 0x00}));
EXPECT_THAT(event3->compressed, true);
{
std::vector<uint8_t> testPayload2 = {};
EventsUploadContextPtr event3 = EventsUploadContext::create();
EXPECT_THAT(event3->compressed, false);
event3->body = testPayload2;
EXPECT_CALL(*this, resultSucceeded(event3)).Times(1);
input(event3);
std::vector<uint8_t> inflated;
testing::InflateVector(event3->body, inflated);
EXPECT_THAT(inflated, Eq(testPayload2));
EXPECT_THAT(event3->compressed, true);
}
}
#pragma warning(push)

28
tests/unittests/HttpRequestEncoderTests.cpp
Просмотреть файл

@ -3,19 +3,25 @@
#include "common/Common.hpp"
#include "common/MockIHttpClient.hpp"
#include "http/HttpRequestEncoder.hpp"
#include "config/RuntimeConfig_Default.hpp"
using namespace testing;
using namespace ARIASDK_NS;
class HttpRequestEncoderTests : public Test {
protected:
public:
protected:
ITelemetrySystem & system;
MockIHttpClient mockHttpClient;
HttpRequestEncoder encoder;
protected:
protected:
HttpRequestEncoderTests()
: encoder(mockHttpClient)
: system(testing::getSystem()),
encoder(system, mockHttpClient)
{
EXPECT_CALL(mockHttpClient, CreateRequest())
.WillRepeatedly(Invoke(&HttpRequestEncoderTests::createHttpRequest));
@ -32,9 +38,9 @@ TEST_F(HttpRequestEncoderTests, SetsAllParameters)
{
EventsUploadContextPtr ctx = EventsUploadContext::create();
ctx->compressed = false;
ctx->body = {1, 127, 255};
ctx->body = { 1, 127, 255 };
ctx->packageIds["tenant1-token"] = 0;
ctx->latency = EventLatency_RealTime;
ctx->latency = EventLatency_RealTime;
encoder.encode(ctx);
@ -44,12 +50,12 @@ TEST_F(HttpRequestEncoderTests, SetsAllParameters)
EXPECT_THAT(req->m_id, Eq("HttpRequestEncoderTests"));
EXPECT_THAT(req->m_method, Eq("POST"));
EXPECT_THAT(req->m_url, Eq("http://collector/"));
EXPECT_THAT(req->m_headers, Contains(Pair("Expect", "100-continue")));
EXPECT_THAT(req->m_headers, Contains(Pair("Client-Version", PAL::getSdkVersion())));
EXPECT_THAT(req->m_headers, Contains(Pair("Client-Id", "NO_AUTH")));
EXPECT_THAT(req->m_headers, Contains(Pair("Expect", "100-continue")));
EXPECT_THAT(req->m_headers, Contains(Pair("Client-Version", PAL::getSdkVersion())));
EXPECT_THAT(req->m_headers, Contains(Pair("Client-Id", "NO_AUTH")));
EXPECT_THAT(req->m_headers, Contains(Pair("Content-Type", "application/bond-compact-binary")));
EXPECT_THAT(req->m_headers, Contains(Pair("APIKey", "tenant1-token")));
EXPECT_THAT(req->m_body, Eq(std::vector<uint8_t>{1, 127, 255}));
EXPECT_THAT(req->m_headers, Contains(Pair("APIKey", "tenant1-token")));
EXPECT_THAT(req->m_body, Eq(std::vector<uint8_t>{1, 127, 255}));
EXPECT_THAT(req->m_latency, Eq(EventLatency_RealTime));
}

6
tests/unittests/HttpResponseDecoderTests.cpp
Просмотреть файл

@ -3,13 +3,14 @@
#include "common/Common.hpp"
#include "common/MockIHttpClient.hpp"
#include "http/HttpResponseDecoder.hpp"
#include "config/RuntimeConfig_Default.hpp"
using namespace testing;
using namespace ARIASDK_NS;
class HttpResponseDecoderTests : public StrictMock<Test> {
protected:
RuntimeConfig_Default config;
HttpResponseDecoder decoder;
RouteSink<HttpResponseDecoderTests, EventsUploadContextPtr const&> eventsAccepted{this, &HttpResponseDecoderTests::resultEventsAccepted};
RouteSink<HttpResponseDecoderTests, EventsUploadContextPtr const&> eventsRejected{this, &HttpResponseDecoderTests::resultEventsRejected};
@ -18,7 +19,8 @@ class HttpResponseDecoderTests : public StrictMock<Test> {
RouteSink<HttpResponseDecoderTests, EventsUploadContextPtr const&> requestAborted{this, &HttpResponseDecoderTests::resultRequestAborted};
protected:
HttpResponseDecoderTests()
HttpResponseDecoderTests() :
decoder(testing::getSystem())
{
decoder.eventsAccepted >> eventsAccepted;
decoder.eventsRejected >> eventsRejected;

128
tests/unittests/LoggerTests.cpp
Просмотреть файл

@ -1,3 +1,6 @@
#if 0
// FIXME: [MG] - replace by v1 BVT API tests
// Copyright (c) Microsoft. All rights reserved.
#include "common/Common.hpp"
@ -9,17 +12,17 @@ using namespace ARIASDK_NS;
class Logger4Test : public Logger {
public:
public:
template<typename... TArgs>
Logger4Test(TArgs&& ... args)
: Logger(std::forward<TArgs>(args) ...)
: Logger(std::forward<TArgs>(args) ...)
{
}
MOCK_METHOD4(submit, void(::AriaProtocol::Record &,
::Microsoft::Applications::Events::EventLatency,
::Microsoft::Applications::Events::EventPersistence,
std::uint64_t const& ));
MOCK_METHOD4(submit, void(::AriaProtocol::Record &,
::Microsoft::Applications::Events::EventLatency,
::Microsoft::Applications::Events::EventPersistence,
std::uint64_t const&));
void submit_(::AriaProtocol::Record& record, ::Microsoft::Applications::Events::EventLatency latency, ::Microsoft::Applications::Events::EventPersistence persistence, std::uint64_t const& policyBitFlags)
{
@ -29,7 +32,7 @@ class Logger4Test : public Logger {
class LoggerTests : public Test {
protected:
protected:
StrictMock<MockILogManagerInternal> _logManagerMock;
Logger4Test _logger;
@ -41,9 +44,9 @@ class LoggerTests : public Test {
uint64_t _sequenceId;
protected:
protected:
LoggerTests()
: _logger("testtenantid-tenanttoken", "test-source", "ecs-project", &_logManagerMock, nullptr),
: _logger("testtenantid-tenanttoken", "test-source", "ecs-project", &_logManagerMock, nullptr),
_emptyProperties("")
{
}
@ -57,18 +60,18 @@ class LoggerTests : public Test {
void expectSubmit()
{
_submitted = false;
EXPECT_CALL(_logger, submit(_, _, _,_)).
EXPECT_CALL(_logger, submit(_, _, _, _)).
WillOnce(DoAll(
Assign(&_submitted, true),
SaveArg<0>(&_submittedRecord),
SaveArg<1>(&_submittedLatency))).
Assign(&_submitted, true),
SaveArg<0>(&_submittedRecord),
SaveArg<1>(&_submittedLatency))).
RetiresOnSaturation();
}
void expectNoSubmit()
{
_submitted = false;
EXPECT_CALL(_logger, submit(_, _, _,_)).
EXPECT_CALL(_logger, submit(_, _, _, _)).
Times(0);
}
@ -122,24 +125,24 @@ TEST_F(LoggerTests, LogEvent)
EXPECT_THAT(_submittedRecord.data[0].properties["test"].stringValue, "value");
EXPECT_THAT(_submittedRecord.data[0].properties["auxiliary"].stringValue, "long content");
::AriaProtocol::PII pii;
pii.Kind = ::AriaProtocol::PIIKind::GenericData;
pii.Kind = ::AriaProtocol::PIIKind::GenericData;
//pii.RawContent = "oops, I did it again";
EXPECT_THAT(_submittedRecord.data[0].properties["secret"].stringValue, "oops, I did it again");
}
TEST_F(LoggerTests, CustomEventNameValidation)
{
expectSubmit();
expectSubmit();
EventProperties props("");
_logger.LogEvent(props);
ASSERT_THAT(_submitted, true);
checkBaseAndContextProps();
checkBaseAndContextProps();
expectSubmit();
expectSubmit();
props.SetName(std::string(3, 'a'));
_logger.LogEvent(props);
ASSERT_THAT(_submitted, true);
checkBaseAndContextProps();
checkBaseAndContextProps();
expectSubmit();
props.SetName(std::string(4, 'a'));
@ -159,19 +162,19 @@ TEST_F(LoggerTests, CustomEventNameValidation)
props.SetName(std::string(101, 'a'));
_logger.LogEvent(props);
ASSERT_THAT(_submitted, true);
checkBaseAndContextProps();
checkBaseAndContextProps();
expectSubmit();
props.SetName("_" + std::string(99, 'a'));
_logger.LogEvent(props);
ASSERT_THAT(_submitted, true);
checkBaseAndContextProps();
checkBaseAndContextProps();
expectSubmit();
props.SetName(std::string(99, 'a') + "_");
_logger.LogEvent(props);
ASSERT_THAT(_submitted, true);
checkBaseAndContextProps();
checkBaseAndContextProps();
expectSubmit();
props.SetName("0123456789_ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz");
@ -186,25 +189,25 @@ TEST_F(LoggerTests, CustomEventNameValidation)
EventProperties props2(std::string("test") + ch + "char");
_submitted = false;
_logger.LogEvent(props2);
if (ch == '.')
{
EXPECT_THAT(_submitted, true) << "Banned character: '" << ch << "'";
}
else
{
EXPECT_THAT(_submitted, false) << "Banned character: '" << ch << "'";
}
if (ch == '.')
{
EXPECT_THAT(_submitted, true) << "Banned character: '" << ch << "'";
}
else
{
EXPECT_THAT(_submitted, false) << "Banned character: '" << ch << "'";
}
}
}
TEST_F(LoggerTests, CustomPropertyNameValidation)
{
expectSubmit();
expectSubmit();
EventProperties props1("test");
props1.SetProperty("", "x");
_logger.LogEvent(props1);
ASSERT_THAT(_submitted, true);
checkBaseAndContextProps();
checkBaseAndContextProps();
expectSubmit();
EventProperties props2("test");
@ -212,10 +215,10 @@ TEST_F(LoggerTests, CustomPropertyNameValidation)
_logger.LogEvent(props2);
ASSERT_THAT(_submitted, true);
checkBaseAndContextProps();
for (std::pair<std::string, EventProperty> prop : props2.GetProperties())
{
EXPECT_THAT(_submittedRecord.data[0].properties[prop.first].stringValue, prop.second.to_string());
}
for (std::pair<std::string, EventProperty> prop : props2.GetProperties())
{
EXPECT_THAT(_submittedRecord.data[0].properties[prop.first].stringValue, prop.second.to_string());
}
//EXPECT_THAT(_submittedRecord.data[0].properties, Contains(*props2.GetProperties().begin()));
@ -225,10 +228,10 @@ TEST_F(LoggerTests, CustomPropertyNameValidation)
_logger.LogEvent(props3);
ASSERT_THAT(_submitted, true);
checkBaseAndContextProps();
for (std::pair<std::string, EventProperty> prop : props3.GetProperties())
{
EXPECT_THAT(_submittedRecord.data[0].properties[prop.first].stringValue, prop.second.to_string());
}
for (std::pair<std::string, EventProperty> prop : props3.GetProperties())
{
EXPECT_THAT(_submittedRecord.data[0].properties[prop.first].stringValue, prop.second.to_string());
}
//EXPECT_THAT(_submittedRecord.data[0].properties, Contains(*props3.GetProperties().begin()));
expectSubmit();
@ -236,35 +239,35 @@ TEST_F(LoggerTests, CustomPropertyNameValidation)
props4.SetProperty(std::string(101, 'a'), "x");
_logger.LogEvent(props4);
ASSERT_THAT(_submitted, true);
checkBaseAndContextProps();
checkBaseAndContextProps();
expectSubmit();
EventProperties props5("test");
props5.SetProperty("_" + std::string(99, 'a'), "x");
_logger.LogEvent(props5);
ASSERT_THAT(_submitted, true);
checkBaseAndContextProps();
checkBaseAndContextProps();
expectSubmit();
EventProperties props6("test");
props6.SetProperty(std::string(99, 'a') + "_", "x");
_logger.LogEvent(props6);
ASSERT_THAT(_submitted, true);
checkBaseAndContextProps();
checkBaseAndContextProps();
expectSubmit();
EventProperties props7("test");
props7.SetProperty("." + std::string(99, 'a'), "x");
_logger.LogEvent(props7);
ASSERT_THAT(_submitted, true);
checkBaseAndContextProps();
checkBaseAndContextProps();
expectSubmit();
EventProperties props8("test");
props8.SetProperty(std::string(99, 'a') + ".", "x");
_logger.LogEvent(props8);
ASSERT_THAT(_submitted, true);
checkBaseAndContextProps();
checkBaseAndContextProps();
expectSubmit();
EventProperties props9("test");
@ -272,10 +275,10 @@ TEST_F(LoggerTests, CustomPropertyNameValidation)
_logger.LogEvent(props9);
ASSERT_THAT(_submitted, true);
checkBaseAndContextProps();
for (std::pair<std::string, EventProperty> prop : props9.GetProperties())
{
EXPECT_THAT(_submittedRecord.data[0].properties[prop.first].stringValue, prop.second.to_string());
}
for (std::pair<std::string, EventProperty> prop : props9.GetProperties())
{
EXPECT_THAT(_submittedRecord.data[0].properties[prop.first].stringValue, prop.second.to_string());
}
//EXPECT_THAT(_submittedRecord.data[0].properties, Contains(*props9.GetProperties().begin()));
#if ARIASDK_PAL_SKYPE
@ -304,14 +307,14 @@ TEST_F(LoggerTests, CustomEventPropertiesCanOverrideOrEraseContextOnes)
{
_logger.SetContext("plain1", "from-context");
_logger.SetContext("plain2", "from-context");
_logger.SetContext("pii1", "from-context", PiiKind_GenericData);
_logger.SetContext("pii2", "from-context", PiiKind_GenericData);
_logger.SetContext("pii1", "from-context", PiiKind_GenericData);
_logger.SetContext("pii2", "from-context", PiiKind_GenericData);
EventProperties props("overridden_event");
props.SetProperty("plain1", "overridden");
props.SetProperty("pii1", "overridden", PiiKind_GenericData);
props.SetProperty("pii1", "overridden", PiiKind_GenericData);
props.SetProperty("plain2", "");
props.SetProperty("pii2", "", PiiKind_GenericData);
props.SetProperty("pii2", "", PiiKind_GenericData);
expectSubmit();
_logger.LogEvent(props);
ASSERT_THAT(_submitted, true);
@ -323,10 +326,10 @@ TEST_F(LoggerTests, CustomEventPropertiesCanOverrideOrEraseContextOnes)
EXPECT_THAT(_submittedRecord.data[0].properties["plain2"].stringValue, "");
::AriaProtocol::PII pii;
pii.Kind = ::AriaProtocol::PIIKind::GenericData;
pii.Kind = ::AriaProtocol::PIIKind::GenericData;
//pii.RawContent = "overridden";
EXPECT_THAT(_submittedRecord.data[0].properties["pii1"].stringValue, "overridden");
EXPECT_THAT(_submittedRecord.data[0].properties["pii2"].stringValue,"");
EXPECT_THAT(_submittedRecord.data[0].properties["pii2"].stringValue, "");
}
@ -334,8 +337,8 @@ TEST_F(LoggerTests, SubmitIgnoresLatencyOff)
{
::AriaProtocol::Record record;
record.baseType = "off";
std::string name("test");
std::uint64_t flags = 0;
std::string name("test");
std::uint64_t flags = 0;
_logger.submit_(record, EventLatency_Off, EventPersistence_Normal, flags);
}
@ -356,12 +359,13 @@ TEST_F(LoggerTests, SubmitSendsEventContext)
ARIASDK_NS::IncomingEventContextPtr event;
EXPECT_CALL(_logManagerMock, sendEvent(_))
.WillOnce(SaveArg<0>(&event));
_logger.submit_(record, EventLatency_Unspecified, EventPersistence_Normal,0);
_logger.submit_(record, EventLatency_Unspecified, EventPersistence_Normal, 0);
//EXPECT_THAT(event->record.id, Eq("guid"));
EXPECT_THAT(event->record.tenantToken, Eq("testtenantid-tenanttoken"));
EXPECT_THAT(event->record.latency, EventLatency_Unspecified);
EXPECT_THAT(event->source->name, Eq("guid"));
EXPECT_THAT(event->source->baseType, Eq("eventtype"));
EXPECT_THAT(event->source->data[0].properties["propertykey"].stringValue,"propertyvalue");
EXPECT_THAT(event->record.latency, EventLatency_Unspecified);
EXPECT_THAT(event->source->name, Eq("guid"));
EXPECT_THAT(event->source->baseType, Eq("eventtype"));
EXPECT_THAT(event->source->data[0].properties["propertykey"].stringValue, "propertyvalue");
}
#endif

5
tests/unittests/Main.cpp
Просмотреть файл

@ -38,11 +38,10 @@ int main(int argc, char** argv)
auf::AF_KeepOverStop);
#endif
::testing::UnitTest::GetInstance()->listeners().Append(new TestStatusLogger());
ARIASDK_NS::PAL::initialize();
PAL::initialize();
int result = RUN_ALL_TESTS();
ARIASDK_NS::PAL::shutdown();
PAL::shutdown();
#if defined(_DEBUG) && defined(_WIN32)
if (IsDebuggerPresent()) {

7
tests/unittests/MetaStatsTests.cpp
Просмотреть файл

@ -12,13 +12,12 @@ class MetaStatsTests : public ::testing::Test
{
protected:
StrictMock<MockIRuntimeConfig> runtimeConfigMock;
ContextFieldsProvider contextFieldsProvider;
MetaStats stats;
public:
MetaStatsTests()
: contextFieldsProvider(nullptr),
stats(runtimeConfigMock, contextFieldsProvider)
MetaStatsTests() :
stats(runtimeConfigMock)
{
}
};

4
tests/unittests/OacrTests.cpp
Просмотреть файл

@ -12,7 +12,7 @@ TEST(OacrTests, BuildMachineOnly_VerifyOacrOutputFolderExists)
if (0 == _dupenv_s(&buildNumber, nullptr, "BUILD_BUILDID") && (buildNumber != nullptr))
{
LPCSTR outputFolder = "F:\\OACR\\Output"; // Output folder that must exist
DWORD attributes = GetFileAttributes(outputFolder);
DWORD attributes = GetFileAttributesA(outputFolder);
bool oacrOutputFolderExists = (attributes != INVALID_FILE_ATTRIBUTES) && ((attributes & FILE_ATTRIBUTE_DIRECTORY) != 0);
ASSERT_TRUE(oacrOutputFolderExists);
free(buildNumber);
@ -28,7 +28,7 @@ TEST(OacrTests, BuildMachineOnly_VerifyThisBuildHasNoOacrErrors)
{
char pathToFile[MAX_PATH];
snprintf(pathToFile, _countof(pathToFile), "F:\\OACR\\Output\\%s.OacrWarnings.xml", buildNumber);
DWORD attributes = GetFileAttributes(pathToFile);
DWORD attributes = GetFileAttributesA(pathToFile);
bool oacrWarningsExist = (attributes != INVALID_FILE_ATTRIBUTES);
ASSERT_FALSE(oacrWarningsExist);
free(buildNumber);

69
tests/unittests/OfflineStorageTests.cpp
Просмотреть файл

@ -2,51 +2,50 @@
#include "common/Common.hpp"
#include "common/MockIOfflineStorage.hpp"
#include "offline/OfflineStorage.hpp"
#include "offline/StorageObserver.hpp"
using namespace testing;
using namespace ARIASDK_NS;
class OfflineStorageTests : public StrictMock<Test> {
protected:
MockIOfflineStorage offlineStorageMock;
OfflineStorage offlineStorage;
protected:
MockIOfflineStorage offlineStorageMock;
StorageObserver offlineStorage;
RouteSink<OfflineStorageTests, IncomingEventContextPtr const&> storeRecordFailed{this, &OfflineStorageTests::resultStoreRecordFailed};
RouteSink<OfflineStorageTests, EventsUploadContextPtr const&, StorageRecord const&, bool&> retrievedEvent{this, &OfflineStorageTests::resultRetrievedEvent};
RouteSink<OfflineStorageTests, EventsUploadContextPtr const&> retrievalFinished{this, &OfflineStorageTests::resultRetrievalFinished};
RouteSink<OfflineStorageTests, EventsUploadContextPtr const&> retrievalFailed{this, &OfflineStorageTests::resultRetrievalFailed};
RouteSink<OfflineStorageTests, IncomingEventContextPtr const&> storeRecordFailed{ this, &OfflineStorageTests::resultStoreRecordFailed };
RouteSink<OfflineStorageTests, EventsUploadContextPtr const&, StorageRecord const&, bool&> retrievedEvent{ this, &OfflineStorageTests::resultRetrievedEvent };
RouteSink<OfflineStorageTests, EventsUploadContextPtr const&> retrievalFinished{ this, &OfflineStorageTests::resultRetrievalFinished };
RouteSink<OfflineStorageTests, EventsUploadContextPtr const&> retrievalFailed{ this, &OfflineStorageTests::resultRetrievalFailed };
RouteSink<OfflineStorageTests, StorageNotificationContext const*> opened{this, &OfflineStorageTests::notifOpened};
RouteSink<OfflineStorageTests, StorageNotificationContext const*> failed{this, &OfflineStorageTests::notifFailed};
RouteSink<OfflineStorageTests, StorageNotificationContext const*> trimmed{this, &OfflineStorageTests::notifTrimmed};
RouteSink<OfflineStorageTests, StorageNotificationContext const*> recordsDropped{this, &OfflineStorageTests::notifRecordsDropped};
RouteSink<OfflineStorageTests, StorageNotificationContext const*> opened{ this, &OfflineStorageTests::notifOpened };
RouteSink<OfflineStorageTests, StorageNotificationContext const*> failed{ this, &OfflineStorageTests::notifFailed };
RouteSink<OfflineStorageTests, StorageNotificationContext const*> trimmed{ this, &OfflineStorageTests::notifTrimmed };
RouteSink<OfflineStorageTests, StorageNotificationContext const*> recordsDropped{ this, &OfflineStorageTests::notifRecordsDropped };
protected:
protected:
OfflineStorageTests()
: offlineStorage(offlineStorageMock)
: offlineStorage(testing::getSystem(), offlineStorageMock)
{
offlineStorage.storeRecordFailed >> storeRecordFailed;
offlineStorage.retrievedEvent >> retrievedEvent;
offlineStorage.retrievedEvent >> retrievedEvent;
offlineStorage.retrievalFinished >> retrievalFinished;
offlineStorage.retrievalFailed >> retrievalFailed;
offlineStorage.retrievalFailed >> retrievalFailed;
offlineStorage.opened >> opened;
offlineStorage.failed >> failed;
offlineStorage.trimmed >> trimmed;
offlineStorage.recordsDropped >> recordsDropped;
offlineStorage.opened >> opened;
offlineStorage.failed >> failed;
offlineStorage.trimmed >> trimmed;
offlineStorage.recordsDropped >> recordsDropped;
}
MOCK_METHOD1(resultStoreRecordFailed, void(IncomingEventContextPtr const &));
MOCK_METHOD3(resultRetrievedEvent, void(EventsUploadContextPtr const &, StorageRecord const &, bool&));
MOCK_METHOD3(resultRetrievedEvent, void(EventsUploadContextPtr const &, StorageRecord const &, bool&));
MOCK_METHOD1(resultRetrievalFinished, void(EventsUploadContextPtr const &));
MOCK_METHOD1(resultRetrievalFailed, void(EventsUploadContextPtr const &));
MOCK_METHOD1(resultRetrievalFailed, void(EventsUploadContextPtr const &));
MOCK_METHOD1(notifOpened, void(StorageNotificationContext const*));
MOCK_METHOD1(notifFailed, void(StorageNotificationContext const*));
MOCK_METHOD1(notifTrimmed, void(StorageNotificationContext const*));
MOCK_METHOD1(notifRecordsDropped, void(StorageNotificationContext const*));
MOCK_METHOD1(notifOpened, void(StorageNotificationContext const*));
MOCK_METHOD1(notifFailed, void(StorageNotificationContext const*));
MOCK_METHOD1(notifTrimmed, void(StorageNotificationContext const*));
MOCK_METHOD1(notifRecordsDropped, void(StorageNotificationContext const*));
};
@ -90,15 +89,15 @@ TEST_F(OfflineStorageTests, RetrieveEventsPassesRecordsThrough)
StorageRecord record2("r2", "tenant2-token", EventLatency_Normal, EventPersistence_Normal, 1234567891, std::vector<uint8_t>{2, 128, 0});
EXPECT_CALL(offlineStorageMock, GetAndReserveRecords(_, Gt(1000u), ctx->requestedMinLatency, ctx->requestedMaxCount))
.WillOnce(DoAll(
Invoke([&record1, &record2](std::function<bool(StorageRecord&&)> const& consumer, unsigned, EventLatency, unsigned) {
Invoke([&record1, &record2](std::function<bool(StorageRecord&&)> const& consumer, unsigned, EventLatency, unsigned) {
EXPECT_THAT(consumer(std::move(record1)), true);
EXPECT_THAT(consumer(std::move(record2)), false);
}),
Return(true)))
Return(true)))
.RetiresOnSaturation();
EXPECT_CALL(offlineStorageMock, IsLastReadFromMemory())
.WillOnce(Return(false));
EXPECT_CALL(offlineStorageMock, IsLastReadFromMemory())
.WillOnce(Return(false));
EXPECT_CALL(*this, resultRetrievedEvent(ctx, Ref(record1), _))
.WillOnce(SetArgReferee<2>(true))
@ -109,7 +108,7 @@ TEST_F(OfflineStorageTests, RetrieveEventsPassesRecordsThrough)
EXPECT_CALL(*this, resultRetrievalFinished(ctx))
.WillOnce(Return());
offlineStorage.retrieveEvents(ctx);
}
@ -122,8 +121,8 @@ TEST_F(OfflineStorageTests, RetrieveEventsFailureAborts)
EXPECT_CALL(offlineStorageMock, GetAndReserveRecords(_, Gt(1000u), ctx->requestedMinLatency, ctx->requestedMaxCount))
.WillOnce(Return(false));
EXPECT_CALL(offlineStorageMock, IsLastReadFromMemory())
.WillOnce(Return(false));
EXPECT_CALL(offlineStorageMock, IsLastReadFromMemory())
.WillOnce(Return(false));
EXPECT_CALL(*this, resultRetrievalFailed(ctx))
.WillOnce(Return());
offlineStorage.retrieveEvents(ctx);
@ -140,7 +139,7 @@ TEST_F(OfflineStorageTests, DeleteRecordsIsForwarded)
recordIds.push_back(element.first);
}
ctx->fromMemory = fromMemory;
EXPECT_CALL(offlineStorageMock, DeleteRecords(recordIds,test, fromMemory)).WillOnce(Return());
EXPECT_CALL(offlineStorageMock, DeleteRecords(recordIds, test, fromMemory)).WillOnce(Return());
EXPECT_THAT(offlineStorage.deleteRecords(ctx), true);
}

34
tests/unittests/OfflineStorageTests_SQLite.cpp
Просмотреть файл

@ -9,7 +9,7 @@
using namespace testing;
using namespace ARIASDK_NS;
using namespace ARIASDK_NS::PAL;
using namespace PAL;
char const* const TEST_STORAGE_FILENAME = "OfflineStorageTests_SQLite.db";
@ -17,8 +17,8 @@ char const* const TEST_STORAGE_FILENAME = "OfflineStorageTests_SQLite.db";
class OfflineStorage_SQLiteNoAutoCommit : public OfflineStorage_SQLite
{
public:
OfflineStorage_SQLiteNoAutoCommit(ILogConfiguration& configuration, IRuntimeConfig& runtimeConfig)
: OfflineStorage_SQLite(configuration, runtimeConfig)
OfflineStorage_SQLiteNoAutoCommit(ILogManager& logManager, IRuntimeConfig& runtimeConfig, bool inMemory = false)
: OfflineStorage_SQLite(logManager, runtimeConfig, inMemory)
{
}
@ -30,16 +30,21 @@ class OfflineStorage_SQLiteNoAutoCommit : public OfflineStorage_SQLite
struct OfflineStorageTests_SQLite : public Test
{
StrictMock<MockIRuntimeConfig> configMock;
StrictMock<MockIOfflineStorageObserver> observerMock;
StrictMock<MockIRuntimeConfig> configMock;
StrictMock<MockIOfflineStorageObserver> observerMock;
ILogManager * logManager;
ILogConfiguration configuration;
std::unique_ptr<OfflineStorage_SQLiteNoAutoCommit> offlineStorage;
std::unique_ptr<OfflineStorage_SQLiteNoAutoCommit> offlineStorage;
virtual void SetUp() override
{
configuration.SetProperty("cacheFilePath", TEST_STORAGE_FILENAME);
configuration["cacheFilePath"] = TEST_STORAGE_FILENAME;
EXPECT_CALL(configMock, GetOfflineStorageMaximumSizeBytes()).WillRepeatedly(Return(UINT_MAX));
offlineStorage.reset(new OfflineStorage_SQLiteNoAutoCommit(configuration, configMock));
// FIXME: [MG] - create LogManager instance
logManager = nullptr;
offlineStorage.reset(new OfflineStorage_SQLiteNoAutoCommit(*logManager, configMock));
EXPECT_CALL(observerMock, OnStorageOpened("SQLite/Default"))
.RetiresOnSaturation();
offlineStorage->Initialize(observerMock);
@ -395,18 +400,21 @@ TEST_F(OfflineStorageTests_SQLite, StoreThousandEventsTakesLessThanASecond)
TEST_F(OfflineStorageTests_SQLite, OnInvalidFilenameInitializeCreatesTemporaryDb)
{
offlineStorage->Shutdown();
EVTStatus error;
std::string origCacheFilePath = configuration.GetProperty(CFG_STR_CACHE_FILE_PATH, error);
std::string origCacheFilePath = (const char *)configuration[CFG_STR_CACHE_FILE_PATH];
::remove(origCacheFilePath.c_str());
configuration.SetProperty(CFG_STR_CACHE_FILE_PATH, "/\\/*/[]\\\\");
offlineStorage.reset(new OfflineStorage_SQLiteNoAutoCommit(configuration, configMock));
configuration[CFG_STR_CACHE_FILE_PATH] = "/\\/*/[]\\\\";
// FIXME: [MG]
ILogManager * logManagerInstance = nullptr;
offlineStorage.reset(new OfflineStorage_SQLiteNoAutoCommit(*logManagerInstance, configMock));
EXPECT_CALL(observerMock, OnStorageFailed("1"));
EXPECT_CALL(observerMock, OnStorageOpened("SQLite/Temp"));
offlineStorage->Initialize(observerMock);
EXPECT_THAT(fileExists(origCacheFilePath), false);
EXPECT_THAT(fileExists(configuration.GetProperty(CFG_STR_CACHE_FILE_PATH, error)), false);
EXPECT_THAT(fileExists(configuration[CFG_STR_CACHE_FILE_PATH]), false);
// Recreate for destructor
std::ofstream(origCacheFilePath, std::ios::out);

212
tests/unittests/OfflineStorageTests_SQLiteWithMock.cpp
Просмотреть файл

@ -12,8 +12,7 @@
using namespace testing;
using namespace ARIASDK_NS;
using namespace ARIASDK_NS::PAL;
using namespace PAL;
// Do not try use anything else than .* in the regex, it will fail because of buggy implementations:
// http://stackoverflow.com/questions/12530406/is-gcc-4-8-or-earlier-buggy-about-regular-expressions
@ -23,13 +22,13 @@ MATCHER_P2(PreparedStatement, testClass, recipeRegex, "")
{
UNREFERENCED_PARAMETER(result_listener);
return testClass->statements.find(arg) != testClass->statements.end() &&
std::regex_match(testClass->statements[arg].recipe, std::regex(recipeRegex));
std::regex_match(testClass->statements[arg].recipe, std::regex(recipeRegex));
}
#pragma warning( pop )
class TestRecordConsumer {
public:
public:
operator std::function<bool(StorageRecord&&)>()
{
// *INDENT-OFF* Uncrustify mangles this lambda's syntax a lot
@ -48,9 +47,9 @@ class TestRecordConsumer {
class OfflineStorage_SQLite4Test : public OfflineStorage_SQLite {
public:
OfflineStorage_SQLite4Test(ILogConfiguration& configuration, IRuntimeConfig& runtimeConfig)
: OfflineStorage_SQLite(configuration, runtimeConfig)
public:
OfflineStorage_SQLite4Test(ILogManager* logManager, IRuntimeConfig& runtimeConfig, bool inMemory = false)
: OfflineStorage_SQLite(*logManager, runtimeConfig, inMemory)
{
}
@ -65,7 +64,7 @@ class OfflineStorage_SQLite4Test : public OfflineStorage_SQLite {
}
using OfflineStorage_SQLite::initializeDatabase;
using OfflineStorage_SQLite::autoCommitTransaction;
//using OfflineStorage_SQLite::autoCommitTransaction;
using OfflineStorage_SQLite::trimDbIfNeeded;
MOCK_METHOD0(scheduleAutoCommitTransaction, void());
@ -80,7 +79,8 @@ struct OfflineStorageTests_SQLiteWithMock : public Test
bool reset;
};
ILogConfiguration configuration;
ILogManager* logManager;
ILogConfiguration configuration;
StrictMock<MockIRuntimeConfig> runtimeConfigMock;
StrictMock<MockISqlite3Proxy> sqliteMock;
ISqlite3Proxy* savedSqliteProxy;
@ -93,13 +93,14 @@ struct OfflineStorageTests_SQLiteWithMock : public Test
virtual void SetUp() override
{
savedSqliteProxy = g_sqlite3Proxy;
g_sqlite3Proxy = &sqliteMock;
g_sqlite3Proxy = &sqliteMock;
EXPECT_CALL(runtimeConfigMock, GetOfflineStorageMaximumSizeBytes())
.WillRepeatedly(Return(1000000));
configuration.SetProperty("cacheFilePath","OfflineStorageTests_SQLiteWithMock.db");
configuration["cacheFilePath"] = "OfflineStorageTests_SQLiteWithMock.db";
os.reset(new OfflineStorage_SQLite4Test(configuration, runtimeConfigMock));
logManager = nullptr;
os.reset(new OfflineStorage_SQLite4Test(logManager, runtimeConfigMock));
dbHandle = reinterpret_cast<sqlite3*>(PAL::getUtcSystemTimeMs() & ~0xFFFF);
@ -127,7 +128,7 @@ struct OfflineStorageTests_SQLiteWithMock : public Test
UNREFERENCED_PARAMETER(db);
UNREFERENCED_PARAMETER(pztail);
*pstmt = reinterpret_cast<sqlite3_stmt*>(reinterpret_cast<size_t>(dbHandle) + statements.size() + 1);
statements[*pstmt] = FakeStatement{(size < 0) ? std::string(zsql) : std::string(zsql, size), true};
statements[*pstmt] = FakeStatement{ (size < 0) ? std::string(zsql) : std::string(zsql, size), true };
return SQLITE_OK;
}
@ -202,11 +203,14 @@ struct OfflineStorageTests_SQLiteWithMock : public Test
EXPECT_CALL(sqliteMock, sqlite3_prepare_v2(dbHandle, _, -1, _, NULL))
.WillRepeatedly(Invoke(this, &OfflineStorageTests_SQLiteWithMock::fakePrepareStatement));
}
EVTStatus error;
EXPECT_CALL(sqliteMock, sqlite3_open_v2(StrEq(path ? path : configuration.GetProperty(CFG_STR_CACHE_FILE_PATH, error)), _, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX, NULL))
// StrEq(path ? path : configuration[CFG_STR_CACHE_FILE_PATH]
EXPECT_CALL(sqliteMock,
sqlite3_open_v2(path, _, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX, NULL))
.WillOnce(DoAll(
SetArgPointee<1>(dbHandle),
Return(SQLITE_OK)))
SetArgPointee<1>(dbHandle),
Return(SQLITE_OK)))
.RetiresOnSaturation();
EXPECT_CALL(sqliteMock, sqlite3_extended_result_codes(dbHandle, 1))
.WillOnce(Return(SQLITE_OK))
@ -343,12 +347,12 @@ TEST_F(OfflineStorageTests_SQLiteWithMock, NoInitializationMeansNoDatabase)
os->Initialize(observerMock);
// No database is open, but other methods are still safe to call and no SQLite methods will be invoked
os->StoreRecord({"guid", "tenant", EventLatency_Normal,EventPersistence_Normal, 2, {'x'}});
bool fromMemory = false;
os->StoreRecord({ "guid", "tenant", EventLatency_Normal,EventPersistence_Normal, 2, {'x'} });
bool fromMemory = false;
os->GetAndReserveRecords(consumer, 1000, EventLatency_Normal, 3);
HttpHeaders test;
os->DeleteRecords({"guid"}, test, fromMemory);
os->ReleaseRecords({"guid"}, true, test, fromMemory);
HttpHeaders test;
os->DeleteRecords({ "guid" }, test, fromMemory);
os->ReleaseRecords({ "guid" }, true, test, fromMemory);
os->StoreSetting("key", "value");
os->GetSetting("key");
os->Shutdown();
@ -362,11 +366,11 @@ TEST_F(OfflineStorageTests_SQLiteWithMock, InitializationErrorsFallbackToRecreat
EXPECT_CALL(sqliteMock, sqlite3_initialize())
.WillOnce(Return(SQLITE_OK))
.RetiresOnSaturation();
EVTStatus error;
EXPECT_CALL(sqliteMock, sqlite3_open_v2(StrEq(configuration.GetProperty(CFG_STR_CACHE_FILE_PATH, error)), _, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX, NULL))
EXPECT_CALL(sqliteMock, sqlite3_open_v2(StrEq(configuration[CFG_STR_CACHE_FILE_PATH]), _, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX, NULL))
.WillOnce(DoAll(
SetArgPointee<1>(dbHandle),
Return(SQLITE_CORRUPT)))
SetArgPointee<1>(dbHandle),
Return(SQLITE_CORRUPT)))
.RetiresOnSaturation();
EXPECT_CALL(sqliteMock, sqlite3_errmsg(dbHandle))
.WillOnce(Return("Database corrupted"))
@ -405,11 +409,11 @@ TEST_F(OfflineStorageTests_SQLiteWithMock, InitializationErrorsFallbackToTempora
EXPECT_CALL(sqliteMock, sqlite3_initialize())
.WillOnce(Return(SQLITE_OK))
.RetiresOnSaturation();
EVTStatus error;
EXPECT_CALL(sqliteMock, sqlite3_open_v2(StrEq(configuration.GetProperty(CFG_STR_CACHE_FILE_PATH,error)), _, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX, NULL))
EXPECT_CALL(sqliteMock, sqlite3_open_v2(StrEq(configuration[CFG_STR_CACHE_FILE_PATH]), _, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX, NULL))
.WillOnce(DoAll(
SetArgPointee<1>(dbHandle),
Return(SQLITE_CORRUPT)))
SetArgPointee<1>(dbHandle),
Return(SQLITE_CORRUPT)))
.RetiresOnSaturation();
EXPECT_CALL(sqliteMock, sqlite3_errmsg(dbHandle))
.WillOnce(Return("Database corrupted"))
@ -456,11 +460,11 @@ TEST_F(OfflineStorageTests_SQLiteWithMock, InitializationErrorsFallbackToInMemor
EXPECT_CALL(sqliteMock, sqlite3_initialize())
.WillOnce(Return(SQLITE_OK))
.RetiresOnSaturation();
EVTStatus error;
EXPECT_CALL(sqliteMock, sqlite3_open_v2(StrEq(configuration.GetProperty(CFG_STR_CACHE_FILE_PATH, error)), _, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX, NULL))
EXPECT_CALL(sqliteMock, sqlite3_open_v2(StrEq(configuration[CFG_STR_CACHE_FILE_PATH]), _, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX, NULL))
.WillOnce(DoAll(
SetArgPointee<1>(dbHandle),
Return(SQLITE_CORRUPT)))
SetArgPointee<1>(dbHandle),
Return(SQLITE_CORRUPT)))
.RetiresOnSaturation();
EXPECT_CALL(sqliteMock, sqlite3_errmsg(dbHandle))
.WillOnce(Return("Database corrupted"))
@ -498,8 +502,8 @@ TEST_F(OfflineStorageTests_SQLiteWithMock, InitializationErrorsFallbackToInMemor
.RetiresOnSaturation();
EXPECT_CALL(sqliteMock, sqlite3_open_v2(StrEq(""), _, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX, NULL))
.WillOnce(DoAll(
SetArgPointee<1>(dbHandle),
Return(SQLITE_IOERR)))
SetArgPointee<1>(dbHandle),
Return(SQLITE_IOERR)))
.RetiresOnSaturation();
EXPECT_CALL(sqliteMock, sqlite3_errmsg(dbHandle))
.WillOnce(Return("Cannot create file"))
@ -536,11 +540,11 @@ TEST_F(OfflineStorageTests_SQLiteWithMock, CompletelyFailedInitializationMeansNo
EXPECT_CALL(sqliteMock, sqlite3_initialize())
.WillOnce(Return(SQLITE_OK))
.RetiresOnSaturation();
EVTStatus error;
EXPECT_CALL(sqliteMock, sqlite3_open_v2(StrEq(configuration.GetProperty(CFG_STR_CACHE_FILE_PATH, error)), _, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX, NULL))
EXPECT_CALL(sqliteMock, sqlite3_open_v2(StrEq(configuration[CFG_STR_CACHE_FILE_PATH]), _, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX, NULL))
.WillOnce(DoAll(
SetArgPointee<1>(dbHandle),
Return(SQLITE_CORRUPT)))
SetArgPointee<1>(dbHandle),
Return(SQLITE_CORRUPT)))
.RetiresOnSaturation();
EXPECT_CALL(sqliteMock, sqlite3_errmsg(dbHandle))
.WillOnce(Return("Database corrupted"))
@ -596,8 +600,8 @@ TEST_F(OfflineStorageTests_SQLiteWithMock, CompletelyFailedInitializationMeansNo
.RetiresOnSaturation();
EXPECT_CALL(sqliteMock, sqlite3_open_v2(StrEq(":memory:"), _, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX, NULL))
.WillOnce(DoAll(
SetArgPointee<1>(dbHandle),
Return(SQLITE_OK)))
SetArgPointee<1>(dbHandle),
Return(SQLITE_OK)))
.RetiresOnSaturation();
EXPECT_CALL(sqliteMock, sqlite3_extended_result_codes(dbHandle, 1))
.WillOnce(Return(SQLITE_OK))
@ -619,12 +623,12 @@ TEST_F(OfflineStorageTests_SQLiteWithMock, CompletelyFailedInitializationMeansNo
os->Initialize(observerMock);
// No database is open, but other methods are still safe to call and no SQLite methods will be invoked
os->StoreRecord({"guid", "tenant", EventLatency_Normal,EventPersistence_Normal, 2, {'x'}});
bool fromMemory = false;
os->StoreRecord({ "guid", "tenant", EventLatency_Normal,EventPersistence_Normal, 2, {'x'} });
bool fromMemory = false;
os->GetAndReserveRecords(consumer, 1000, EventLatency_Normal, 3);
HttpHeaders test;
os->DeleteRecords({"guid"}, test, fromMemory);
os->ReleaseRecords({"guid"}, true, test, fromMemory);
HttpHeaders test;
os->DeleteRecords({ "guid" }, test, fromMemory);
os->ReleaseRecords({ "guid" }, true, test, fromMemory);
os->StoreSetting("key", "value");
os->GetSetting("key");
os->Shutdown();
@ -828,10 +832,10 @@ TEST_F(OfflineStorageTests_SQLiteWithMock, CommitFailureDuringShutdownIsIgnored)
class OfflineStorageTests_SQLiteWithMockInitialized : public OfflineStorageTests_SQLiteWithMock
{
public:
public:
virtual void SetUp() override
{
configuration.SetProperty("skipSqliteInitAndShutdown", "true");
configuration["skipSqliteInitAndShutdown"] = "true";
OfflineStorageTests_SQLiteWithMock::SetUp();
expectOpenDatabase();
expectInitializeDatabase();
@ -860,21 +864,21 @@ class OfflineStorageTests_SQLiteWithMockInitialized : public OfflineStorageTests
EXPECT_CALL(observerMock, OnStorageOpened("SQLite/Clean"));
return;
}
EVTStatus error;
EXPECT_CALL(sqliteMock, sqlite3_open_v2(StrEq(configuration.GetProperty(CFG_STR_CACHE_FILE_PATH, error)), _, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX, NULL))
EXPECT_CALL(sqliteMock, sqlite3_open_v2(StrEq(configuration[CFG_STR_CACHE_FILE_PATH]), _, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX, NULL))
.WillOnce(DoAll(
SetArgPointee<1>(nullptr),
Return(SQLITE_NOMEM)))
SetArgPointee<1>(nullptr),
Return(SQLITE_NOMEM)))
.RetiresOnSaturation();
EXPECT_CALL(sqliteMock, sqlite3_open_v2(StrEq(""), _, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX, NULL))
.WillOnce(DoAll(
SetArgPointee<1>(nullptr),
Return(SQLITE_NOMEM)))
SetArgPointee<1>(nullptr),
Return(SQLITE_NOMEM)))
.RetiresOnSaturation();
EXPECT_CALL(sqliteMock, sqlite3_open_v2(StrEq(":memory:"), _, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX, NULL))
.WillOnce(DoAll(
SetArgPointee<1>(nullptr),
Return(SQLITE_NOMEM)))
SetArgPointee<1>(nullptr),
Return(SQLITE_NOMEM)))
.RetiresOnSaturation();
EXPECT_CALL(observerMock, OnStorageOpened("SQLite/None"));
}
@ -915,7 +919,7 @@ TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, StoreRecord_Succeeds)
EXPECT_CALL(*os, scheduleAutoCommitTransaction())
.RetiresOnSaturation();
EXPECT_THAT(os->StoreRecord({"guid", "tenant", EventLatency_Normal,EventPersistence_Normal, 2, {3}}), true);
EXPECT_THAT(os->StoreRecord({ "guid", "tenant", EventLatency_Normal,EventPersistence_Normal, 2, {3} }), true);
EXPECT_CALL(sqliteMock, sqlite3_step(PreparedStatement(this, "COMMIT")))
.WillOnce(Invoke(this, &OfflineStorageTests_SQLiteWithMock::fakeStatementStepDone))
@ -924,10 +928,10 @@ TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, StoreRecord_Succeeds)
TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, StoreRecord_FailsWithInvalidInput)
{
EXPECT_THAT(os->StoreRecord({"", "tenant", EventLatency_Normal,EventPersistence_Normal, 2, {3}}), false);
EXPECT_THAT(os->StoreRecord({"guid", "", EventLatency_Normal,EventPersistence_Normal, 2, {3}}), false);
EXPECT_THAT(os->StoreRecord({"guid", "tenant", EventLatency_Unspecified,EventPersistence_Normal, 2, {3}}), false);
EXPECT_THAT(os->StoreRecord({"guid", "tenant", EventLatency_Normal, EventPersistence_Normal, 0, {3}}), false);
EXPECT_THAT(os->StoreRecord({ "", "tenant", EventLatency_Normal,EventPersistence_Normal, 2, {3} }), false);
EXPECT_THAT(os->StoreRecord({ "guid", "", EventLatency_Normal,EventPersistence_Normal, 2, {3} }), false);
EXPECT_THAT(os->StoreRecord({ "guid", "tenant", EventLatency_Unspecified,EventPersistence_Normal, 2, {3} }), false);
EXPECT_THAT(os->StoreRecord({ "guid", "tenant", EventLatency_Normal, EventPersistence_Normal, 0, {3} }), false);
}
TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, StoreRecord_RetriesOnceOnError)
@ -981,7 +985,7 @@ TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, StoreRecord_RetriesOnceOnE
expectDatabaseRecreation(true, "101");
EXPECT_THAT(os->StoreRecord({"guid", "tenant", EventLatency_Normal,EventPersistence_Normal, 2, std::vector<uint8_t>(20000, 42)}), false);
EXPECT_THAT(os->StoreRecord({ "guid", "tenant", EventLatency_Normal,EventPersistence_Normal, 2, std::vector<uint8_t>(20000, 42) }), false);
}
TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, StoreRecord_AbortsIfDbCannotBeRecreated)
@ -1001,7 +1005,7 @@ TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, StoreRecord_AbortsIfDbCann
expectDatabaseRecreation(false, "101");
EXPECT_THAT(os->StoreRecord({"guid", "tenant", EventLatency_Normal,EventPersistence_Normal, 2, {3}}), false);
EXPECT_THAT(os->StoreRecord({ "guid", "tenant", EventLatency_Normal,EventPersistence_Normal, 2, {3} }), false);
}
//---
@ -1538,15 +1542,15 @@ TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, DeleteRecords_Succeeds)
EXPECT_CALL(sqliteMock, sqlite3_step(PreparedStatement(this, ".* DELETE FROM events .*")))
.WillOnce(Invoke(this, &OfflineStorageTests_SQLiteWithMock::fakeStatementStepDone))
.RetiresOnSaturation();
HttpHeaders test;
bool fromMemory = false;
os->DeleteRecords({"id1", "id2"}, test, fromMemory);
HttpHeaders test;
bool fromMemory = false;
os->DeleteRecords({ "id1", "id2" }, test, fromMemory);
}
TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, DeleteRecords_DoesNothingWithEmptyInput)
{
HttpHeaders test;
bool fromMemory = false;
HttpHeaders test;
bool fromMemory = false;
os->DeleteRecords({}, test, fromMemory);
}
@ -1563,9 +1567,9 @@ TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, DeleteRecords_HandlesCommi
.RetiresOnSaturation();
expectDatabaseRecreation(true, "301");
HttpHeaders test;
bool fromMemory = false;
os->DeleteRecords({"id"}, test, fromMemory);
HttpHeaders test;
bool fromMemory = false;
os->DeleteRecords({ "id" }, test, fromMemory);
}
TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, DeleteRecords_HandlesDeletionFalure)
@ -1580,9 +1584,9 @@ TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, DeleteRecords_HandlesDelet
.RetiresOnSaturation();
expectDatabaseRecreation(true, "302");
HttpHeaders test;
bool fromMemory = false;
os->DeleteRecords({"id"}, test, fromMemory);
HttpHeaders test;
bool fromMemory = false;
os->DeleteRecords({ "id" }, test, fromMemory);
}
//---
@ -1613,9 +1617,9 @@ TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, ReleaseRecords_Succeeds)
EXPECT_CALL(sqliteMock, sqlite3_step(PreparedStatement(this, "COMMIT")))
.WillOnce(Invoke(this, &OfflineStorageTests_SQLiteWithMock::fakeStatementStepDone))
.RetiresOnSaturation();
HttpHeaders test;
bool fromMemory = false;
os->ReleaseRecords({"id1", "id2"}, false, test, fromMemory);
HttpHeaders test;
bool fromMemory = false;
os->ReleaseRecords({ "id1", "id2" }, false, test, fromMemory);
}
TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, ReleaseRecords_SucceedsAndIncreasesRetryCount)
@ -1674,15 +1678,15 @@ TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, ReleaseRecords_SucceedsAnd
EXPECT_CALL(sqliteMock, sqlite3_step(PreparedStatement(this, "COMMIT")))
.WillOnce(Invoke(this, &OfflineStorageTests_SQLiteWithMock::fakeStatementStepDone))
.RetiresOnSaturation();
HttpHeaders test;
bool fromMemory = false;
os->ReleaseRecords({"id1", "id2"}, true, test, fromMemory);
HttpHeaders test;
bool fromMemory = false;
os->ReleaseRecords({ "id1", "id2" }, true, test, fromMemory);
}
TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, ReleaseRecords_DoesNothingWithEmptyInput)
{
HttpHeaders test;
bool fromMemory = false;
HttpHeaders test;
bool fromMemory = false;
os->ReleaseRecords({}, false, test, fromMemory);
os->ReleaseRecords({}, true, test, fromMemory);
}
@ -1700,9 +1704,9 @@ TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, ReleaseRecords_HandlesComm
.RetiresOnSaturation();
expectDatabaseRecreation(true, "401");
HttpHeaders test;
bool fromMemory = false;
os->ReleaseRecords({"id"}, false, test, fromMemory);
HttpHeaders test;
bool fromMemory = false;
os->ReleaseRecords({ "id" }, false, test, fromMemory);
}
TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, ReleaseRecords_HandlesBeginTransactionFailure)
@ -1717,9 +1721,9 @@ TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, ReleaseRecords_HandlesBegi
.RetiresOnSaturation();
expectDatabaseRecreation(true, "402");
HttpHeaders test;
bool fromMemory = false;
os->ReleaseRecords({"id"}, false, test, fromMemory);
HttpHeaders test;
bool fromMemory = false;
os->ReleaseRecords({ "id" }, false, test, fromMemory);
}
TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, ReleaseRecords_HandlesReleaseFailure)
@ -1738,9 +1742,9 @@ TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, ReleaseRecords_HandlesRele
.RetiresOnSaturation();
expectDatabaseRecreation(true, "403");
HttpHeaders test;
bool fromMemory = false;
os->ReleaseRecords({"id"}, false, test, fromMemory);
HttpHeaders test;
bool fromMemory = false;
os->ReleaseRecords({ "id" }, false, test, fromMemory);
}
TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, ReleaseRecords_HandlesDeletionFailure)
@ -1777,9 +1781,9 @@ TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, ReleaseRecords_HandlesDele
.RetiresOnSaturation();
expectDatabaseRecreation(true, "404");
HttpHeaders test;
bool fromMemory = false;
os->ReleaseRecords({"id"}, true, test, fromMemory);
HttpHeaders test;
bool fromMemory = false;
os->ReleaseRecords({ "id" }, true, test, fromMemory);
}
TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, ReleaseRecords_HandlesFinalCommitFailure)
@ -1836,9 +1840,9 @@ TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, ReleaseRecords_HandlesFina
.RetiresOnSaturation();
expectDatabaseRecreation(true, "405");
HttpHeaders test;
bool fromMemory = false;
os->ReleaseRecords({"id"}, true, test, fromMemory);
HttpHeaders test;
bool fromMemory = false;
os->ReleaseRecords({ "id" }, true, test, fromMemory);
}
//---
@ -1995,6 +1999,7 @@ TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, GetSetting_HandlesSelectFa
//---
#if 0
TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, autoCommitTransaction_HandlesCommitFailure)
{
InSequence order;
@ -2011,6 +2016,7 @@ TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, autoCommitTransaction_Hand
os->autoCommitTransaction();
}
#endif
//---
@ -2067,7 +2073,7 @@ TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, trimDbIfNeeded_SucceedsWit
EXPECT_CALL(sqliteMock, sqlite3_column_text(PreparedStatement(this, "SELECT tenant_token FROM events ORDER BY persistence ASC, timestamp ASC .*"), 0))
.WillOnce(Return(reinterpret_cast<unsigned const char*>("token")))
.RetiresOnSaturation();
EXPECT_CALL(sqliteMock, sqlite3_bind_int64(PreparedStatement(this, "DELETE FROM events WHERE record_id .*"), 1, 5))
.WillOnce(Return(SQLITE_OK))
@ -2090,9 +2096,9 @@ TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, trimDbIfNeeded_SucceedsWit
EXPECT_CALL(sqliteMock, sqlite3_column_int64(PreparedStatement(this, "PRAGMA page_count"), 0))
.WillOnce(Return((1000000 / 1024) - 100))
.RetiresOnSaturation();
EXPECT_THAT(os->trimDbIfNeeded(20000), true);
}
TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, trimDbIfNeeded_HandlesCurrentPageCountFailure)
@ -2159,8 +2165,8 @@ TEST_F(OfflineStorageTests_SQLiteWithMockInitialized, trimDbIfNeeded_HandlesDele
.RetiresOnSaturation();
EXPECT_CALL(sqliteMock, sqlite3_step(PreparedStatement(this, "SELECT tenant_token FROM events ORDER BY persistence ASC, timestamp ASC .*")))
.WillOnce(Invoke(this, &OfflineStorageTests_SQLiteWithMock::fakeStatementStepRow))
.RetiresOnSaturation();
.WillOnce(Invoke(this, &OfflineStorageTests_SQLiteWithMock::fakeStatementStepRow))
.RetiresOnSaturation();
EXPECT_CALL(sqliteMock, sqlite3_column_bytes(PreparedStatement(this, "SELECT tenant_token FROM events ORDER BY persistence ASC, timestamp ASC .*"), 0))
.WillOnce(Return(5))
.RetiresOnSaturation();

8
tests/unittests/PackagerTests.cpp
Просмотреть файл

@ -14,7 +14,6 @@ using namespace ARIASDK_NS;
class PackagerTests : public StrictMock<Test> {
protected:
ILogConfiguration logConfiguration;
StrictMock<MockIRuntimeConfig> runtimeConfigMock;
Packager packager;
@ -23,7 +22,7 @@ class PackagerTests : public StrictMock<Test> {
protected:
PackagerTests()
: packager(logConfiguration, runtimeConfigMock)
: packager(runtimeConfigMock)
{
packager.emptyPackage >> emptyPackage;
packager.packagedEvents >> packagedEvents;
@ -205,9 +204,8 @@ TEST_F(PackagerTests, SetsRequestBondFieldsCorrectly)
TEST_F(PackagerTests, ForcedTenantIsForced)
{
ILogConfiguration logConfigurationF;
logConfigurationF.SetProperty("forcedTenantToken", "forced-Tenant-Token");
Packager packagerF(logConfigurationF, runtimeConfigMock);
runtimeConfigMock["forcedTenantToken"] = "forced-Tenant-Token";
Packager packagerF(runtimeConfigMock);
packagerF.packagedEvents >> packagedEvents;
auto ctx = EventsUploadContext::create();

2
tests/unittests/PalTests.cpp
Просмотреть файл

@ -4,8 +4,6 @@
#include "common/MockISemanticContext.hpp"
using namespace testing;
namespace PAL = ARIASDK_NS::PAL;
class PalTests : public Test {};

4
tests/unittests/SingleControlPlaneTests.cpp
Просмотреть файл

@ -1,3 +1,4 @@
#if 0
// Copyright (c) Microsoft. All rights reserved.
#include <exception>
@ -736,4 +737,5 @@ TEST(SingleControlPlaneTests, MultipleListenersAreRegistered_EachIsNotified)
ASSERT_EQ(2, handler3.m_count);
ASSERT_EQ(controlPlane.get(), handler3.m_lastControlPlane);
ASSERT_EQ(ariaTenantId2, handler3.m_lastAriaTenantId);
}
}
#endif

2
tests/unittests/TenantDataSerializerTests.cpp
Просмотреть файл

@ -1,3 +1,4 @@
#if 0
// Copyright (c) Microsoft. All rights reserved.
#include "common/Common.hpp"
@ -130,3 +131,4 @@ TEST(TenantDataSerializerTests, SerializeDeserialize_RoundTripReturnsIdenticalDa
for (auto pair : original.m_stringMap)
ASSERT_EQ(pair.second, roundTrip->m_stringMap[pair.first]);
}
#endif

6
tests/unittests/TransmissionPolicyManagerTests.cpp
Просмотреть файл

@ -11,8 +11,8 @@ using namespace ARIASDK_NS;
class TransmissionPolicyManager4Test : public TransmissionPolicyManager {
public:
TransmissionPolicyManager4Test(IRuntimeConfig& runtimeConfig, IBandwidthController* bandwidthController)
: TransmissionPolicyManager(runtimeConfig, bandwidthController)
TransmissionPolicyManager4Test(ITelemetrySystem& system, IBandwidthController* bandwidthController)
: TransmissionPolicyManager(system, bandwidthController)
{
}
@ -40,7 +40,7 @@ class TransmissionPolicyManagerTests : public StrictMock<Test> {
protected:
TransmissionPolicyManagerTests()
: tpm(runtimeConfigMock, &bandwidthControllerMock)
: tpm(testing::getSystem(), &bandwidthControllerMock)
{
tpm.initiateUpload >> initiateUpload;
tpm.allUploadsFinished >> allUploadsFinished;

198
tests/unittests/UnitTests.vcxproj
Просмотреть файл

@ -18,73 +18,90 @@
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\googletest\googlemock\msvc\2015\gmock.vcxproj">
<Project>{34681f0d-ce45-415d-b5f2-5c662dfe3bd5}</Project>
</ProjectReference>
<ProjectReference Include="..\..\googletest\googletest\msvc\gtest.vcxproj">
<Project>{c8f6c172-56f2-4e76-b5fa-c3b423b31be7}</Project>
</ProjectReference>
<ProjectReference Include="..\..\sqlite\sqlite.vcxproj">
<Project>{2ebc7b3c-2af1-442c-9285-cab39bbb8c00}</Project>
</ProjectReference>
<ProjectReference Include="..\..\zlib\contrib\vstudio\vc14\zlibvc.vcxproj">
<Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
</ProjectReference>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGUID>{434C594F-CDE0-3690-AC0A-9ED854B74092}</ProjectGUID>
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<Keyword>Win32Proj</Keyword>
<Platform>Win32</Platform>
<ProjectName>UnitTests</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
<Import Project="..\..\Solutions\Clienttelemetry\Clienttelemetry.vcxitems" Label="Shared" />
<Import Project="..\..\lib\pal\win32\win32.vcxitems" Label="Shared" />
</ImportGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\out\$(Configuration)\$(Platform)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\out\obj\UnitTests.dir\$(Configuration)\$(Platform)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">UnitTests</TargetName>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.exe</TargetExt>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\out\$(Configuration)\$(Platform)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\out\obj\UnitTests.dir\$(Configuration)\$(Platform)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">UnitTests</TargetName>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.exe</TargetExt>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)..\..\out\$(Configuration)\$(Platform)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)..\..\out\obj\UnitTests.dir\$(Configuration)\$(Platform)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">UnitTests</TargetName>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.exe</TargetExt>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)..\..\out\$(Configuration)\$(Platform)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)..\..\out\obj\UnitTests.dir\$(Configuration)\$(Platform)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">UnitTests</TargetName>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.exe</TargetExt>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
</PropertyGroup>
<PropertyGroup>
<LibraryPath>$(LibraryPath)</LibraryPath>
<IncludePath>$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(WindowsSdk_71A_IncludePath);$(VC_IncludePath);$(IncludePath)</IncludePath>
<ExcludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86);$(VC_LibraryPath_x64);</ExcludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib;$(ProjectDir)..\..\..\lib\include\public;$(ProjectDir)..\..\..\lib\include\aria;$(ProjectDir)..\..\..\bondlite\include;$(ProjectDir)..\..\..\tests;$(ProjectDir)..\..\..\tests\..\lib;$(ProjectDir)..\..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\googletest\googletest\include;$(ProjectDir)..\..\googletest\googlemock\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AssemblerListingLocation>Debug/</AssemblerListingLocation>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<CompileAs>CompileAsCpp</CompileAs>
@ -96,16 +113,16 @@
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level4</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="OneSDK";CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;_WINDOWS;_DEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="OneSDK";CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName>
<TreatWarningAsError>true</TreatWarningAsError>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX=\"Aria\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\bond\generated;$(ProjectDir)..\..\..\lib\http;$(ProjectDir)..\..\..\lib\api;$(ProjectDir)..\..\..\lib\backoff;$(ProjectDir)..\..\..\lib\callbacks;$(ProjectDir)..\..\..\lib\config;$(ProjectDir)..\..\..\lib\compression;$(ProjectDir)..\..\..\lib\decorators;$(ProjectDir)..\..\..\lib\offline;$(ProjectDir)..\..\..\lib\packager;$(ProjectDir)..\..\..\lib\pal;$(ProjectDir)..\..\..\lib\stats;$(ProjectDir)..\..\..\lib\system;$(ProjectDir)..\..\..\lib\tpm;$(ProjectDir)..\..\..\lib\utils;$(ProjectDir)..\..\..\lib\include\aria;$(ProjectDir)..\..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\..\tests\.;$(ProjectDir)..\..\..\tests\..\lib;$(ProjectDir)..\..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Midl>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\bond\generated;$(ProjectDir)..\..\..\lib\http;$(ProjectDir)..\..\..\lib\api;$(ProjectDir)..\..\..\lib\backoff;$(ProjectDir)..\..\..\lib\callbacks;$(ProjectDir)..\..\..\lib\config;$(ProjectDir)..\..\..\lib\compression;$(ProjectDir)..\..\..\lib\decorators;$(ProjectDir)..\..\..\lib\offline;$(ProjectDir)..\..\..\lib\packager;$(ProjectDir)..\..\..\lib\pal;$(ProjectDir)..\..\..\lib\stats;$(ProjectDir)..\..\..\lib\system;$(ProjectDir)..\..\..\lib\tpm;$(ProjectDir)..\..\..\lib\utils;$(ProjectDir)..\..\..\lib\include\aria;$(ProjectDir)..\..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\..\tests\.;$(ProjectDir)..\..\..\tests\..\lib;$(ProjectDir)..\..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
<HeaderFileName>%(Filename).h</HeaderFileName>
<TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@ -114,23 +131,22 @@
</Midl>
<Link>
<AdditionalOptions> /machine:X86 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>runtimeobject.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;version.lib;$(ProjectDir)..\..\..\sysroot\lib\$(Configuration)\$(Platform)\gtestd.lib;$(ProjectDir)..\..\..\sysroot\lib\$(Configuration)\$(Platform)\gmock.lib;$(ProjectDir)..\..\out\$(Configuration)\$(Platform)\aria.lib;rpcrt4.lib;wininet.lib;iphlpapi.lib;$(ProjectDir)..\..\out\$(Configuration)\$(Platform)\sqlite.lib;$(ProjectDir)..\..\..\sysroot\lib\$(Configuration)\$(Platform)\z.lib</AdditionalDependencies>
<AdditionalDependencies>pdh.lib;runtimeobject.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;version.lib;rpcrt4.lib;wininet.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>Debug</GenerateDebugInformation>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ImportLibrary>$(ProjectDir)..\..\out\obj\UnitTests.dir\$(Configuration)\$(Platform)\UnitTests.lib</ImportLibrary>
<ProgramDataBaseFile>$(ProjectDir)..\..\out\obj\UnitTests.dir\$(Configuration)\$(Platform)\UnitTests.pdb</ProgramDataBaseFile>
<SubSystem>Console</SubSystem>
<Version>
</Version>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
</Link>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
</ProjectReference>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib;$(ProjectDir)..\..\..\lib\include\public;$(ProjectDir)..\..\..\lib\include\aria;$(ProjectDir)..\..\..\bondlite\include;$(ProjectDir)..\..\..\tests;$(ProjectDir)..\..\..\tests\..\lib;$(ProjectDir)..\..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\googletest\googletest\include;$(ProjectDir)..\..\googletest\googlemock\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AssemblerListingLocation>Release/</AssemblerListingLocation>
<CompileAs>CompileAsCpp</CompileAs>
<ExceptionHandling>Sync</ExceptionHandling>
@ -140,7 +156,7 @@
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level4</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="OneSDK";CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="OneSDK";CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName>
<DebugInformationFormat>
</DebugInformationFormat>
@ -148,10 +164,10 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX=\"Aria\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\bond\generated;$(ProjectDir)..\..\..\lib\http;$(ProjectDir)..\..\..\lib\api;$(ProjectDir)..\..\..\lib\backoff;$(ProjectDir)..\..\..\lib\callbacks;$(ProjectDir)..\..\..\lib\config;$(ProjectDir)..\..\..\lib\compression;$(ProjectDir)..\..\..\lib\decorators;$(ProjectDir)..\..\..\lib\offline;$(ProjectDir)..\..\..\lib\packager;$(ProjectDir)..\..\..\lib\pal;$(ProjectDir)..\..\..\lib\stats;$(ProjectDir)..\..\..\lib\system;$(ProjectDir)..\..\..\lib\tpm;$(ProjectDir)..\..\..\lib\utils;$(ProjectDir)..\..\..\lib\include\aria;$(ProjectDir)..\..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\..\tests\.;$(ProjectDir)..\..\..\tests\..\lib;$(ProjectDir)..\..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Midl>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\bond\generated;$(ProjectDir)..\..\..\lib\http;$(ProjectDir)..\..\..\lib\api;$(ProjectDir)..\..\..\lib\backoff;$(ProjectDir)..\..\..\lib\callbacks;$(ProjectDir)..\..\..\lib\config;$(ProjectDir)..\..\..\lib\compression;$(ProjectDir)..\..\..\lib\decorators;$(ProjectDir)..\..\..\lib\offline;$(ProjectDir)..\..\..\lib\packager;$(ProjectDir)..\..\..\lib\pal;$(ProjectDir)..\..\..\lib\stats;$(ProjectDir)..\..\..\lib\system;$(ProjectDir)..\..\..\lib\tpm;$(ProjectDir)..\..\..\lib\utils;$(ProjectDir)..\..\..\lib\include\aria;$(ProjectDir)..\..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\..\tests\.;$(ProjectDir)..\..\..\tests\..\lib;$(ProjectDir)..\..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
<HeaderFileName>%(Filename).h</HeaderFileName>
<TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@ -160,23 +176,22 @@
</Midl>
<Link>
<AdditionalOptions> /machine:X86 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>runtimeobject.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;version.lib;$(ProjectDir)..\..\..\sysroot\lib\$(Configuration)\$(Platform)\gtest.lib;$(ProjectDir)..\..\..\sysroot\lib\$(Configuration)\$(Platform)\gmock.lib;$(ProjectDir)..\..\out\$(Configuration)\$(Platform)\aria.lib;rpcrt4.lib;wininet.lib;iphlpapi.lib;$(ProjectDir)..\..\out\$(Configuration)\$(Platform)\sqlite.lib;$(ProjectDir)..\..\..\sysroot\lib\$(Configuration)\$(Platform)\z.lib</AdditionalDependencies>
<AdditionalDependencies>pdh.lib;runtimeobject.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;version.lib;rpcrt4.lib;wininet.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>No</GenerateDebugInformation>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ImportLibrary>$(ProjectDir)/Release/UnitTests.lib</ImportLibrary>
<ProgramDataBaseFile>$(ProjectDir)/Release/UnitTests.pdb</ProgramDataBaseFile>
<SubSystem>Console</SubSystem>
<Version>
</Version>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
</Link>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
</ProjectReference>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib;$(ProjectDir)..\..\..\lib\include\public;$(ProjectDir)..\..\..\lib\include\aria;$(ProjectDir)..\..\..\bondlite\include;$(ProjectDir)..\..\..\tests;$(ProjectDir)..\..\..\tests\..\lib;$(ProjectDir)..\..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\googletest\googletest\include;$(ProjectDir)..\..\googletest\googlemock\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AssemblerListingLocation>Debug/</AssemblerListingLocation>
<CompileAs>CompileAsCpp</CompileAs>
<ExceptionHandling>Sync</ExceptionHandling>
@ -186,7 +201,7 @@
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level4</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="OneSDK";CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="OneSDK";CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName>
<DebugInformationFormat>
</DebugInformationFormat>
@ -194,10 +209,10 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX=\"Aria\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\bond\generated;$(ProjectDir)..\..\..\lib\http;$(ProjectDir)..\..\..\lib\api;$(ProjectDir)..\..\..\lib\backoff;$(ProjectDir)..\..\..\lib\callbacks;$(ProjectDir)..\..\..\lib\config;$(ProjectDir)..\..\..\lib\compression;$(ProjectDir)..\..\..\lib\decorators;$(ProjectDir)..\..\..\lib\offline;$(ProjectDir)..\..\..\lib\packager;$(ProjectDir)..\..\..\lib\pal;$(ProjectDir)..\..\..\lib\stats;$(ProjectDir)..\..\..\lib\system;$(ProjectDir)..\..\..\lib\tpm;$(ProjectDir)..\..\..\lib\utils;$(ProjectDir)..\..\..\lib\include\aria;$(ProjectDir)..\..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\..\tests\.;$(ProjectDir)..\..\..\tests\..\lib;$(ProjectDir)..\..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Midl>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\bond\generated;$(ProjectDir)..\..\..\lib\http;$(ProjectDir)..\..\..\lib\api;$(ProjectDir)..\..\..\lib\backoff;$(ProjectDir)..\..\..\lib\callbacks;$(ProjectDir)..\..\..\lib\config;$(ProjectDir)..\..\..\lib\compression;$(ProjectDir)..\..\..\lib\decorators;$(ProjectDir)..\..\..\lib\offline;$(ProjectDir)..\..\..\lib\packager;$(ProjectDir)..\..\..\lib\pal;$(ProjectDir)..\..\..\lib\stats;$(ProjectDir)..\..\..\lib\system;$(ProjectDir)..\..\..\lib\tpm;$(ProjectDir)..\..\..\lib\utils;$(ProjectDir)..\..\..\lib\include\aria;$(ProjectDir)..\..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\..\tests\.;$(ProjectDir)..\..\..\tests\..\lib;$(ProjectDir)..\..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
<HeaderFileName>%(Filename).h</HeaderFileName>
<TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@ -206,24 +221,22 @@
</Midl>
<Link>
<AdditionalOptions> /machine:X64 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>runtimeobject.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;version.lib;$(ProjectDir)..\..\..\sysroot\lib\$(Configuration)\$(Platform)\gtestd.lib;$(ProjectDir)..\..\..\sysroot\lib\$(Configuration)\$(Platform)\gmock.lib;$(ProjectDir)..\..\out\$(Configuration)\$(Platform)\aria.lib;rpcrt4.lib;wininet.lib;iphlpapi.lib;$(ProjectDir)..\..\out\$(Configuration)\$(Platform)\sqlite.lib;$(ProjectDir)..\..\..\sysroot\lib\$(Configuration)\$(Platform)\z.lib</AdditionalDependencies>
<AdditionalDependencies>pdh.lib;runtimeobject.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;version.lib;rpcrt4.lib;wininet.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>No</GenerateDebugInformation>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ImportLibrary>$(ProjectDir)..\..\out\obj\UnitTests.dir\$(Configuration)\$(Platform)\UnitTests.lib</ImportLibrary>
<ProgramDataBaseFile>$(ProjectDir)..\..\out\obj\UnitTests.dir\$(Configuration)\$(Platform)\UnitTests.pdb</ProgramDataBaseFile>
<SubSystem>Console</SubSystem>
<Version>
</Version>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
</Link>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
</ProjectReference>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib;$(ProjectDir)..\..\..\lib\include\public;$(ProjectDir)..\..\..\lib\include\aria;$(ProjectDir)..\..\..\bondlite\include;$(ProjectDir)..\..\..\tests;$(ProjectDir)..\..\..\tests\..\lib;$(ProjectDir)..\..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\googletest\googletest\include;$(ProjectDir)..\..\googletest\googlemock\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AssemblerListingLocation>Release/</AssemblerListingLocation>
<CompileAs>CompileAsCpp</CompileAs>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -234,16 +247,16 @@
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level4</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="OneSDK";CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="OneSDK";CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName>
<TreatWarningAsError>true</TreatWarningAsError>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX=\"Aria\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\bond\generated;$(ProjectDir)..\..\..\lib\http;$(ProjectDir)..\..\..\lib\api;$(ProjectDir)..\..\..\lib\backoff;$(ProjectDir)..\..\..\lib\callbacks;$(ProjectDir)..\..\..\lib\config;$(ProjectDir)..\..\..\lib\compression;$(ProjectDir)..\..\..\lib\decorators;$(ProjectDir)..\..\..\lib\offline;$(ProjectDir)..\..\..\lib\packager;$(ProjectDir)..\..\..\lib\pal;$(ProjectDir)..\..\..\lib\stats;$(ProjectDir)..\..\..\lib\system;$(ProjectDir)..\..\..\lib\tpm;$(ProjectDir)..\..\..\lib\utils;$(ProjectDir)..\..\..\lib\include\aria;$(ProjectDir)..\..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\..\tests\.;$(ProjectDir)..\..\..\tests\..\lib;$(ProjectDir)..\..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Midl>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\bond\generated;$(ProjectDir)..\..\..\lib\http;$(ProjectDir)..\..\..\lib\api;$(ProjectDir)..\..\..\lib\backoff;$(ProjectDir)..\..\..\lib\callbacks;$(ProjectDir)..\..\..\lib\config;$(ProjectDir)..\..\..\lib\compression;$(ProjectDir)..\..\..\lib\decorators;$(ProjectDir)..\..\..\lib\offline;$(ProjectDir)..\..\..\lib\packager;$(ProjectDir)..\..\..\lib\pal;$(ProjectDir)..\..\..\lib\stats;$(ProjectDir)..\..\..\lib\system;$(ProjectDir)..\..\..\lib\tpm;$(ProjectDir)..\..\..\lib\utils;$(ProjectDir)..\..\..\lib\include\aria;$(ProjectDir)..\..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\..\tests\.;$(ProjectDir)..\..\..\tests\..\lib;$(ProjectDir)..\..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\.;$(ProjectDir)..\..\lib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
<HeaderFileName>%(Filename).h</HeaderFileName>
<TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@ -252,72 +265,71 @@
</Midl>
<Link>
<AdditionalOptions> /machine:X64 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>runtimeobject.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;version.lib;$(ProjectDir)..\..\..\sysroot\lib\$(Configuration)\$(Platform)\gtest.lib;$(ProjectDir)..\..\..\sysroot\lib\$(Configuration)\$(Platform)\gmock.lib;$(ProjectDir)..\..\out\$(Configuration)\$(Platform)\aria.lib;rpcrt4.lib;wininet.lib;iphlpapi.lib;$(ProjectDir)..\..\out\$(Configuration)\$(Platform)\sqlite.lib;$(ProjectDir)..\..\..\sysroot\lib\$(Configuration)\$(Platform)\z.lib</AdditionalDependencies>
<AdditionalDependencies>pdh.lib;runtimeobject.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;version.lib;rpcrt4.lib;wininet.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>Debug</GenerateDebugInformation>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ImportLibrary>$(ProjectDir)/Release/UnitTests.lib</ImportLibrary>
<ProgramDataBaseFile>$(ProjectDir)/Release/UnitTests.pdb</ProgramDataBaseFile>
<SubSystem>Console</SubSystem>
<Version>
</Version>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
</Link>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
</ProjectReference>
</ItemDefinitionGroup>
<ItemGroup>
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(ProjectDir)..\..\..\tests\common\Common.hpp" />
<ClInclude Include="$(ProjectDir)..\..\..\tests\common\HttpServer.hpp" />
<ClInclude Include="$(ProjectDir)..\..\..\tests\common\MockIHttpClient.hpp" />
<ClInclude Include="$(ProjectDir)..\..\..\tests\common\MockILocalStorageReader.hpp" />
<ClInclude Include="$(ProjectDir)..\..\..\tests\common\MockILogManagerInternal.hpp" />
<ClInclude Include="$(ProjectDir)..\..\..\tests\common\MockIOfflineStorage.hpp" />
<ClInclude Include="$(ProjectDir)..\..\..\tests\common\MockIOfflineStorageObserver.hpp" />
<ClInclude Include="$(ProjectDir)..\..\..\tests\common\MockIRuntimeConfig.hpp" />
<ClInclude Include="$(ProjectDir)..\..\..\tests\common\MockISemanticContext.hpp" />
<ClInclude Include="$(ProjectDir)..\..\..\tests\common\MockISqlite3Proxy.hpp" />
<ClInclude Include="$(ProjectDir)..\..\..\tests\common\SocketTools.hpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\BondSplicerTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\ContextFieldsProviderTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\ControlPlaneProviderTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\CorrelationVectorTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\DiskLocalStorageTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\EventPropertiesTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\BackoffTests_ExponentialWithJitter.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\FIFOOfflineStorageTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\GuidTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\HttpClientTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\HttpClientManagerTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\HttpDeflateCompressionTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\HttpRequestEncoderTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\HttpResponseDecoderTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\HttpServerTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\LoggerTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\Main.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\MetaStatsTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\OacrTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\OfflineStorageTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\OfflineStorageTests_SQLite.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\OfflineStorageTests_SQLiteWithMock.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\PackagerTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\PalTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\RouteTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\SingleControlPlaneTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\StringUtilsTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\TenantDataSerializerTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\TransmissionPolicyManagerTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\UtilsTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\common\Common.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\common\Mocks.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(ProjectDir)../../../Solutions/lib/aria.vcxproj">
<Project>9B4418D4-0605-30CF-8D79-16B19B7E5CEC</Project>
</ProjectReference>
<ClInclude Include="$(ProjectDir)..\common\Common.hpp" />
<ClInclude Include="$(ProjectDir)..\common\HttpServer.hpp" />
<ClInclude Include="$(ProjectDir)..\common\MockIHttpClient.hpp" />
<ClInclude Include="$(ProjectDir)..\common\MockILocalStorageReader.hpp" />
<ClInclude Include="$(ProjectDir)..\common\MockILogManagerInternal.hpp" />
<ClInclude Include="$(ProjectDir)..\common\MockIOfflineStorage.hpp" />
<ClInclude Include="$(ProjectDir)..\common\MockIOfflineStorageObserver.hpp" />
<ClInclude Include="$(ProjectDir)..\common\MockIRuntimeConfig.hpp" />
<ClInclude Include="$(ProjectDir)..\common\MockISemanticContext.hpp" />
<ClInclude Include="$(ProjectDir)..\common\MockISqlite3Proxy.hpp" />
<ClInclude Include="$(ProjectDir)..\common\SocketTools.hpp" />
<ClCompile Include="$(ProjectDir)\BondSplicerTests.cpp" />
<ClCompile Include="$(ProjectDir)\ContextFieldsProviderTests.cpp" />
<ClCompile Include="$(ProjectDir)\ControlPlaneProviderTests.cpp" />
<ClCompile Include="$(ProjectDir)\CorrelationVectorTests.cpp" />
<ClCompile Include="$(ProjectDir)\DiskLocalStorageTests.cpp" />
<ClCompile Include="$(ProjectDir)\EventPropertiesTests.cpp" />
<ClCompile Include="$(ProjectDir)\BackoffTests_ExponentialWithJitter.cpp" />
<ClCompile Include="$(ProjectDir)\FIFOOfflineStorageTests.cpp" />
<ClCompile Include="$(ProjectDir)\GuidTests.cpp" />
<ClCompile Include="$(ProjectDir)\HttpClientTests.cpp" />
<ClCompile Include="$(ProjectDir)\HttpClientManagerTests.cpp" />
<ClCompile Include="$(ProjectDir)\HttpDeflateCompressionTests.cpp" />
<ClCompile Include="$(ProjectDir)\HttpRequestEncoderTests.cpp" />
<ClCompile Include="$(ProjectDir)\HttpResponseDecoderTests.cpp" />
<ClCompile Include="$(ProjectDir)\HttpServerTests.cpp" />
<ClCompile Include="$(ProjectDir)\LoggerTests.cpp" />
<ClCompile Include="$(ProjectDir)\Main.cpp" />
<ClCompile Include="$(ProjectDir)\MetaStatsTests.cpp" />
<ClCompile Include="$(ProjectDir)\OacrTests.cpp" />
<ClCompile Include="$(ProjectDir)\OfflineStorageTests.cpp" />
<ClCompile Include="$(ProjectDir)\OfflineStorageTests_SQLite.cpp" />
<ClCompile Include="$(ProjectDir)\OfflineStorageTests_SQLiteWithMock.cpp" />
<ClCompile Include="$(ProjectDir)\PackagerTests.cpp" />
<ClCompile Include="$(ProjectDir)\PalTests.cpp" />
<ClCompile Include="$(ProjectDir)\RouteTests.cpp" />
<ClCompile Include="$(ProjectDir)\SingleControlPlaneTests.cpp" />
<ClCompile Include="$(ProjectDir)\StringUtilsTests.cpp" />
<ClCompile Include="$(ProjectDir)\TenantDataSerializerTests.cpp" />
<ClCompile Include="$(ProjectDir)\TransmissionPolicyManagerTests.cpp" />
<ClCompile Include="$(ProjectDir)\UtilsTests.cpp" />
<ClCompile Include="$(ProjectDir)..\common\Common.cpp" />
<ClCompile Include="$(ProjectDir)..\common\Mocks.cpp" />
<ClInclude Include="..\common\MockIBandwidthController.hpp" />
<ClInclude Include="..\common\MockIEcsClient.hpp" />
<ClInclude Include="..\common\MockITelemetrySystem.hpp" />
<ClInclude Include="..\common\MockITenantDataSerializer.hpp" />
</ItemGroup>
<Import Project="$(SolutionDir)\build.props" Condition="Exists('$(SolutionDir)\build.props')" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

134
tests/unittests/UnitTests.vcxproj.filters
Просмотреть файл

@ -1,58 +1,98 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\BondSplicerTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\ContextFieldsProviderTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\ControlPlaneProviderTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\CorrelationVectorTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\EventPropertiesTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\BackoffTests_ExponentialWithJitter.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\DiskLocalStorageTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\FIFOOfflineStorageTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\GuidTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\HttpClientTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\HttpClientManagerTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\HttpDeflateCompressionTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\HttpRequestEncoderTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\HttpResponseDecoderTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\HttpServerTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\LoggerTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\Main.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\MetaStatsTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\OacrTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\OfflineStorageTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\OfflineStorageTests_SQLite.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\OfflineStorageTests_SQLiteWithMock.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\PackagerTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\PalTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\RouteTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\SingleControlPlaneTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\StringUtilsTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\TenantDataSerializerTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\TransmissionPolicyManagerTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\unittests\UtilsTests.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\common\Common.cpp" />
<ClCompile Include="$(ProjectDir)..\..\..\tests\common\Mocks.cpp" />
<ClCompile Include="$(ProjectDir)\BondSplicerTests.cpp" />
<ClCompile Include="$(ProjectDir)\ContextFieldsProviderTests.cpp" />
<ClCompile Include="$(ProjectDir)\ControlPlaneProviderTests.cpp" />
<ClCompile Include="$(ProjectDir)\CorrelationVectorTests.cpp" />
<ClCompile Include="$(ProjectDir)\DiskLocalStorageTests.cpp" />
<ClCompile Include="$(ProjectDir)\EventPropertiesTests.cpp" />
<ClCompile Include="$(ProjectDir)\BackoffTests_ExponentialWithJitter.cpp" />
<ClCompile Include="$(ProjectDir)\FIFOOfflineStorageTests.cpp" />
<ClCompile Include="$(ProjectDir)\GuidTests.cpp" />
<ClCompile Include="$(ProjectDir)\HttpClientTests.cpp" />
<ClCompile Include="$(ProjectDir)\HttpClientManagerTests.cpp" />
<ClCompile Include="$(ProjectDir)\HttpDeflateCompressionTests.cpp" />
<ClCompile Include="$(ProjectDir)\HttpRequestEncoderTests.cpp" />
<ClCompile Include="$(ProjectDir)\HttpResponseDecoderTests.cpp" />
<ClCompile Include="$(ProjectDir)\LoggerTests.cpp" />
<ClCompile Include="$(ProjectDir)\Main.cpp" />
<ClCompile Include="$(ProjectDir)\MetaStatsTests.cpp" />
<ClCompile Include="$(ProjectDir)\OacrTests.cpp" />
<ClCompile Include="$(ProjectDir)\OfflineStorageTests.cpp" />
<ClCompile Include="$(ProjectDir)\OfflineStorageTests_SQLite.cpp" />
<ClCompile Include="$(ProjectDir)\OfflineStorageTests_SQLiteWithMock.cpp" />
<ClCompile Include="$(ProjectDir)\PackagerTests.cpp" />
<ClCompile Include="$(ProjectDir)\PalTests.cpp" />
<ClCompile Include="$(ProjectDir)\RouteTests.cpp" />
<ClCompile Include="$(ProjectDir)\SingleControlPlaneTests.cpp" />
<ClCompile Include="$(ProjectDir)\StringUtilsTests.cpp" />
<ClCompile Include="$(ProjectDir)\TenantDataSerializerTests.cpp" />
<ClCompile Include="$(ProjectDir)\TransmissionPolicyManagerTests.cpp" />
<ClCompile Include="$(ProjectDir)\UtilsTests.cpp" />
<ClCompile Include="$(ProjectDir)..\common\Common.cpp">
<Filter>common</Filter>
</ClCompile>
<ClCompile Include="$(ProjectDir)\HttpServerTests.cpp">
<Filter>common</Filter>
</ClCompile>
<ClCompile Include="$(ProjectDir)..\common\Mocks.cpp">
<Filter>mocks</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(ProjectDir)..\..\..\tests\common\Common.hpp" />
<ClInclude Include="$(ProjectDir)..\..\..\tests\common\HttpServer.hpp" />
<ClInclude Include="$(ProjectDir)..\..\..\tests\common\MockIHttpClient.hpp" />
<ClInclude Include="$(ProjectDir)..\..\..\tests\common\MockILogManagerInternal.hpp" />
<ClInclude Include="$(ProjectDir)..\..\..\tests\common\MockIOfflineStorage.hpp" />
<ClInclude Include="$(ProjectDir)..\..\..\tests\common\MockIOfflineStorageObserver.hpp" />
<ClInclude Include="$(ProjectDir)..\..\..\tests\common\MockIRuntimeConfig.hpp" />
<ClInclude Include="$(ProjectDir)..\..\..\tests\common\MockISemanticContext.hpp" />
<ClInclude Include="$(ProjectDir)..\..\..\tests\common\MockISqlite3Proxy.hpp" />
<ClInclude Include="$(ProjectDir)..\..\..\tests\common\SocketTools.hpp" />
<ClInclude Include="$(ProjectDir)..\..\..\tests\common\MockILocalStorageReader.hpp" />
<ClInclude Include="$(ProjectDir)..\common\MockIHttpClient.hpp">
<Filter>mocks</Filter>
</ClInclude>
<ClInclude Include="$(ProjectDir)..\common\MockILocalStorageReader.hpp">
<Filter>mocks</Filter>
</ClInclude>
<ClInclude Include="$(ProjectDir)..\common\MockILogManagerInternal.hpp">
<Filter>mocks</Filter>
</ClInclude>
<ClInclude Include="$(ProjectDir)..\common\MockIOfflineStorage.hpp">
<Filter>mocks</Filter>
</ClInclude>
<ClInclude Include="$(ProjectDir)..\common\MockIOfflineStorageObserver.hpp">
<Filter>mocks</Filter>
</ClInclude>
<ClInclude Include="$(ProjectDir)..\common\MockIRuntimeConfig.hpp">
<Filter>mocks</Filter>
</ClInclude>
<ClInclude Include="$(ProjectDir)..\common\MockISemanticContext.hpp">
<Filter>mocks</Filter>
</ClInclude>
<ClInclude Include="$(ProjectDir)..\common\MockISqlite3Proxy.hpp">
<Filter>mocks</Filter>
</ClInclude>
<ClInclude Include="$(ProjectDir)..\common\Common.hpp">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="$(ProjectDir)..\common\HttpServer.hpp">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="$(ProjectDir)..\common\SocketTools.hpp">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\common\MockIBandwidthController.hpp">
<Filter>mocks</Filter>
</ClInclude>
<ClInclude Include="..\common\MockIEcsClient.hpp">
<Filter>mocks</Filter>
</ClInclude>
<ClInclude Include="..\common\MockITenantDataSerializer.hpp">
<Filter>mocks</Filter>
</ClInclude>
<ClInclude Include="..\common\MockITelemetrySystem.hpp">
<Filter>mocks</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include=" ">
<UniqueIdentifier>{785D8461-1CA4-30CA-9A64-692B8A3A06A7}</UniqueIdentifier>
<Filter Include="mocks">
<UniqueIdentifier>{1ee41be5-aab8-484c-b10d-9d77c3daea98}</UniqueIdentifier>
</Filter>
<Filter Include="common">
<UniqueIdentifier>{F910581B-17A7-3DD0-AEFD-1B8C0A922D49}</UniqueIdentifier>
<UniqueIdentifier>{44049a53-32db-4e10-87ad-3d42a4fcac17}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>

1
tools/googlemock-generator.cmd Normal file
Просмотреть файл

@ -0,0 +1 @@
python ..\googletest\googlemock\scripts\generator\gmock_gen.py %1