Fix tests.

egorpugin · egorpugin · commit ab891959d0a2 · 2018-06-22T19:49:36.000+03:00
diff --git a/cppan.yml b/cppan.yml
@@ -74,55 +74,6 @@ common_settings:
 
 
 projects:
-    server.webapp:
-        root_directory: src/server/webapp
-        files: .*
-
-        dependencies:
-            - builder
-            - driver.cpp
-            - name: server.tools.pg_queries
-              ref: pg_queries
-            - pvt.cppan.demo.emweb.wt.http: 4
-            - pvt.cppan.demo.jtv.pqxx: "*"
-            - pvt.egorpugin.primitives.cron: master
-            - pvt.egorpugin.primitives.db.postgresql: master
-            - name: pvt.egorpugin.primitives.embedder
-              version: master
-              ref: embedder
-
-        post_sources: |
-            file(GLOB_RECURSE x "${SDIR}/*")
-            source_group(TREE ${SDIR} PREFIX "Source Files" FILES ${x})
-
-            set(gen_src
-                ${SDIR}/inserts/inserts.cpp.in
-                ${SDIR}/inserts/webapp_db_schema.sql
-            )
-            add_custom_command(OUTPUT ${BDIR}/inserts.webapp.cpp
-                COMMAND ${embedder} ${SDIR}/inserts/inserts.cpp.in ${BDIR}/inserts.webapp.cpp
-                DEPENDS ${embedder} ${gen_src}
-                WORKING_DIRECTORY ${SDIR}/inserts
-            )
-            set(src ${src} ${BDIR}/inserts.webapp.cpp ${gen_src})
-
-            set(gen_src
-                ${SDIR}/pg_queries.sql
-            )
-            add_custom_command(OUTPUT ${BDIR}/pg_queries.cpp ${BDIR}/pg_queries.h
-                COMMAND ${pg_queries} ${SDIR}/pg_queries.sql ${BDIR}/pg_queries.cpp ${BDIR}/pg_queries.h
-                DEPENDS ${pg_queries} ${gen_src}
-                WORKING_DIRECTORY ${SDIR}
-            )
-            set(src ${src} ${gen_src} ${BDIR}/pg_queries.h)
-
-    server.tools.pg_queries:
-        files:
-            - src/server/tools/pg_queries.cpp
-        dependencies:
-            - pvt.egorpugin.primitives.filesystem: master
-
-
     tools.client:
         root_directory: src/tools
         files: client.cpp
diff --git a/test/unit/path.cpp b/test/unit/path.cpp
@@ -8,6 +8,8 @@
 #define CATCH_CONFIG_RUNNER
 #include <catch.hpp>
 
+using namespace sw;
+
 TEST_CASE("Checking Paths", "[path]")
 {
     SECTION("Path")
diff --git a/test/unit/sources.cpp b/test/unit/sources.cpp
@@ -15,6 +15,8 @@
 #define make_name(s) make_name1(s, __LINE__)
 #define make_test_name() make_name("test")
 
+using namespace sw;
+
 auto make_name1(const String &s, int line)
 {
     std::ostringstream ss;

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`	`#define CATCH_CONFIG_RUNNER`
`9`	`9`	`#include <catch.hpp>`
`10`	`10`
	`11`	`+using namespace sw;`
	`12`	`+`
`11`	`13`	`TEST_CASE("Checking Paths", "[path]")`
`12`	`14`	`{`
`13`	`15`	`SECTION("Path")`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`#define make_name(s) make_name1(s, __LINE__)`
`16`	`16`	`#define make_test_name() make_name("test")`
`17`	`17`
	`18`	`+using namespace sw;`
	`19`	`+`
`18`	`20`	`auto make_name1(const String &s, int line)`
`19`	`21`	`{`
`20`	`22`	`std::ostringstream ss;`