Added unit tests for NaturalCompare() that currently fail.
This commit is contained in:
@@ -3,4 +3,14 @@ SubDir HAIKU_TOP src tests kits shared ;
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
AddSubDirSupportedPlatforms libbe_test ;
|
||||
|
||||
UsePrivateHeaders shared ;
|
||||
|
||||
UnitTestLib libsharedtest.so :
|
||||
SharedTestAddon.cpp
|
||||
|
||||
NaturalCompareTest.cpp
|
||||
|
||||
: be libshared.a $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++)
|
||||
;
|
||||
|
||||
SubInclude HAIKU_TOP src tests kits shared shake_filter ;
|
||||
|
||||
@@ -0,0 +1,106 @@
|
||||
/*
|
||||
* Copyright 2012, Axel Dörfler, [email protected].
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
|
||||
|
||||
#include "NaturalCompareTest.h"
|
||||
|
||||
#include <NaturalCompare.h>
|
||||
|
||||
#include <cppunit/TestCaller.h>
|
||||
#include <cppunit/TestSuite.h>
|
||||
|
||||
|
||||
using namespace BPrivate;
|
||||
|
||||
|
||||
struct Sample {
|
||||
const char* a;
|
||||
const char* b;
|
||||
int expectedResult;
|
||||
};
|
||||
|
||||
|
||||
NaturalCompareTest::NaturalCompareTest()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
NaturalCompareTest::~NaturalCompareTest()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
NaturalCompareTest::TestSome()
|
||||
{
|
||||
static const Sample samples[] = {
|
||||
{NULL, NULL, 0},
|
||||
{NULL, "A", -1},
|
||||
{"a", "A", 0},
|
||||
{"ä", "a", 1},
|
||||
{"3", "99", -1},
|
||||
{"9", "19", -1},
|
||||
{"13", "99", -1},
|
||||
{"9", "111", -1},
|
||||
{"00000009", "111", -1},
|
||||
{"Hallo2", "hallo12", -1},
|
||||
{"Hallo 2", "hallo12", -1},
|
||||
{"Hallo 2", "hallo12", -1},
|
||||
{"Hallo 2 ", "hallo12", -1},
|
||||
{"12 äber 42", "12aber42", 1},
|
||||
{"12 äber 42", "12aber43", 1},
|
||||
{"12 äber 44", "12aber43", 1},
|
||||
{"12 äber 44", "12 aber45", 1},
|
||||
};
|
||||
_RunTests(samples, sizeof(samples) / sizeof(Sample));
|
||||
}
|
||||
|
||||
|
||||
/*static*/ void
|
||||
NaturalCompareTest::AddTests(BTestSuite& parent)
|
||||
{
|
||||
CppUnit::TestSuite& suite = *new CppUnit::TestSuite("NaturalCompareTest");
|
||||
|
||||
suite.addTest(new CppUnit::TestCaller<NaturalCompareTest>(
|
||||
"NaturalCompareTest::TestSome", &NaturalCompareTest::TestSome));
|
||||
|
||||
parent.addTest("NaturalCompareTest", &suite);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
NaturalCompareTest::_RunTests(const Sample* samples, int count)
|
||||
{
|
||||
for (int i = 0; i < count; i++) {
|
||||
const Sample& sample = samples[i];
|
||||
|
||||
_RunTest(sample.a, sample.b, sample.expectedResult);
|
||||
_RunTest(sample.b, sample.a, -sample.expectedResult);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
NaturalCompareTest::_RunTest(const char* a, const char* b, int expectedResult)
|
||||
{
|
||||
int result = _Normalize(NaturalCompare(a, b));
|
||||
|
||||
char message[256];
|
||||
snprintf(message, sizeof(message), "\"%s\" vs. \"%s\" == %d, expected %d",
|
||||
a, b, result, expectedResult);
|
||||
|
||||
CppUnit::Asserter::failIf(result != expectedResult, message);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
NaturalCompareTest::_Normalize(int result)
|
||||
{
|
||||
if (result > 0)
|
||||
return 1;
|
||||
if (result < 0)
|
||||
return -1;
|
||||
return 0;
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
/*
|
||||
* Copyright 2012, Axel Dörfler, [email protected].
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
#ifndef NATURAL_COMPARE_TEST_H
|
||||
#define NATURAL_COMPARE_TEST_H
|
||||
|
||||
|
||||
#include <TestCase.h>
|
||||
#include <TestSuite.h>
|
||||
|
||||
|
||||
class Sample;
|
||||
|
||||
|
||||
class NaturalCompareTest : public CppUnit::TestCase {
|
||||
public:
|
||||
NaturalCompareTest();
|
||||
virtual ~NaturalCompareTest();
|
||||
|
||||
void TestSome();
|
||||
|
||||
static void AddTests(BTestSuite& suite);
|
||||
|
||||
private:
|
||||
void _RunTests(const Sample* samples, int count);
|
||||
void _RunTest(const char* a, const char* b,
|
||||
int expectedResult);
|
||||
int _Normalize(int result);
|
||||
};
|
||||
|
||||
|
||||
#endif // NATURAL_COMPARE_TEST_H
|
||||
@@ -0,0 +1,21 @@
|
||||
/*
|
||||
* Copyright 2012, Axel Dörfler, [email protected].
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
|
||||
|
||||
#include <TestSuite.h>
|
||||
#include <TestSuiteAddon.h>
|
||||
|
||||
#include "NaturalCompareTest.h"
|
||||
|
||||
|
||||
BTestSuite*
|
||||
getTestSuite()
|
||||
{
|
||||
BTestSuite* suite = new BTestSuite("Shared");
|
||||
|
||||
NaturalCompareTest::AddTests(*suite);
|
||||
|
||||
return suite;
|
||||
}
|
||||
Reference in New Issue
Block a user