From 669717268201197412c69df36e65883b0af6fac8 Mon Sep 17 00:00:00 2001
From: jbzdarkid <jbzdarkid@gmail.com>
Date: Mon, 5 Nov 2018 10:06:37 -0800
Subject: Tests work now, + other cleanup

---
 Test/Foo.cpp         | 11 -----------
 Test/RandomTests.cpp | 36 ++++++++++++++++++++++++++++++++++++
 Test/Test.vcxproj    | 46 +++++++++++++++++++---------------------------
 Test/packages.config |  2 +-
 4 files changed, 56 insertions(+), 39 deletions(-)
 delete mode 100644 Test/Foo.cpp
 create mode 100644 Test/RandomTests.cpp

(limited to 'Test')

diff --git a/Test/Foo.cpp b/Test/Foo.cpp
deleted file mode 100644
index d9d155e..0000000
--- a/Test/Foo.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "gtest/gtest.h"
-#include "Random.h"
-
-TEST(Foo, Bar) {
-	int random1 = Random::RandInt(0, 1 << 30);
-	int random2 = Random::RandInt(0, 1 << 30);
-	ASSERT_NE(random1, random2);
-	int random3 = Random::RandInt(random1, random2);
-	ASSERT_GE(random3, random1);
-	ASSERT_LT(random3, random2);
-}
diff --git a/Test/RandomTests.cpp b/Test/RandomTests.cpp
new file mode 100644
index 0000000..a322752
--- /dev/null
+++ b/Test/RandomTests.cpp
@@ -0,0 +1,36 @@
+#include "gtest/gtest.h"
+#include "Random.h"
+
+TEST(RandomTests, RandomInRange) {
+	int random1 = Random::RandInt(0, 1 << 30);
+	int random2 = Random::RandInt(0, 1 << 30);
+	ASSERT_NE(random1, random2);
+	if (random1 > random2) std::swap(random1, random2);
+	int random3 = Random::RandInt(random1, random2);
+	std::cout << random1 << " " << random2 << " " << random3 << std::endl;
+	ASSERT_GE(random3, random1);
+	ASSERT_LE(random3, random2);
+}
+
+TEST(RandomTests, SeedWorks) {
+	Random::SetSeed(0);
+	ASSERT_EQ(2531011, Random::RandInt(0, 1 << 30));
+	ASSERT_EQ(505908858, Random::RandInt(0, 1 << 30));
+	ASSERT_EQ(318135124, Random::RandInt(0, 1 << 30));
+	ASSERT_EQ(159719620, Random::RandInt(0, 1 << 30));
+	Random::SetSeed(0);
+	ASSERT_EQ(2531011, Random::RandInt(0, 1 << 30));
+}
+
+TEST(RandomTests, SeedChangesInitialValue) {
+	Random::SetSeed(0);
+	int random1 = Random::RandInt(0, 1 << 30);
+	Random::SetSeed(1);
+	int random2 = Random::RandInt(0, 1 << 30);
+	ASSERT_NE(random1, random2);
+
+	Random::SetSeed(2);
+	int random3 = Random::RandInt(0, 1 << 30);
+	ASSERT_NE(random3, random1);
+	ASSERT_NE(random3, random2);
+}
\ No newline at end of file
diff --git a/Test/Test.vcxproj b/Test/Test.vcxproj
index 36b192a..b53800b 100644
--- a/Test/Test.vcxproj
+++ b/Test/Test.vcxproj
@@ -19,7 +19,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{2208ee21-5366-4042-89d6-1a3c4bd79ad4}</ProjectGuid>
+    <ProjectGuid>{128784c2-9157-4291-8fd6-44637be162fb}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
     <ConfigurationType>Application</ConfigurationType>
@@ -32,38 +32,33 @@
   <ImportGroup Label="Shared" />
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>$(IncludePath)</IncludePath>
-  </PropertyGroup>
+  <ItemGroup>
+    <ClCompile Include="RandomTests.cpp" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Source\Source.vcxproj">
-      <Project>{5c019bea-e0b4-4215-825f-6a228cd3ae27}</Project>
+      <Project>{6b5df051-a51a-48cb-8acd-c6fad726019f}</Project>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Foo.cpp" />
-  </ItemGroup>
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.0\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.0\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets')" />
+    <Import Project="..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.0\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets" Condition="Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.0\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" />
   </ImportGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
+      <AdditionalIncludeDirectories>C:\Users\localhost\Documents\GitHub\WitnessRandomizer\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -78,11 +73,9 @@
       <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level2</WarningLevel>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <AdditionalIncludeDirectories>C:\Users\localhost\Documents\GitHub\witness-randomizer\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <AdditionalIncludeDirectories>C:\Users\localhost\Documents\GitHub\WitnessRandomizer\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -91,12 +84,13 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>C:\Users\localhost\Documents\GitHub\WitnessRandomizer\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -110,12 +104,10 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <WarningLevel>Level2</WarningLevel>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <AdditionalIncludeDirectories>C:\Users\localhost\Documents\GitHub\witness-randomizer\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\Users\localhost\Documents\GitHub\WitnessRandomizer\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -128,6 +120,6 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.0\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.0\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.0\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.0\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/Test/packages.config b/Test/packages.config
index 0acd30a..1dcab87 100644
--- a/Test/packages.config
+++ b/Test/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" version="1.8.0" targetFramework="native" />
+  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static" version="1.8.0" targetFramework="native" />
 </packages>
\ No newline at end of file
-- 
cgit 1.4.1