JSONReporter's listTests only lists class-name if it is non-empty

Author: horenmar

benchmarks/discover_tests/listing_template.json

@@ -8,7 +8,6 @@
     "tests": [
       {
         "name": "Comparing function pointers",
-        "class-name": "",
         "tags": [
           "function pointer",
           "Tricky"
@@ -20,7 +19,6 @@
       },
       {
         "name": "Testing checked-if 4",
-        "class-name": "",
         "tags": [
           "!shouldfail",
           "checked-if"
@@ -32,7 +30,6 @@
       },
       {
         "name": "count_equidistant_floats - double",
-        "class-name": "",
         "tags": [
           "approvals",
           "distance",
@@ -45,7 +42,6 @@
       },
       {
         "name": "Usage of AllTrue range matcher",
-        "class-name": "",
         "tags": [
           "matchers",
           "quantifiers",
@@ -58,7 +54,6 @@
       },
       {
         "name": "Exception matchers that succeed",
-        "class-name": "",
         "tags": [
           "!throws",
           "exceptions",
@@ -83,7 +78,6 @@
       },
       {
         "name": "Approximate PI",
-        "class-name": "",
         "tags": [
           "Approx",
           "PI"
@@ -95,7 +89,6 @@
       },
       {
         "name": "TextFlow::Column respects width setting",
-        "class-name": "",
         "tags": [
           "approvals",
           "column",
@@ -108,7 +101,6 @@
       },
       {
         "name": "Generators internals",
-        "class-name": "",
         "tags": [
           "generators",
           "internals"
@@ -120,7 +112,6 @@
       },
       {
         "name": "Mayfail test case with nested sections",
-        "class-name": "",
         "tags": [
           "!mayfail"
         ],

src/catch2/reporters/catch_reporter_json.cpp

@@ -360,7 +360,9 @@ namespace Catch {
             auto const& info = test.getTestCaseInfo();
 
             desc_writer.write( "name"_sr ).write( info.name );
-            desc_writer.write( "class-name"_sr ).write( info.className );
+            if (!info.className.empty()) {
+                desc_writer.write( "class-name"_sr ).write( info.className );
+            }
             if ( m_listTags ) {
                 auto tag_writer = desc_writer.write( "tags"_sr ).writeArray();
                 for ( auto const& tag : info.tags ) {

tests/SelfTest/Baselines/compact.sw.approved.txt

@@ -1738,7 +1738,6 @@ Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring( "fa
     "tests": [
       {
         "name": "fake test name",
-        "class-name": "",
         "tags": [
           "fakeTestTag"
         ],

tests/SelfTest/Baselines/compact.sw.multi.approved.txt

@@ -1736,7 +1736,6 @@ Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring( "fa
     "tests": [
       {
         "name": "fake test name",
-        "class-name": "",
         "tags": [
           "fakeTestTag"
         ],

tests/SelfTest/Baselines/console.sw.approved.txt

@@ -11321,7 +11321,6 @@ with expansion:
       "tests": [
         {
           "name": "fake test name",
-          "class-name": "",
           "tags": [
             "fakeTestTag"
           ],

tests/SelfTest/Baselines/console.sw.multi.approved.txt

@@ -11319,7 +11319,6 @@ with expansion:
       "tests": [
         {
           "name": "fake test name",
-          "class-name": "",
           "tags": [
             "fakeTestTag"
           ],

tests/SelfTest/Baselines/tap.sw.approved.txt

@@ -2775,7 +2775,7 @@ ok {test-number} - listingString, ContainsSubstring("fake reporter"s) for: "{
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream
-ok {test-number} - listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "{   "version": 2,   "metadata": {     "name": "",     "rng-seed": 1234,     "catch2-version": "<version>"   },   "listings": {     "tests": [       {         "name": "fake test name",         "class-name": "",         "tags": [           "fakeTestTag"         ],         "source-location": {           "filename": "fake-file.cpp",           "line": 123456789         }       }     ]" ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: JSON'
+ok {test-number} - listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "{   "version": 2,   "metadata": {     "name": "",     "rng-seed": 1234,     "catch2-version": "<version>"   },   "listings": {     "tests": [       {         "name": "fake test name",         "tags": [           "fakeTestTag"         ],         "source-location": {           "filename": "fake-file.cpp",           "line": 123456789         }       }     ]" ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: JSON'
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream

tests/SelfTest/Baselines/tap.sw.multi.approved.txt

@@ -2773,7 +2773,7 @@ ok {test-number} - listingString, ContainsSubstring("fake reporter"s) for: "{
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream
-ok {test-number} - listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "{   "version": 2,   "metadata": {     "name": "",     "rng-seed": 1234,     "catch2-version": "<version>"   },   "listings": {     "tests": [       {         "name": "fake test name",         "class-name": "",         "tags": [           "fakeTestTag"         ],         "source-location": {           "filename": "fake-file.cpp",           "line": 123456789         }       }     ]" ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: JSON'
+ok {test-number} - listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "{   "version": 2,   "metadata": {     "name": "",     "rng-seed": 1234,     "catch2-version": "<version>"   },   "listings": {     "tests": [       {         "name": "fake test name",         "tags": [           "fakeTestTag"         ],         "source-location": {           "filename": "fake-file.cpp",           "line": 123456789         }       }     ]" ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: JSON'
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream

tests/SelfTest/Baselines/xml.sw.approved.txt

@@ -13501,7 +13501,6 @@ Approx( 0.98999999999999999 )
     "tests": [
       {
         "name": "fake test name",
-        "class-name": "",
         "tags": [
           "fakeTestTag"
         ],

tests/SelfTest/Baselines/xml.sw.multi.approved.txt

@@ -13501,7 +13501,6 @@ Approx( 0.98999999999999999 )
     "tests": [
       {
         "name": "fake test name",
-        "class-name": "",
         "tags": [
           "fakeTestTag"
         ],