Updates unit tests for inner class accessibility.

The accessibility is now determined from the inner class and its containing classes

Author: jeannielynnmoulton

jbmc/unit/java_bytecode/java_bytecode_parser/InnerPrivateClassesDeeplyNested$SinglyNestedPrivateClass$DefaultDoublyNestedInnerClass.class

@@ -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,26 +73,33 @@ 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");
     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 package-private (default) because "
+        "its "
+        "containing class has stricter access ")
       {
         const symbolt &class_symbol = new_symbol_table.lookup_ref(
           "java::InnerClassesDefault$PublicInnerClass");
         const java_class_typet java_class =
           to_java_class_type(class_symbol.type);
         REQUIRE_FALSE(java_class.get_is_anonymous_class());
         REQUIRE(java_class.get_is_inner_class());
-        REQUIRE(java_class.get_access() == ID_public);
+        REQUIRE(java_class.get_access() == ID_default);
       }
     }
-    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");
@@ -105,20 +112,22 @@ 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 package-private (default) because "
+        "its containing class has stricter access ")
       {
         const symbolt &class_symbol = new_symbol_table.lookup_ref(
           "java::InnerClassesDefault$ProtectedInnerClass");
         const java_class_typet java_class =
           to_java_class_type(class_symbol.type);
         REQUIRE_FALSE(java_class.get_is_anonymous_class());
         REQUIRE(java_class.get_is_inner_class());
-        REQUIRE(java_class.get_access() == ID_protected);
+        REQUIRE(java_class.get_access() == ID_default);
       }
     }
     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");
@@ -141,7 +150,9 @@ SCENARIO(
       "Parsing the InnerClasses attribute for a public doubly-nested inner "
       "class")
     {
-      THEN("The class should be marked as public")
+      THEN(
+        "The inner class should be marked as package-private (default) because "
+        "its containing class has stricter access ")
       {
         const symbolt &class_symbol = new_symbol_table.lookup_ref(
           "java::InnerClassesDeeplyNested$SinglyNestedClass$"
@@ -150,14 +161,14 @@ SCENARIO(
           to_java_class_type(class_symbol.type);
         REQUIRE_FALSE(java_class.get_is_anonymous_class());
         REQUIRE(java_class.get_is_inner_class());
-        REQUIRE(java_class.get_access() == ID_public);
+        REQUIRE(java_class.get_access() == ID_default);
       }
     }
     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 +181,12 @@ 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 package-private (default) because "
+        "its containing class has stricter access ")
       {
         const symbolt &class_symbol = new_symbol_table.lookup_ref(
           "java::InnerClassesDeeplyNested$SinglyNestedClass$"
@@ -182,14 +195,14 @@ SCENARIO(
           to_java_class_type(class_symbol.type);
         REQUIRE_FALSE(java_class.get_is_anonymous_class());
         REQUIRE(java_class.get_is_inner_class());
-        REQUIRE(java_class.get_access() == ID_protected);
+        REQUIRE(java_class.get_access() == ID_default);
       }
     }
     WHEN(
       "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$"