Revert "Base64Decoder drops 0x0d characters on windows"

This reverts commit 79549f85dd.
This commit is contained in:
aleks-f
2012-12-20 20:05:10 -06:00
parent a4e781f487
commit 9a67596f00
7 changed files with 5 additions and 47 deletions

View File

@@ -37,8 +37,6 @@
#include "Poco/Base32Decoder.h"
#include "Poco/Exception.h"
#include <sstream>
#include <iterator>
#include <algorithm>
using Poco::Base32Encoder;
@@ -184,19 +182,6 @@ void Base32Test::testEncodeDecode()
}
void Base32Test::testDecodeCR()
{
std::istringstream input("BU======");
Poco::Base32Decoder decoder(input);
std::vector<Poco::UInt8> result;
typedef std::istream_iterator<Poco::UInt8> istream_iterator_type;
istream_iterator_type eos;
std::copy(istream_iterator_type(decoder), eos, std::back_inserter(result));
assert(1 == result.size());
assert(0x0d == result[0]);
}
void Base32Test::setUp()
{
}
@@ -214,7 +199,6 @@ CppUnit::Test* Base32Test::suite()
CppUnit_addTest(pSuite, Base32Test, testEncoder);
CppUnit_addTest(pSuite, Base32Test, testDecoder);
CppUnit_addTest(pSuite, Base32Test, testEncodeDecode);
CppUnit_addTest(pSuite, Base32Test, testDecodeCR);
return pSuite;
}

View File

@@ -49,7 +49,6 @@ public:
void testEncoder();
void testDecoder();
void testEncodeDecode();
void testDecodeCR();
void setUp();
void tearDown();

View File

@@ -37,8 +37,6 @@
#include "Poco/Base64Decoder.h"
#include "Poco/Exception.h"
#include <sstream>
#include <iterator>
#include <algorithm>
using Poco::Base64Encoder;
@@ -179,19 +177,6 @@ void Base64Test::testEncodeDecode()
}
void Base64Test::testDecodeCR()
{
std::istringstream input("DQ==");
Poco::Base64Decoder decoder(input);
std::vector<Poco::UInt8> result;
typedef std::istream_iterator<Poco::UInt8> istream_iterator_type;
istream_iterator_type eos;
std::copy(istream_iterator_type(decoder), eos, std::back_inserter(result));
assert(1 == result.size());
assert(0x0d == result[0]);
}
void Base64Test::setUp()
{
}
@@ -209,7 +194,6 @@ CppUnit::Test* Base64Test::suite()
CppUnit_addTest(pSuite, Base64Test, testEncoder);
CppUnit_addTest(pSuite, Base64Test, testDecoder);
CppUnit_addTest(pSuite, Base64Test, testEncodeDecode);
CppUnit_addTest(pSuite, Base64Test, testDecodeCR);
return pSuite;
}

View File

@@ -49,7 +49,6 @@ public:
void testEncoder();
void testDecoder();
void testEncodeDecode();
void testDecodeCR();
void setUp();
void tearDown();