Make tests oblivious to tag type expansion

The regular expressions now accept both the tag names as well as the expanded
types/class names.

Author: tautschnig

jbmc/regression/jbmc/simplify-classid-of-interface/test_no_simplify_vccs.desc

@@ -3,7 +3,7 @@ Test.class
 --function Test.main --no-simplify --unwind 10 --show-vcc
 ^EXIT=0$
 ^SIGNAL=0$
-"java::Impl1" = cast\(\{ \{ "java::Impl1" \}, 0 \}, struct \{ struct \{ string @class_identifier \} @java.lang.Object \}\)\[email protected]\.@class_identifier
+"java::Impl1" = cast\(\{ \{ "java::Impl1" \}, 0 \}, struct (\{ struct \{ string @class_identifier \} @java.lang.Object \}|java::Intf)\)\[email protected]\.@class_identifier
 --
 ^warning: ignoring
 --

jbmc/regression/jbmc/trace_class_identifier/test.desc

@@ -1,7 +1,7 @@
 CORE
 TestGenTest.class
 --function TestGenTest.f --trace --json-ui
-"data": "java::TestGenTest",$
+"data": "(java::TestGenTest|TestGenTest@class_model)",$
 ^EXIT=10$
 ^SIGNAL=0$
 --