Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added support for 64 bit ints in wx stream classes (patch 1203970)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-02-11 16:51:34 +00:00
parent 87152bb53d
commit 216a72f3b9
10 changed files with 883 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
tests/streams/datastreamtest.cpp
View File

@@ -21,6 +21,8 @@
#include "wx/wx.h"
#endif // WX_PRECOMP
#include <vector>
#include "wx/datstrm.h"
#include "wx/wfstream.h"
#include "wx/math.h"
@@ -38,11 +40,23 @@ private:
CPPUNIT_TEST_SUITE( DataStreamTestCase );
CPPUNIT_TEST( FloatRW );
CPPUNIT_TEST( DoubleRW );
#if wxUSE_LONGLONG
CPPUNIT_TEST( LongLongRW );
#endif
#if wxHAS_INT64
CPPUNIT_TEST( Int64RW );
#endif
CPPUNIT_TEST( NaNRW );
CPPUNIT_TEST_SUITE_END();
void FloatRW();
void DoubleRW();
#if wxUSE_LONGLONG
void LongLongRW();
#endif
#if wxHAS_INT64
void Int64RW();
#endif
void NaNRW();
DECLARE_NO_COPY_CLASS(DataStreamTestCase)
@@ -58,6 +72,7 @@ DataStreamTestCase::DataStreamTestCase()
{
}
static
wxFloat64 TestFloatRW(wxFloat64 fValue)
{
wxFileOutputStream* pFileOutput = new wxFileOutputStream( _T("mytext.dat") );
@@ -81,6 +96,91 @@ wxFloat64 TestFloatRW(wxFloat64 fValue)
return fInFloat;
}
template <class T>
class TestMultiRW {
public:
typedef std::vector<T> ValueArray;
typedef void (wxDataOutputStream::*FnWriter)(const T *buffer, size_t size);
typedef void (wxDataInputStream::*FnReader)(T *buffer, size_t size);
private:
bool m_ok;
private:
void ProcessData(const T *Values,
typename ValueArray::size_type Size,
FnWriter pfnWriter,
FnReader pfnReader)
{
ValueArray InValues(Size);
{
wxFileOutputStream FileOutput( _T("mytext.dat") );
wxDataOutputStream DataOutput( FileOutput );
(DataOutput.*pfnWriter)(Values, Size);
}
{
wxFileInputStream FileInput( _T("mytext.dat") );
wxDataInputStream DataInput( FileInput );
(DataInput.*pfnReader)(&*InValues.begin(), InValues.size());
}
m_ok = true;
for (typename ValueArray::size_type idx=0; idx!=Size; ++idx) {
if (InValues[idx]!=Values[idx]) {
m_ok = false;
break;
}
}
}
public:
TestMultiRW(const T *Values,
size_t Size,
FnWriter pfnWriter,
FnReader pfnReader)
{
ProcessData(Values, (typename ValueArray::size_type) Size, pfnWriter, pfnReader);
}
TestMultiRW(const ValueArray &Values,
FnWriter pfnWriter,
FnReader pfnReader)
{
ProcessData(&*Values.begin(), Values.size(), pfnWriter, pfnReader);
}
bool Ok(void) const {
return m_ok;
}
};
template <class T>
static
T TestRW(const T &Value)
{
T InValue;
{
wxFileOutputStream FileOutput( _T("mytext.dat") );
wxDataOutputStream DataOutput( FileOutput );
DataOutput << Value;
}
{
wxFileInputStream FileInput( _T("mytext.dat") );
wxDataInputStream DataInput( FileInput );
DataInput >> InValue;
}
return InValue;
}
void DataStreamTestCase::FloatRW()
{
CPPUNIT_ASSERT( TestFloatRW(5.5) == 5.5 );
@@ -95,6 +195,54 @@ void DataStreamTestCase::DoubleRW()
CPPUNIT_ASSERT( TestFloatRW(21321343431.1232143432) == 21321343431.1232143432 );
}
#if wxUSE_LONGLONG
void DataStreamTestCase::LongLongRW()
{
TestMultiRW<wxLongLong>::ValueArray ValuesLL;
TestMultiRW<wxULongLong>::ValueArray ValuesULL;
ValuesLL.push_back(wxLongLong(0l));
ValuesLL.push_back(wxLongLong(1l));
ValuesLL.push_back(wxLongLong(-1l));
ValuesLL.push_back(wxLongLong(0x12345678l));
ValuesLL.push_back(wxLongLong(0x12345678l, 0xabcdef01l));
ValuesULL.push_back(wxULongLong(0l));
ValuesULL.push_back(wxULongLong(1l));
ValuesULL.push_back(wxULongLong(0x12345678l));
ValuesULL.push_back(wxULongLong(0x12345678l, 0xabcdef01l));
CPPUNIT_ASSERT( TestRW(wxLongLong(0x12345678l)) == wxLongLong(0x12345678l) );
CPPUNIT_ASSERT( TestRW(wxLongLong(0x12345678l, 0xabcdef01l)) == wxLongLong(0x12345678l, 0xabcdef01l) );
CPPUNIT_ASSERT( TestMultiRW<wxLongLong>(ValuesLL, &wxDataOutputStream::WriteLL, &wxDataInputStream::ReadLL).Ok() );
CPPUNIT_ASSERT( TestMultiRW<wxULongLong>(ValuesULL, &wxDataOutputStream::WriteLL, &wxDataInputStream::ReadLL).Ok() );
}
#endif
#if wxHAS_INT64
void DataStreamTestCase::Int64RW()
{
TestMultiRW<wxInt64>::ValueArray ValuesI64;
TestMultiRW<wxUint64>::ValueArray ValuesUI64;
ValuesI64.push_back(wxInt64(0l));
ValuesI64.push_back(wxInt64(1l));
ValuesI64.push_back(wxInt64(-1l));
ValuesI64.push_back(wxInt64(0x12345678l));
ValuesI64.push_back((wxInt64(0x12345678l) << 32) + wxInt64(0xabcdef01l));
ValuesUI64.push_back(wxUint64(0l));
ValuesUI64.push_back(wxUint64(1l));
ValuesUI64.push_back(wxUint64(0x12345678l));
ValuesUI64.push_back((wxUint64(0x12345678l) << 32) + wxUint64(0xabcdef01l));
CPPUNIT_ASSERT( TestRW(wxUint64(0x12345678l)) == wxUint64(0x12345678l) );
CPPUNIT_ASSERT( TestRW((wxUint64(0x12345678l) << 32) + wxUint64(0xabcdef01l)) == (wxUint64(0x12345678l) << 32) + wxUint64(0xabcdef01l) );
CPPUNIT_ASSERT( TestMultiRW<wxInt64>(ValuesI64, &wxDataOutputStream::Write64, &wxDataInputStream::Read64).Ok() );
CPPUNIT_ASSERT( TestMultiRW<wxUint64>(ValuesUI64, &wxDataOutputStream::Write64, &wxDataInputStream::Read64).Ok() );
}
#endif
void DataStreamTestCase::NaNRW()
{
//TODO?