2340: fix daikatana common include name (#2341)

* 2340: fix daikatana common include name Fixes #2340 * 2340: Included FGD / DEF parser tests fail if warnings or errors occur during parsing.
TrenchBroom · Oct 11, 2018 · 1c6062b · 1c6062b
1 parent a9b8d5c
commit 1c6062b
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/app/resources/games/Daikatana/Episode 1.fgd b/app/resources/games/Daikatana/Episode 1.fgd
@@ -9,7 +9,7 @@
 // email me with improvements and suggestions
 //
 
-@include "dk_common.fgd"
+@include "Common.fgd"
 
 
 //

diff --git a/app/resources/games/Daikatana/Episode 2.fgd b/app/resources/games/Daikatana/Episode 2.fgd
@@ -9,7 +9,7 @@
 // email me with improvements and suggestions
 //
 
-@include "dk_common.fgd"
+@include "Common.fgd"
 
 
 //

diff --git a/app/resources/games/Daikatana/Episode 3.fgd b/app/resources/games/Daikatana/Episode 3.fgd
@@ -9,7 +9,7 @@
 // email me with improvements and suggestions
 //
 
-@include "dk_common.fgd"
+@include "Common.fgd"
 
 
 //

diff --git a/app/resources/games/Daikatana/Episode 4.fgd b/app/resources/games/Daikatana/Episode 4.fgd
@@ -9,7 +9,7 @@
 // email me with improvements and suggestions
 //
 
-@include "dk_common.fgd"
+@include "Common.fgd"
 
 
 //

diff --git a/common/src/IO/ParserStatus.cpp b/common/src/IO/ParserStatus.cpp
@@ -58,15 +58,15 @@ namespace TrenchBroom {
         }
 
         void ParserStatus::info(const size_t line, const String& str) {
-            log(Logger::LogLevel_Debug, line, str);
+            log(Logger::LogLevel_Info, line, str);
         }
 
         void ParserStatus::warn(const size_t line, const String& str) {
-            log(Logger::LogLevel_Debug, line, str);
+            log(Logger::LogLevel_Warn, line, str);
         }
 
         void ParserStatus::error(const size_t line, const String& str) {
-            log(Logger::LogLevel_Debug, line, str);
+            log(Logger::LogLevel_Error, line, str);
         }
 
         void ParserStatus::errorAndThrow(size_t line, const String& str) {

diff --git a/test/src/IO/DefParserTest.cpp b/test/src/IO/DefParserTest.cpp
@@ -44,8 +44,8 @@ namespace TrenchBroom {
 
                 TestParserStatus status;
                 ASSERT_NO_THROW(parser.parseDefinitions(status)) << "Parsing DEF file " << path.asString() << " failed";
-                ASSERT_EQ(0u, status.countStatus(Logger::LogLevel_Warn));
-                ASSERT_EQ(0u, status.countStatus(Logger::LogLevel_Error));
+                ASSERT_EQ(0u, status.countStatus(Logger::LogLevel_Warn)) << "Parsing DEF file " << path.asString() << " produced warnings";
+                ASSERT_EQ(0u, status.countStatus(Logger::LogLevel_Error)) << "Parsing DEF file " << path.asString() << " produced errors";
             }
         }
 

diff --git a/test/src/IO/FgdParserTest.cpp b/test/src/IO/FgdParserTest.cpp
@@ -41,12 +41,12 @@ namespace TrenchBroom {
             for (const Path& path : cfgFiles) {
                 MappedFile::Ptr file = Disk::openFile(path);
                 const Color defaultColor(1.0f, 1.0f, 1.0f, 1.0f);
-                FgdParser parser(file->begin(), file->end(), defaultColor);
+                FgdParser parser(file->begin(), file->end(), defaultColor, path);
 
                 TestParserStatus status;
                 ASSERT_NO_THROW(parser.parseDefinitions(status)) << "Parsing FGD file " << path.asString() << " failed";
-                ASSERT_EQ(0u, status.countStatus(Logger::LogLevel_Warn));
-                ASSERT_EQ(0u, status.countStatus(Logger::LogLevel_Error));
+                ASSERT_EQ(0u, status.countStatus(Logger::LogLevel_Warn)) << "Parsing FGD file " << path.asString() << " produced warnings";
+                ASSERT_EQ(0u, status.countStatus(Logger::LogLevel_Error)) << "Parsing FGD file " << path.asString() << " produced errors";
             }
         }