From 910a2f318bdf7d61d982ab76d2518d58d16b0365 Mon Sep 17 00:00:00 2001
From: Petri Lehtinen <petri@digip.org>
Date: Thu, 4 Feb 2010 20:49:01 +0200
Subject: [PATCH] C++: Rename test.json to test_cpp.json

---
 test/suites/api/test_cpp.cpp                 | 3 +--
 test/suites/api/{test.json => test_cpp.json} | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)
 rename test/suites/api/{test.json => test_cpp.json} (99%)

diff --git a/test/suites/api/test_cpp.cpp b/test/suites/api/test_cpp.cpp
index 5d3964a..8a3b356 100644
--- a/test/suites/api/test_cpp.cpp
+++ b/test/suites/api/test_cpp.cpp
@@ -1,6 +1,5 @@
 #include <iostream>
 #include <iomanip>
-#include <malloc.h>
 
 #include "jansson.hpp"
 
@@ -23,7 +22,7 @@
 #define ASSERT_FALSE(p, m) ASSERT_OP(p, true, !=, m)
 
 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 e3;
     json::Value e4(json::load_string("{\"foo\": true, \"bar\": \"test\"}"));
diff --git a/test/suites/api/test.json b/test/suites/api/test_cpp.json
similarity index 99%
rename from test/suites/api/test.json
rename to test/suites/api/test_cpp.json
index 9eea6ad..d31a395 100644
--- a/test/suites/api/test.json
+++ b/test/suites/api/test_cpp.json
@@ -1,5 +1,5 @@
 {"web-app": {
-  "servlet": [   
+  "servlet": [
     {
       "servlet-name": "cofaxCDS",
       "servlet-class": "org.cofax.cds.CDSServlet",
@@ -55,7 +55,7 @@
     {
       "servlet-name": "cofaxAdmin",
       "servlet-class": "org.cofax.cds.AdminServlet"},
- 
+
     {
       "servlet-name": "fileServlet",
       "servlet-class": "org.cofax.cds.FileServlet"},
@@ -82,7 +82,7 @@
     "cofaxAdmin": "/admin/*",
     "fileServlet": "/static/*",
     "cofaxTools": "/tools/*"},
- 
+
   "taglib": {
     "taglib-uri": "cofax.tld",
     "taglib-location": "/WEB-INF/tlds/cofax.tld"}}}
-- 
2.1.4