BlockStorage/siadrive
Archived
1
0
Fork 0
Code Activity

Fixed unit test build

Browse Source
This commit is contained in:
Scott E. Graves
2017-03-13 15:27:23 -05:00
parent 6bd4b75d78
commit 12c22967be
9 changed files with 582 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1108
SiaDrive.sln
View File

File diff suppressed because it is too large Load Diff

4
UnitTests/SiaApiFileTreeTests.cpp
View File

@@ -1,9 +1,11 @@
#include "stdafx.h" #include "stdafx.h"
#include "CppUnitTest.h"
#include <SiaApi.h> #include <SiaApi.h>
#include "UnitTestConfig.h" #include "UnitTestConfig.h"
#include "SiaDriveConfig.h" #include "SiaDriveConfig.h"
#include "SiaDokanDrive.h"
using namespace Microsoft::VisualStudio::CppUnitTestFramework; using namespace Microsoft::VisualStudio::CppUnitTestFramework;
using namespace Sia::Api;
using namespace Sia::Api::Dokan;
namespace UnitTests namespace UnitTests
{ {

2
UnitTests/SiaApiTests.cpp
View File

@@ -3,8 +3,8 @@
#include <SiaApi.h> #include <SiaApi.h>
#include "UnitTestConfig.h" #include "UnitTestConfig.h"
#include "SiaDriveConfig.h" #include "SiaDriveConfig.h"
using namespace Microsoft::VisualStudio::CppUnitTestFramework; using namespace Microsoft::VisualStudio::CppUnitTestFramework;
using namespace Sia::Api;
namespace UnitTests namespace UnitTests
{ {

3
UnitTests/SiaCurlTests.cpp
View File

@@ -1,9 +1,8 @@
#include "stdafx.h" #include "stdafx.h"
#include "CppUnitTest.h"
#include "SiaCurl.h" #include "SiaCurl.h"
#include "UnitTestConfig.h" #include "UnitTestConfig.h"
using namespace Microsoft::VisualStudio::CppUnitTestFramework; using namespace Microsoft::VisualStudio::CppUnitTestFramework;
using namespace Sia::Api;
namespace UnitTests namespace UnitTests
{ {

2
UnitTests/SiaDriveConfigTests.cpp
View File

@@ -1,8 +1,8 @@
#include "stdafx.h" #include "stdafx.h"
#include "CppUnitTest.h"
#include "SiaDriveConfig.h" #include "SiaDriveConfig.h"
#include <Shlobj.h> #include <Shlobj.h>
using namespace Microsoft::VisualStudio::CppUnitTestFramework; using namespace Microsoft::VisualStudio::CppUnitTestFramework;
using namespace Sia::Api;
namespace UnitTests namespace UnitTests
{ {

6
UnitTests/SiaWalletApiTests.cpp
View File

@@ -1,12 +1,12 @@
#include "stdafx.h" #include "stdafx.h"
#include "CppUnitTest.h"
#include <SiaApi.h> #include <SiaApi.h>
#include "UnitTestConfig.h" #include "UnitTestConfig.h"
#include "SiaDriveConfig.h" #include "SiaDriveConfig.h"
using namespace Microsoft::VisualStudio::CppUnitTestFramework; using namespace Microsoft::VisualStudio::CppUnitTestFramework;
using namespace Sia::Api;
namespace UnitTests namespace UnitTests
{ {
TEST_CLASS(SiaWalletApi) TEST_CLASS(SiaWalletApi)
{ {
DAEMON_TEST() DAEMON_TEST()
@@ -32,7 +32,7 @@ namespace UnitTests
Assert::IsTrue(wallet->GetCreated()); Assert::IsTrue(wallet->GetCreated());
Assert::IsFalse(wallet->GetLocked()); Assert::IsFalse(wallet->GetLocked());
Assert::IsTrue(ApiSuccess(wallet->Lock( ))); Assert::IsTrue(ApiSuccess(wallet->Lock()));
Assert::IsTrue(wallet->GetCreated()); Assert::IsTrue(wallet->GetCreated());
Assert::IsTrue(wallet->GetLocked()); Assert::IsTrue(wallet->GetLocked());
} }

24
UnitTests/UnitTests.vcxproj
View File

@@ -26,14 +26,14 @@
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset> <PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc> <UseOfMfc>Dynamic</UseOfMfc>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset> <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -41,14 +41,14 @@
<UseOfMfc>Dynamic</UseOfMfc> <UseOfMfc>Dynamic</UseOfMfc>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset> <PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc> <UseOfMfc>Dynamic</UseOfMfc>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset> <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -75,22 +75,30 @@
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<IncludePath>$(VCInstallDir)UnitTest\include;$(IncludePath)</IncludePath>
<LibraryPath>$(VCInstallDir)UnitTest\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<IncludePath>$(VCInstallDir)UnitTest\include;$(IncludePath)</IncludePath>
<LibraryPath>$(VCInstallDir)UnitTest\lib\amd64;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<IncludePath>$(VCInstallDir)UnitTest\include;$(IncludePath)</IncludePath>
<LibraryPath>$(VCInstallDir)UnitTest\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<IncludePath>$(VCInstallDir)UnitTest\include;$(IncludePath)</IncludePath>
<LibraryPath>$(VCInstallDir)UnitTest\lib\amd64;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;..\SiaDrive.Api;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;..\SiaDrive.Dokan.Api;..\SiaDrive.Api;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>TTMATH_NOASM;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>TTMATH_NOASM;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<UseFullPaths>true</UseFullPaths> <UseFullPaths>true</UseFullPaths>
</ClCompile> </ClCompile>
@@ -105,7 +113,7 @@
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;..\SiaDrive.Dokan.Api;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>TTMATH_NOASM;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>TTMATH_NOASM;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<UseFullPaths>true</UseFullPaths> <UseFullPaths>true</UseFullPaths>
</ClCompile> </ClCompile>
@@ -122,7 +130,7 @@
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;..\SiaDrive.Api;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;..\SiaDrive.Dokan.Api;..\SiaDrive.Api;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>TTMATH_NOASM;WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>TTMATH_NOASM;WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<UseFullPaths>true</UseFullPaths> <UseFullPaths>true</UseFullPaths>
</ClCompile> </ClCompile>
@@ -141,7 +149,7 @@
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\3rd-party\SRombauts-SQLiteCpp-f69986a\include;..\3rd-party\ttmath-0.9.3;..\SiaDrive.Api;..\SiaDrive.Dokan.Api;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>TTMATH_NOASM;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>TTMATH_NOASM;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<UseFullPaths>true</UseFullPaths> <UseFullPaths>true</UseFullPaths>
</ClCompile> </ClCompile>

1
UnitTests/UploadManagerTest.cpp
View File

@@ -1,5 +1,4 @@
#include "stdafx.h" #include "stdafx.h"
#include "CppUnitTest.h"
#include "SiaApi.h" #include "SiaApi.h"
#include "UploadManager.h" #include "UploadManager.h"
#include "MockSiad.h" #include "MockSiad.h"

2
UnitTests/stdafx.h
View File

@@ -12,6 +12,6 @@
#include <afxext.h> // MFC extensions #include <afxext.h> // MFC extensions
// Headers for CppUnitTest // Headers for CppUnitTest
#include "CppUnitTest.h" #include <CppUnitTest.h>
// TODO: reference additional headers your program requires here // TODO: reference additional headers your program requires here