C++: Rename test.json to test_cpp.json

This commit is contained in:
Petri Lehtinen 2010-02-04 20:49:01 +02:00
parent c9fc055351
commit 910a2f318b
2 changed files with 4 additions and 5 deletions

View File

@ -1,6 +1,5 @@
#include <iostream> #include <iostream>
#include <iomanip> #include <iomanip>
#include <malloc.h>
#include "jansson.hpp" #include "jansson.hpp"
@ -23,7 +22,7 @@
#define ASSERT_FALSE(p, m) ASSERT_OP(p, true, !=, m) #define ASSERT_FALSE(p, m) ASSERT_OP(p, true, !=, m)
int main() { int main() {
json::Value e1(json::load_file("suites/api/test.json")); json::Value e1(json::load_file("suites/api/test_cpp.json"));
json::Value e2(e1); json::Value e2(e1);
json::Value e3; json::Value e3;
json::Value e4(json::load_string("{\"foo\": true, \"bar\": \"test\"}")); json::Value e4(json::load_string("{\"foo\": true, \"bar\": \"test\"}"));

View File

@ -1,5 +1,5 @@
{"web-app": { {"web-app": {
"servlet": [ "servlet": [
{ {
"servlet-name": "cofaxCDS", "servlet-name": "cofaxCDS",
"servlet-class": "org.cofax.cds.CDSServlet", "servlet-class": "org.cofax.cds.CDSServlet",
@ -55,7 +55,7 @@
{ {
"servlet-name": "cofaxAdmin", "servlet-name": "cofaxAdmin",
"servlet-class": "org.cofax.cds.AdminServlet"}, "servlet-class": "org.cofax.cds.AdminServlet"},
{ {
"servlet-name": "fileServlet", "servlet-name": "fileServlet",
"servlet-class": "org.cofax.cds.FileServlet"}, "servlet-class": "org.cofax.cds.FileServlet"},
@ -82,7 +82,7 @@
"cofaxAdmin": "/admin/*", "cofaxAdmin": "/admin/*",
"fileServlet": "/static/*", "fileServlet": "/static/*",
"cofaxTools": "/tools/*"}, "cofaxTools": "/tools/*"},
"taglib": { "taglib": {
"taglib-uri": "cofax.tld", "taglib-uri": "cofax.tld",
"taglib-location": "/WEB-INF/tlds/cofax.tld"}}} "taglib-location": "/WEB-INF/tlds/cofax.tld"}}}