Revert "Update unit tests to use new accessibility information."

This reverts commit b1c1d48.

Author: jeannielynnmoulton

jbmc/unit/java_bytecode/java_bytecode_parser/parse_java_attributes.cpp

@@ -81,18 +81,15 @@ SCENARIO(
       "InnerClassesDefault", "./java_bytecode/java_bytecode_parser");
     WHEN("Parsing the InnerClasses attribute for a public inner class")
     {
-      THEN(
-        "The inner class should be marked as package-private (default) because "
-        "its "
-        "containing class has stricter access ")
+      THEN("The class should be marked as public")
       {
         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_default);
+        REQUIRE(java_class.get_access() == ID_public);
       }
     }
     WHEN(
@@ -112,17 +109,15 @@ SCENARIO(
     }
     WHEN("Parsing the InnerClasses attribute for a protected inner class")
     {
-      THEN(
-        "The inner class should be marked as package-private (default) because "
-        "its containing class has stricter access ")
+      THEN("The class should be marked as protected")
       {
         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_default);
+        REQUIRE(java_class.get_access() == ID_protected);
       }
     }
     WHEN("Parsing the InnerClasses attribute for a private inner class")
@@ -150,9 +145,7 @@ SCENARIO(
       "Parsing the InnerClasses attribute for a public doubly-nested inner "
       "class")
     {
-      THEN(
-        "The inner class should be marked as package-private (default) because "
-        "its containing class has stricter access ")
+      THEN("The class should be marked as public")
       {
         const symbolt &class_symbol = new_symbol_table.lookup_ref(
           "java::InnerClassesDeeplyNested$SinglyNestedClass$"
@@ -161,7 +154,7 @@ 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_default);
+        REQUIRE(java_class.get_access() == ID_public);
       }
     }
     WHEN(
@@ -184,9 +177,7 @@ SCENARIO(
       "Parsing the InnerClasses attribute for a package private (default) "
       "doubly-nested inner class ")
     {
-      THEN(
-        "The inner class should be marked as package-private (default) because "
-        "its containing class has stricter access ")
+      THEN("The inner class should be marked as protected")
       {
         const symbolt &class_symbol = new_symbol_table.lookup_ref(
           "java::InnerClassesDeeplyNested$SinglyNestedClass$"
@@ -195,7 +186,7 @@ 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_default);
+        REQUIRE(java_class.get_access() == ID_protected);
       }
     }
     WHEN(