Add better error reporting to RestApiParser if assertions are tripped

src/test/java/org/elasticsearch/test/rest/spec/RestApiParser.java

@@ -126,7 +126,7 @@ public class RestApiParser {
             }
 
             parser.nextToken();
-            assert parser.currentToken() == XContentParser.Token.END_OBJECT;
+            assert parser.currentToken() == XContentParser.Token.END_OBJECT : "Expected [END_OBJECT] but was ["  + parser.currentToken() +"]";
             parser.nextToken();
 
             return restApi;

src/test/java/org/elasticsearch/test/rest/spec/RestSpec.java

@@ -56,7 +56,7 @@ public class RestSpec {
                     XContentParser parser = JsonXContent.jsonXContent.createParser(new FileInputStream(jsonFile));
                     RestApi restApi = new RestApiParser().parse(parser);
                     restSpec.addApi(restApi);
-                } catch (IOException ex) {
+                } catch (Throwable ex) {
                     throw new IOException("Can't parse rest spec file: [" + jsonFile + "]", ex);
                 }
             }