Changeset 818 in dev for branches

Timestamp:

Mar 20, 2011, 3:12:17 AM (14 years ago)

Author:

イグトランス (egtra)

Message:

Jenga/common/String.hに対するテストを追加

Location:

branches/egtra/ab5.0

Files:

• abdev/ab-common.props (modified) (1 diff)
• abdev/ab-test/TestMain.cpp (added)
• abdev/ab-test/ab-test.cpp (modified) (3 diffs)
• abdev/ab-test/ab-test.vcxproj (modified) (2 diffs)
• abdev/ab-test/ab-test.vcxproj.filters (modified) (1 diff)
• abdev/ab-test/jenga.cpp (added)
• abdev/ab-test/stdafx.h (modified) (1 diff)
• jenga/include/MyAssert.h (modified) (1 diff)
• jenga/include/common/Binary.h (modified) (1 diff)
• jenga/include/common/BoostSerializationSupport.h (modified) (1 diff)
• jenga/include/common/CmdLine.h (modified) (1 diff)
• jenga/include/common/Directory.h (modified) (1 diff)
• jenga/include/common/EasyToken.h (modified) (1 diff)
• jenga/include/common/Environment.h (modified) (1 diff)
• jenga/include/common/Exception.h (modified) (1 diff)
• jenga/include/common/File.h (modified) (1 diff)
• jenga/include/common/FileSystem.h (modified) (1 diff)
• jenga/include/common/Hashmap.h (modified) (2 diffs)
• jenga/include/common/Path.h (modified) (1 diff)
• jenga/include/common/String.h (modified) (1 diff)
• jenga/include/common/VectorSupporter.h (modified) (1 diff)

branches/egtra/ab5.0/abdev/ab-common.props

@@ -22 +22 @@
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_MEMORY=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>/Zm150 %(AdditionalOptions)</AdditionalOptions>
+      <MinimalRebuild>false</MinimalRebuild>
     </ClCompile>
     <Link>

branches/egtra/ab5.0/abdev/ab-test/ab-test.cpp

@@ -1 +1 @@
 #include "stdafx.h"
 
-#include <cstdint>
-#include <cstring>
-
 #include <GdiPlus.h>
-
-#define BOOST_TEST_MAIN
-
-#include <boost/test/unit_test.hpp>
 
 #include <boost/preprocessor/cat.hpp>
@@ -19 +12 @@
 
 namespace abres = ActiveBasic::Resource;
+
+using boost::implicit_cast;
 
 struct HModuleDeleter
@@ -102 +97 @@
 
     UniqueHModule hmodRes(::LoadLibraryExW((systemDir / name).wstring().c_str(), nullptr, LOAD_LIBRARY_AS_DATAFILE));
-    BOOST_CHECK(hmodRes != nullptr);
+    BOOST_REQUIRE_NE(hmodRes.get(), implicit_cast<HMODULE>(nullptr));
     return hmodRes;
 }

branches/egtra/ab5.0/abdev/ab-test/ab-test.vcxproj

@@ -145 +145 @@
   <ItemGroup>
     <ClCompile Include="ab-test.cpp" />
+    <ClCompile Include="jenga.cpp" />
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
@@ -151 +152 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="TestMain.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\jenga\projects\jenga\jenga.vcxproj">
+      <Project>{f01805b6-65b4-4708-88f4-a5e07dea9fbd}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\abdev-impl\abdev-impl.vcxproj">
       <Project>{58ff88a2-86bc-4480-95f4-71af693fef28}</Project>

branches/egtra/ab5.0/abdev/ab-test/ab-test.vcxproj.filters

@@ -30 +30 @@
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="jenga.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TestMain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

branches/egtra/ab5.0/abdev/ab-test/stdafx.h

@@ -7 +7 @@
 
 #include <memory>
-
-#include <boost/filesystem/path.hpp>
+#include <cstdint>
+#include <cstring>
 
 #include <windows.h>
 #include <tchar.h>
+
+#include <boost/filesystem/path.hpp>
+#include <boost/test/unit_test.hpp>
+#include <boost/implicit_cast.hpp>

branches/egtra/ab5.0/jenga/include/MyAssert.h

@@ +1 @@
+#include <string>
+
 #pragma once
 

branches/egtra/ab5.0/jenga/include/common/Binary.h

@@ +1 @@
+#include <boost/serialization/serialization.hpp>
+#include <boost/serialization/split_member.hpp>
+
 #pragma once
 

branches/egtra/ab5.0/jenga/include/common/BoostSerializationSupport.h

@@ +1 @@
+#include <iosfwd>
+#include <string>
+
 #pragma once
 

branches/egtra/ab5.0/jenga/include/common/CmdLine.h

@@ +1 @@
+#include <string>
+
 #pragma once
 

branches/egtra/ab5.0/jenga/include/common/Directory.h

@@ +1 @@
+#include <string>
+
 #pragma once
 

branches/egtra/ab5.0/jenga/include/common/EasyToken.h

@@ +1 @@
+#include <string>
+
 #pragma once
 

branches/egtra/ab5.0/jenga/include/common/Environment.h

@@ +1 @@
+#include <string>
+#include <windows.h>
+#include <shlobj.h>
+
 #pragma once
 

branches/egtra/ab5.0/jenga/include/common/Exception.h

@@ +1 @@
+#include <string>
+
 #pragma once
 

branches/egtra/ab5.0/jenga/include/common/File.h

@@ +1 @@
+#include <string>
+#include <Windows.h>
+
 #pragma once
 

branches/egtra/ab5.0/jenga/include/common/FileSystem.h

@@ +1 @@
+#include <string>
+
 #pragma once
 

branches/egtra/ab5.0/jenga/include/common/Hashmap.h

@@ -1 @@
-#pragma once
+#include <stdexcept>
 #include <unordered_set>
 #include <boost/range/algorithm.hpp>
@@ -5 +5 @@
 #include <boost/iterator/transform_iterator.hpp>
 #include <boost/cast.hpp>
+#include <boost/serialization/serialization.hpp>
+#include <boost/serialization/split_member.hpp>
+
+#pragma once
+
 
 namespace Jenga{

branches/egtra/ab5.0/jenga/include/common/Path.h

@@ +1 @@
+#include <string>
+
 #pragma once
 

branches/egtra/ab5.0/jenga/include/common/String.h

@@ +1 @@
+#include <string>
+#include <vector>
+
 #pragma once
 

branches/egtra/ab5.0/jenga/include/common/VectorSupporter.h

@@ -7 +7 @@
 template<class T> void EraseVectorItem( T &v, int index )
 {
-    T::iterator it = v.begin();
-    int i = 0;
-    while( i < index )
-    {
-        i ++;
-        it ++;
-    }
-    v.erase( it );
+    v.erase(v.begin() + index);
 }