Fix GApplication unit test

Jürgen Knödlseder
1 parent 498c336f
Showing 3 changed files with 25 additions and 28 deletions
src/sky/GSkyRegionCircle.cpp
src/sky/GSkyRegions.cpp
test/test_GApplication.cpp
@@ -412,7 +412,7 @@ std::string GSkyRegionCircle::write(void) const
 /***********************************************************************//**
  * @brief Print circular region
  *
- * @param[in] chatter Chattiness (defaults to NORMAL).
+ * @param[in] chatter Chattiness
  * @return String containing region information.
  ***************************************************************************/
 std::string GSkyRegionCircle::print(const GChatter& chatter) const
@@ -423,15 +423,16 @@ std::string GSkyRegionCircle::print(const GChatter&amp; chatter) const
     // Continue only if chatter is not silent
     if (chatter != SILENT) {
-        // Append string
+        // Append header
     	result.append("=== GSkyRegionCircle ===");
-    	result.append("\n(");
-        result.append(gammalib::str(m_centre.ra_deg()));
-        result.append(",");
-        result.append(gammalib::str(m_centre.dec_deg()));
-        result.append(",");
-        result.append(gammalib::str(m_radius));
-        result.append(")");
+
+        // Append sky circle information
+        result.append("\n"+gammalib::parformat("Right Ascension of centre"));
+        result.append(gammalib::str(m_centre.ra_deg())+" deg");
+        result.append("\n"+gammalib::parformat("Declination of centre"));
+        result.append(gammalib::str(m_centre.dec_deg())+" deg");
+        result.append("\n"+gammalib::parformat("Radius"));
+        result.append(gammalib::str(m_radius)+" deg");
     } // endif: chatter was not silent
@@ -545,7 +545,7 @@ void GSkyRegions::save(const GFilename&amp; filename) const
 /***********************************************************************//**
  * @brief Print regions
  *
- * @param[in] chatter Chattiness (defaults to NORMAL).
+ * @param[in] chatter Chattiness
  * @return String containing region container information.
  *
  * Prints all regions into a string.
@@ -462,51 +462,47 @@ void TestGApplication::test_GApplication(void)
         // Test logging of header 2
         fgets(line, 100, fp);
-        test_value(line, "\n", "Check log file line 14");
+        test_value(line, "+----------+\n", "Check log file line 14");
         fgets(line, 100, fp);
-        test_value(line, "+----------+\n", "Check log file line 15");
+        test_value(line, "| Header 2 |\n", "Check log file line 15");
         fgets(line, 100, fp);
-        test_value(line, "| Header 2 |\n", "Check log file line 16");
-        fgets(line, 100, fp);
-        test_value(line, "+----------+\n", "Check log file line 17");
+        test_value(line, "+----------+\n", "Check log file line 16");
         // Test logging of header 3
         fgets(line, 100, fp);
-        test_value(line, "\n", "Check log file line 18");
-        fgets(line, 100, fp);
-        test_value(line, "=== Header 3 ===\n", "Check log file line 19");
+        test_value(line, "=== Header 3 ===\n", "Check log file line 17");
         // Test logging of parameters
         fgets(line, 100, fp);
-        test_value(line, "+============+\n", "Check log file line 20");
+        test_value(line, "+============+\n", "Check log file line 18");
         fgets(line, 100, fp);
-        test_value(line, "| Parameters |\n", "Check log file line 21");
+        test_value(line, "| Parameters |\n", "Check log file line 19");
         fgets(line, 100, fp);
-        test_value(line, "+============+\n", "Check log file line 22");
+        test_value(line, "+============+\n", "Check log file line 20");
         fgets(line, 100, fp);
         test_value(line, " chatter ...................: 2\n",
-                         "Check log file line 23");
+                         "Check log file line 21");
         fgets(line, 100, fp);
         test_value(line, " clobber ...................: yes\n",
-                         "Check log file line 24");
+                         "Check log file line 22");
         fgets(line, 100, fp);
         test_value(line, " debug .....................: no\n",
-                         "Check log file line 25");
+                         "Check log file line 23");
         fgets(line, 100, fp);
         test_value(line, " mode ......................: ql\n",
-                         "Check log file line 26");
+                         "Check log file line 24");
         fgets(line, 100, fp);
         test_value(line, " logfile ...................: test_logfile.log\n",
-                         "Check log file line 27");
+                         "Check log file line 25");
         fgets(line, 32, fp);
         test_value(line, "Application \"test_GApplication\"",
-                         "Check log file line 28");
+                         "Check log file line 26");
         // Empty remaining characters (not checked since they are machine
         // dependent)
         fgets(line, 200, fp);
         fgets(line, 32, fp);
         test_value(line, "Application \"test_GApplication\"",
-                         "Check log file line 29");
+                         "Check log file line 27");
         // Close log file
         fclose(fp);