gvsafronov/rapidjson
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor SchemaValidator.TestSuite to use MemoryPoolAllocator explicitly

Browse Source
This commit is contained in:
miloyip 2015-05-17 20:44:11 +08:00
parent 3919348602
commit a4cbd3f81b
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
test/unittest/schematest.cpp
View File

@ -913,7 +913,8 @@ TEST(SchemaValidator, ValidateMetaSchema_UTF16) {
free(json); free(json);
} }
class RemoteSchemaDocumentProvider : public IRemoteSchemaDocumentProvider { template <typename SchemaDocumentType = SchemaDocument>
class RemoteSchemaDocumentProvider : public IGenericRemoteSchemaDocumentProvider<SchemaDocumentType> {
public: public:
RemoteSchemaDocumentProvider() : documentAllocator_(), schemaAllocator_() { RemoteSchemaDocumentProvider() : documentAllocator_(), schemaAllocator_() {
const char* filenames[kCount] = { const char* filenames[kCount] = {
@ -932,9 +933,9 @@ public:
ADD_FAILURE(); ADD_FAILURE();
} }
else { else {
Document d(&documentAllocator_); DocumentType d(&documentAllocator_);
d.Parse(json); d.Parse(json);
sd_[i] = new SchemaDocument(d, 0, &schemaAllocator_); sd_[i] = new SchemaDocumentType(d, 0, &schemaAllocator_);
free(json); free(json);
} }
}; };
@ -945,7 +946,7 @@ public:
delete sd_[i]; delete sd_[i];
} }
virtual const SchemaDocument* GetRemoteDocument(const char* uri, SizeType length) { virtual const SchemaDocumentType* GetRemoteDocument(const char* uri, SizeType length) {
const char* uris[kCount] = { const char* uris[kCount] = {
"http://localhost:1234/integer.json", "http://localhost:1234/integer.json",
"http://localhost:1234/subSchemas.json", "http://localhost:1234/subSchemas.json",
@ -960,13 +961,15 @@ public:
} }
private: private:
typedef GenericDocument<typename SchemaDocumentType::EncodingType, MemoryPoolAllocator<> > DocumentType;
RemoteSchemaDocumentProvider(const RemoteSchemaDocumentProvider&); RemoteSchemaDocumentProvider(const RemoteSchemaDocumentProvider&);
RemoteSchemaDocumentProvider& operator=(const RemoteSchemaDocumentProvider&); RemoteSchemaDocumentProvider& operator=(const RemoteSchemaDocumentProvider&);
static const size_t kCount = 4; static const size_t kCount = 4;
SchemaDocument* sd_[kCount]; SchemaDocumentType* sd_[kCount];
Document::AllocatorType documentAllocator_; typename DocumentType::AllocatorType documentAllocator_;
SchemaDocument::AllocatorType schemaAllocator_; typename SchemaDocumentType::AllocatorType schemaAllocator_;
}; };
TEST(SchemaValidator, TestSuite) { TEST(SchemaValidator, TestSuite) {
@ -1007,12 +1010,17 @@ TEST(SchemaValidator, TestSuite) {
unsigned testCount = 0; unsigned testCount = 0;
unsigned passCount = 0; unsigned passCount = 0;
RemoteSchemaDocumentProvider provider; typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
RemoteSchemaDocumentProvider<SchemaDocumentType> provider;
char documentBuffer[65536]; char documentBuffer[65536];
char documentStackBuffer[65536];
char schemaBuffer[65536]; char schemaBuffer[65536];
Document::AllocatorType documentAllocator(documentBuffer, sizeof(documentBuffer)); char validatorBuffer[65536];
SchemaDocument::AllocatorType schemaAllocator(schemaBuffer, sizeof(schemaBuffer)); MemoryPoolAllocator<> documentAllocator(documentBuffer, sizeof(documentBuffer));
MemoryPoolAllocator<> documentStackAllocator(documentStackBuffer, sizeof(documentStackBuffer));
MemoryPoolAllocator<> schemaAllocator(schemaBuffer, sizeof(schemaBuffer));
MemoryPoolAllocator<> validatorAllocator(validatorBuffer, sizeof(validatorBuffer));
for (size_t i = 0; i < sizeof(filenames) / sizeof(filenames[0]); i++) { for (size_t i = 0; i < sizeof(filenames) / sizeof(filenames[0]); i++) {
char filename[FILENAME_MAX]; char filename[FILENAME_MAX];
@ -1023,7 +1031,7 @@ TEST(SchemaValidator, TestSuite) {
ADD_FAILURE(); ADD_FAILURE();
} }
else { else {
Document d(&documentAllocator); GenericDocument<UTF8<>, MemoryPoolAllocator<>, MemoryPoolAllocator<> > d(&documentAllocator, 1024, &documentStackAllocator);
d.Parse(json); d.Parse(json);
if (d.HasParseError()) { if (d.HasParseError()) {
printf("json test suite file %s has parse error", filename); printf("json test suite file %s has parse error", filename);
@ -1032,8 +1040,8 @@ TEST(SchemaValidator, TestSuite) {
else { else {
for (Value::ConstValueIterator schemaItr = d.Begin(); schemaItr != d.End(); ++schemaItr) { for (Value::ConstValueIterator schemaItr = d.Begin(); schemaItr != d.End(); ++schemaItr) {
{ {
SchemaDocument schema((*schemaItr)["schema"], &provider, &schemaAllocator); SchemaDocumentType schema((*schemaItr)["schema"], &provider, &schemaAllocator);
SchemaValidator validator(schema); GenericSchemaValidator<SchemaDocumentType, BaseReaderHandler<UTF8<> >, MemoryPoolAllocator<> > validator(schema, &validatorAllocator);
const char* description1 = (*schemaItr)["description"].GetString(); const char* description1 = (*schemaItr)["description"].GetString();
const Value& tests = (*schemaItr)["tests"]; const Value& tests = (*schemaItr)["tests"];
for (Value::ConstValueIterator testItr = tests.Begin(); testItr != tests.End(); ++testItr) { for (Value::ConstValueIterator testItr = tests.Begin(); testItr != tests.End(); ++testItr) {
@ -1050,9 +1058,10 @@ TEST(SchemaValidator, TestSuite) {
passCount++; passCount++;
} }
} }
//printf("%zu %zu\n", documentAllocator.Size(), schemaAllocator.Size()); //printf("%zu %zu %zu\n", documentAllocator.Size(), schemaAllocator.Size(), validatorAllocator.Size());
} }
schemaAllocator.Clear(); schemaAllocator.Clear();
validatorAllocator.Clear();
} }
} }
} }