Merge pull request #53 from Eran-YT/added-unit-test

Added test project
Neo23x0 · Oct 23, 2020 · 331deff · 331deff
2 parents 5131d72 + d81b391
commit 331deff
Show file tree

Hide file tree

Showing 20 changed files with 1,022 additions and 567 deletions.
diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
@@ -20,6 +20,12 @@ jobs:
 
     - name: Add msbuild to PATH
       uses: microsoft/[email protected]
+
+    - name: Setup NuGet
+      uses: NuGet/[email protected]
+
+    - name: Nuget Restore
+      run: nuget restore Raccine.sln
 
     - name: Run msbuild of Raccine for x86 release
       run: msbuild -m /p:Configuration=Release /p:Platform=x86

diff --git a/.gitignore b/.gitignore
@@ -71,3 +71,5 @@ raccine.ilk
 Raccine/*
 Raccine.zip
 build_dist.bat
+
+packages/
diff --git a/Raccine.sln b/Raccine.sln
@@ -5,6 +5,10 @@ VisualStudioVersion = 16.0.30413.136
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Raccine", "Raccine.vcxproj", "{E402FCEB-A95B-44FF-BC00-B24CE6DAF0AB}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Raccine-Test", "tests\Raccine-Test\Raccine-Test.vcxproj", "{B6CF8E12-D257-4E81-8634-3D5E4320B7E9}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RaccineLib", "source\RaccineLib\RaccineLib.vcxproj", "{1E00BDF5-F2B2-4A59-8E3A-58EDBFE0E420}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -21,6 +25,22 @@ Global
 		{E402FCEB-A95B-44FF-BC00-B24CE6DAF0AB}.Release|x64.Build.0 = Release|x64
 		{E402FCEB-A95B-44FF-BC00-B24CE6DAF0AB}.Release|x86.ActiveCfg = Release|Win32
 		{E402FCEB-A95B-44FF-BC00-B24CE6DAF0AB}.Release|x86.Build.0 = Release|Win32
+		{B6CF8E12-D257-4E81-8634-3D5E4320B7E9}.Debug|x64.ActiveCfg = Debug|x64
+		{B6CF8E12-D257-4E81-8634-3D5E4320B7E9}.Debug|x64.Build.0 = Debug|x64
+		{B6CF8E12-D257-4E81-8634-3D5E4320B7E9}.Debug|x86.ActiveCfg = Debug|Win32
+		{B6CF8E12-D257-4E81-8634-3D5E4320B7E9}.Debug|x86.Build.0 = Debug|Win32
+		{B6CF8E12-D257-4E81-8634-3D5E4320B7E9}.Release|x64.ActiveCfg = Release|x64
+		{B6CF8E12-D257-4E81-8634-3D5E4320B7E9}.Release|x64.Build.0 = Release|x64
+		{B6CF8E12-D257-4E81-8634-3D5E4320B7E9}.Release|x86.ActiveCfg = Release|Win32
+		{B6CF8E12-D257-4E81-8634-3D5E4320B7E9}.Release|x86.Build.0 = Release|Win32
+		{1E00BDF5-F2B2-4A59-8E3A-58EDBFE0E420}.Debug|x64.ActiveCfg = Debug|x64
+		{1E00BDF5-F2B2-4A59-8E3A-58EDBFE0E420}.Debug|x64.Build.0 = Debug|x64
+		{1E00BDF5-F2B2-4A59-8E3A-58EDBFE0E420}.Debug|x86.ActiveCfg = Debug|Win32
+		{1E00BDF5-F2B2-4A59-8E3A-58EDBFE0E420}.Debug|x86.Build.0 = Debug|Win32
+		{1E00BDF5-F2B2-4A59-8E3A-58EDBFE0E420}.Release|x64.ActiveCfg = Release|x64
+		{1E00BDF5-F2B2-4A59-8E3A-58EDBFE0E420}.Release|x64.Build.0 = Release|x64
+		{1E00BDF5-F2B2-4A59-8E3A-58EDBFE0E420}.Release|x86.ActiveCfg = Release|Win32
+		{1E00BDF5-F2B2-4A59-8E3A-58EDBFE0E420}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Raccine.vcxproj b/Raccine.vcxproj
@@ -93,6 +93,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpplatest</LanguageStandard>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -108,6 +109,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
       <LanguageStandard>stdcpplatest</LanguageStandard>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -123,6 +125,7 @@
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpplatest</LanguageStandard>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -138,6 +141,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
       <LanguageStandard>stdcpplatest</LanguageStandard>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -147,22 +151,22 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="Raccine.cpp" />
-    <ClCompile Include="YaraRuleRunner.cpp" />
-    <ClCompile Include="Utils.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="HandleWrapper.h" />
     <ClInclude Include="resource.h" />
-    <ClInclude Include="YaraRuleRunner.h" />
-    <ClInclude Include="Utils.h" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="Raccine.ico" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Raccine.rc" />
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Raccine.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="source\RaccineLib\RaccineLib.vcxproj">
+      <Project>{1e00bdf5-f2b2-4a59-8e3a-58edbfe0e420}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/Raccine.vcxproj.filters b/Raccine.vcxproj.filters
@@ -1,48 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Raccine.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="YaraRuleRunner.cpp">
-    <ClCompile Include="Utils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
+    <ResourceCompile Include="Raccine.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="HandleWrapper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="YaraRuleRunner.h">
-    <ClInclude Include="Utils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
+    <Image Include="Raccine.ico" />
   </ItemGroup>
   <ItemGroup>
-    <Image Include="Raccine.ico">
-      <Filter>Resource Files</Filter>
-    </Image>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Raccine.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
+    <ClCompile Include="Raccine.cpp" />
   </ItemGroup>
 </Project>