8008313: 8007052 breaks test/tools/javap/MethodParameters.java

Reviewed-by: darcy

test/tools/javap/MethodParameters.java

 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,8 +40,10 @@ public class MethodParameters {
          "  void foo0() {}\n" +
          "  void foo2(int j, int k) {}\n" +
          "}").replaceAll(" +", " ");
+
     static final String Init0_expected =
         ("  Foo();\n" +
+         "    descriptor: ()V\n" +
          "    flags: \n" +
          "    Code:\n" +
          "      stack=1, locals=1, args_size=1\n" +
@@ -50,8 +52,10 @@ public class MethodParameters {
          "         4: return        \n" +
          "      LineNumberTable:\n" +
          "        line 2: 0").replaceAll(" +", " ");
+
     static final String Init1_expected =
         ("  Foo(int);\n" +
+         "    descriptor: (I)V\n" +
          "    flags: \n" +
          "    Code:\n" +
          "      stack=1, locals=2, args_size=2\n" +
@@ -63,16 +67,20 @@ public class MethodParameters {
          "    MethodParameters:\n" +
          "      Name                                Flags\n" +
          "      i").replaceAll(" +", " ");
+
     static final String foo0_expected =
         ("  void foo0();\n" +
+         "    descriptor: ()V\n" +
          "    flags: \n" +
          "    Code:\n" +
          "      stack=0, locals=1, args_size=1\n" +
          "         0: return        \n" +
          "      LineNumberTable:\n" +
          "        line 4: 0").replaceAll(" +", " ");
+
     static final String foo2_expected =
         ("  void foo2(int, int);\n" +
+         "    descriptor: (II)V\n" +
          "    flags: \n" +
          "    Code:\n" +
          "      stack=0, locals=3, args_size=3\n" +