Update desciptions or errors in existing unit tests.

Author: jeannielynnmoulton

jbmc/unit/java_bytecode/java_bytecode_parser/parse_java_attributes.cpp

@@ -22,7 +22,7 @@ SCENARIO(
       load_java_class("InnerClasses", "./java_bytecode/java_bytecode_parser");
     WHEN("Parsing the InnerClasses attribute for a public inner class")
     {
-      THEN("The class should be marked as public")
+      THEN("The inner class should be marked as public")
       {
         const symbolt &class_symbol =
           new_symbol_table.lookup_ref("java::InnerClasses$PublicInnerClass");
@@ -35,7 +35,7 @@ SCENARIO(
     }
     WHEN("Parsing the InnerClasses attribute for a package private inner class")
     {
-      THEN("The class should be marked as default")
+      THEN("The inner class should be marked as default")
       {
         const symbolt &class_symbol =
           new_symbol_table.lookup_ref("java::InnerClasses$DefaultInnerClass");
@@ -48,7 +48,7 @@ SCENARIO(
     }
     WHEN("Parsing the InnerClasses attribute for a protected inner class")
     {
-      THEN("The class should be marked as protected")
+      THEN("The inner class should be marked as protected")
       {
         const symbolt &class_symbol =
           new_symbol_table.lookup_ref("java::InnerClasses$ProtectedInnerClass");
@@ -61,7 +61,7 @@ SCENARIO(
     }
     WHEN("Parsing the InnerClasses attribute for a private inner class")
     {
-      THEN("The class should be marked as private")
+      THEN("The inner class should be marked as private")
       {
         const symbolt &class_symbol =
           new_symbol_table.lookup_ref("java::InnerClasses$PrivateInnerClass");
@@ -73,7 +73,9 @@ SCENARIO(
       }
     }
   }
-  GIVEN("Some package-private class files in the class path with inner classes")
+  GIVEN(
+    "Some package-private (default) class files in the class path with inner "
+    "classes")
   {
     const symbol_tablet &new_symbol_table = load_java_class(
       "InnerClassesDefault", "./java_bytecode/java_bytecode_parser");
@@ -90,9 +92,11 @@ SCENARIO(
         REQUIRE(java_class.get_access() == ID_public);
       }
     }
-    WHEN("Parsing the InnerClasses attribute for a package private inner class")
+    WHEN(
+      "Parsing the InnerClasses attribute for a package private (default) "
+      "inner class")
     {
-      THEN("The class should be marked as default")
+      THEN("The inner class should be marked as package-private (default)")
       {
         const symbolt &class_symbol = new_symbol_table.lookup_ref(
           "java::InnerClassesDefault$DefaultInnerClass");
@@ -118,7 +122,7 @@ SCENARIO(
     }
     WHEN("Parsing the InnerClasses attribute for a private inner class")
     {
-      THEN("The class should be marked as private")
+      THEN("The inner class should be marked as private")
       {
         const symbolt &class_symbol = new_symbol_table.lookup_ref(
           "java::InnerClassesDefault$PrivateInnerClass");
@@ -154,10 +158,10 @@ SCENARIO(
       }
     }
     WHEN(
-      "Parsing the InnerClasses attribute for a package private doubly-nested "
-      "inner class")
+      "Parsing the InnerClasses attribute for a package private (default) "
+      "doubly-nested inner class")
     {
-      THEN("The class should be marked as default")
+      THEN("The inner class should be marked as package-private (default)")
       {
         const symbolt &class_symbol = new_symbol_table.lookup_ref(
           "java::InnerClassesDeeplyNested$SinglyNestedClass$"
@@ -170,10 +174,10 @@ SCENARIO(
       }
     }
     WHEN(
-      "Parsing the InnerClasses attribute for a protected doubly-nested inner "
-      "class")
+      "Parsing the InnerClasses attribute for a package private (default) "
+      "doubly-nested inner class ")
     {
-      THEN("The class should be marked as protected")
+      THEN("The inner class should be marked as protected")
       {
         const symbolt &class_symbol = new_symbol_table.lookup_ref(
           "java::InnerClassesDeeplyNested$SinglyNestedClass$"
@@ -189,7 +193,7 @@ SCENARIO(
       "Parsing the InnerClasses attribute for a private doubly-nested inner "
       "class")
     {
-      THEN("The class should be marked as private")
+      THEN("The inner class should be marked as private ")
       {
         const symbolt &class_symbol = new_symbol_table.lookup_ref(
           "java::InnerClassesDeeplyNested$SinglyNestedClass$"