Bläddra i källkod

Merge pull request #8 from tweakdeveloper/master

Added C++ compatibility
master
ooxi 9 år sedan
förälder
incheckning
e5568290c0
7 ändrade filer med 250 tillägg och 10 borttagningar
  1. +6
    -1
      .travis.yml
  2. +8
    -3
      CMakeLists.txt
  3. +5
    -0
      run-tests.sh
  4. +1
    -1
      src/xml.c
  5. +8
    -5
      src/xml.h
  6. +0
    -0
      test/test-xml-c.c
  7. +222
    -0
      test/test-xml-cpp.cpp

+ 6
- 1
.travis.yml Visa fil

@@ -1,8 +1,13 @@
language: c
compiler:
- gcc
- g++
before_install:
- sudo apt-get update
- sudo apt-get install cmake valgrind
script:
- mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DXML_PARSER_VERBOSE=On .. && make && ./test-xml && valgrind --tool=memcheck --leak-check=full --track-origins=yes -v ./test-xml
- mkdir build && cd build
- cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=gcc -DXML_PARSER_VERBOSE=On ..
- make
after_script: ../run-tests.sh


+ 8
- 3
CMakeLists.txt Visa fil

@@ -32,10 +32,15 @@ ADD_LIBRARY(xml STATIC
# Build unit cases
INCLUDE_DIRECTORIES(${SOURCE_DIRECTORY})
ADD_EXECUTABLE(test-xml
${TEST_SOURCE_DIRECTORY}/test-xml
ADD_EXECUTABLE(test-xml-c
${TEST_SOURCE_DIRECTORY}/test-xml-c
)
TARGET_LINK_LIBRARIES(test-xml xml)
TARGET_LINK_LIBRARIES(test-xml-c xml)

ADD_EXECUTABLE(test-xml-cpp
${TEST_SOURCE_DIRECTORY}/test-xml-cpp
)
TARGET_LINK_LIBRARIES(test-xml-cpp xml)
FILE( COPY ${TEST_SOURCE_DIRECTORY}/test.xml
DESTINATION ${PROJECT_BINARY_DIR}


+ 5
- 0
run-tests.sh Visa fil

@@ -0,0 +1,5 @@
#!/bin/bash
./test-xml-c
./test-xml-cpp
valgrind --tool=memcheck --leak-check=full --track-origins=yes -v ./test-xml-c
valgrind --tool=memcheck --leak-check=full --track-origins=yes -v ./test-xml-cpp

+ 1
- 1
src/xml.c Visa fil

@@ -729,7 +729,7 @@ struct xml_document* xml_open_document(FILE* source) {
/**
* [PUBLIC API]
*/
void xml_document_free(struct xml_document* document, _Bool free_buffer) {
void xml_document_free(struct xml_document* document, bool free_buffer) {
xml_node_free(document->root);

if (free_buffer) {


+ 8
- 5
src/xml.h Visa fil

@@ -29,8 +29,11 @@
*/
#include <stdint.h>
#include <string.h>
#include <stdbool.h>


#ifdef __cplusplus
extern "C" {
#endif

/**
* Opaque structure holding the parsed xml document
@@ -84,7 +87,7 @@ struct xml_document* xml_open_document(FILE* source);
* @param free_buffer iff true the internal buffer supplied via xml_parse_buffer
* will be freed with the `free` system call
*/
void xml_document_free(struct xml_document* document, _Bool free_buffer);
void xml_document_free(struct xml_document* document, bool free_buffer);


/**
@@ -162,9 +165,9 @@ size_t xml_string_length(struct xml_string* string);
*/
void xml_string_copy(struct xml_string* string, uint8_t* buffer, size_t length);

#ifdef __cplusplus
}
#endif

#endif


test/test-xml.c → test/test-xml-c.c Visa fil


+ 222
- 0
test/test-xml-cpp.cpp Visa fil

@@ -0,0 +1,222 @@
/**
* Copyright (c) 2012 ooxi/xml.c
* https://github.com/ooxi/xml.c
*
* This software is provided 'as-is', without any express or implied warranty.
* In no event will the authors be held liable for any damages arising from the
* use of this software.
*
* Permission is granted to anyone to use this software for any purpose,
* including commercial applications, and to alter it and redistribute it
* freely, subject to the following restrictions:
*
* 1. The origin of this software must not be misrepresented; you must not
* claim that you wrote the original software. If you use this software in a
* product, an acknowledgment in the product documentation would be
* appreciated but is not required.
*
* 2. Altered source versions must be plainly marked as such, and must not be
* misrepresented as being the original software.
*
* 3. This notice may not be removed or altered from any source distribution.
*/
#include <iostream>
#include <cstdlib>
#include <cstdio>
#include <xml.h>

/**
* Will halt the program iff assertion fails
*/
static void _assert_that(bool condition, const char* message,
const char* func, const char* file, int line) {
if (!condition) {
std::cerr << "Assertion failed: " << message << ", in " << func << " ("
<< file << ":" << line << ")\n";
exit(EXIT_FAILURE);
}
}

#define assert_that(condition, message) \
_assert_that(condition, message, __func__, __FILE__, __LINE__)
/**
* @return true iff xml string equals the c string
*/
static bool string_equals(struct xml_string* a, const char* b) {
size_t a_length = xml_string_length(a);
size_t b_length = strlen(b);
uint8_t* a_buffer = new uint8_t[((a_length + 1) * sizeof(uint8_t))];
xml_string_copy(a, a_buffer, a_length);
a_buffer[a_length] = 0;
if (a_length != b_length) {
std::cerr << "string_equals: " << a_buffer << "#" << a_length << " <> "
<< b << "#" << b_length << "\n";
delete[] a_buffer;
return false;
}
size_t i = 0; for (; i < a_length; ++i) {
if (a_buffer[i] != b[i]) {
std::cerr << "string_equals: " << a_buffer << " <> " << b << "\n";
delete[] a_buffer;
return false;
}
}
delete[] a_buffer;
return true;
}

/**
* Converts a static character array to an uint8_t data source
*/
#define SOURCE(source, content) \
uint8_t* source = new uint8_t[strlen(content)]; \
{ \
const char* content_string = content; \
memcpy(source, content_string, strlen(content) + 1); \
}

/**
* Tries to parse a simple document containing only one tag
*/
static void test_xml_parse_document_0() {
SOURCE(source, "<Hello>World</Hello>");
// uint8_t* source = malloc((1 + strlen("<Hello>World</Hello>")) *
// sizeof(uint8_t));
// {
// const char* content_string = "<Hello>World</Hello>";
// memcpy(source, content_string, strlen("<Hello>World</Hello>") + 1);
// }
struct xml_document* document = xml_parse_document(source,
strlen((const char *)source));
assert_that(document, "Could not parse document");
struct xml_node* root = xml_document_root(document);
assert_that(string_equals(xml_node_name(root), "Hello"),
"root node name must be `Hello'");
assert_that(string_equals(xml_node_content(root), "World"),
"root node content must be `World'");
xml_document_free(document, true);
}

/**
* Tries to parse a document containing multiple tags
*/
static void test_xml_parse_document_1() {
SOURCE(source, ""
"<Parent>\n"
"\t<Child>\n"
"\t\tFirst content\n"
"\t</Child>\n"
"\t<Child>\n"
"\t\tSecond content\n"
"\t</Child>\n"
"</Parent>\n"
);
struct xml_document* document = xml_parse_document(source,
strlen((const char *)source));
assert_that(document, "Could not parse document");
struct xml_node* root = xml_document_root(document);
assert_that(string_equals(xml_node_name(root), "Parent"),
"root node name must be `Parent'");
assert_that(2 == xml_node_children(root), "root must have two children");
struct xml_node* first_child = xml_node_child(root, 0);
struct xml_node* second_child = xml_node_child(root, 1);
assert_that(first_child && second_child,
"Failed retrieving the children of root");
struct xml_node* third_child = xml_node_child(root, 2);
assert_that(!third_child, "root has a third child where non should be");
assert_that(string_equals(xml_node_name(first_child), "Child"),
"first_child node name must be `Child'");
assert_that(string_equals(xml_node_content(first_child), "First content"),
"first_child node content must be `First content'");
assert_that(string_equals(xml_node_name(second_child), "Child"),
"second_child node name must be `Child'");
assert_that(string_equals(xml_node_content(second_child), "Second content"),
"second_child node content must be `tSecond content'");
xml_document_free(document, true);
}

/**
* Tests the eas functionality
*/
static void test_xml_parse_document_2() {
SOURCE(source, ""
"<Parent>\n"
"\t<Child>\n"
"\t\tFirst content\n"
"\t</Child>\n"
"\t<This><Is>\n"
"<A><Test>Content A</Test></A>\n"
"<B><Test>Content B</Test></B>\n"
"\t</Is></This>\n"
"\t<Child>\n"
"\t\tSecond content\n"
"\t</Child>\n"
"</Parent>\n"
);
struct xml_document* document = xml_parse_document(source,
strlen((const char *)source));
assert_that(document, "Could not parse document");
struct xml_node* root = xml_document_root(document);
assert_that(string_equals(xml_node_name(root), "Parent"),
"root node name must be `Parent'");
assert_that(3 == xml_node_children(root),
"root must have two children");
struct xml_node* test_a = xml_easy_child(root, (uint8_t *)"This",
(uint8_t *)"Is", (uint8_t *)"A", (uint8_t *)"Test", 0);
assert_that(test_a, "Cannot find Parent/This/Is/A/Test");
assert_that(string_equals(xml_node_content(test_a), "Content A"),
"Content of Parent/This/Is/A/Test must be `Content A'");
struct xml_node* test_b = xml_easy_child(root, (uint8_t *)"This",
(uint8_t *)"Is", (uint8_t *)"B", (uint8_t *)"Test", 0);
assert_that(test_b, "Cannot find Parent/This/Is/B/Test");
assert_that(string_equals(xml_node_content(test_b), "Content B"),
"Content of Parent/This/Is/B/Test must be `Content B'");
struct xml_node* test_c = xml_easy_child(root, (uint8_t *)"This",
(uint8_t *)"Is", (uint8_t *)"C", (uint8_t *)"Test", 0);
assert_that(!test_c,
"Must not find Parent/This/Is/C/Test because no such path exists");
struct xml_node* must_be_null = xml_easy_child(root, (uint8_t *)"Child");
assert_that(!must_be_null,
"Parent/Child cannot be a valid expression, because there are two children "
"named `Child' in `Parent'");
uint8_t* name_is = xml_easy_name(xml_easy_child(root, (uint8_t *)"This",
(uint8_t *)"Is", 0));
assert_that(!strcmp((const char*)name_is, "Is"),
"Name of Parent/This/Is must be `Is'");
delete[] name_is;
uint8_t* content_a = xml_easy_content(test_a);
assert_that(!strcmp((const char*)content_a, "Content A"),
"Content of Parent/This/Is/A/Test must be `Content A'");
delete[] content_a;
xml_document_free(document, true);
}

/**
* Tests the xml_open_document functionality
*/
static void test_xml_parse_document_3() {
#define FILE_NAME "test.xml"
FILE* handle = fopen(FILE_NAME, "rb");
assert_that(handle, "Cannot open " FILE_NAME);
struct xml_document* document = xml_open_document(handle);
assert_that(document, "Cannot parse " FILE_NAME);
struct xml_node* element = xml_easy_child(xml_document_root(document),
(uint8_t *)"Element", (uint8_t *)"With", 0);
assert_that(element, "Cannot find Document/Element/With");
assert_that(string_equals(xml_node_content(element), "Child"),
"Content of Document/Element/With must be `Child'");
xml_document_free(document, true);
#undef FILE_NAME
}

int main(int argc, char **argv) {
test_xml_parse_document_0();
test_xml_parse_document_1();
test_xml_parse_document_2();
test_xml_parse_document_3();
std::cout << "All tests passed :-)\n";
exit(EXIT_SUCCESS);
}


Laddar…
Avbryt
Spara