Merge pull request #10726 from rmuir/nuke_nested_classes

Don't use nested classes for Rest tests.

src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTestCase.java

@@ -302,86 +302,4 @@ public abstract class ElasticsearchRestTestCase extends ElasticsearchIntegration
             executableSection.execute(restTestExecutionContext);
         }
     }
-
-    // don't look any further: NO TOUCHY!
-    
-    public static class Rest0Tests extends ElasticsearchRestTestCase {
-        public Rest0Tests(@Name("yaml") RestTestCandidate testCandidate) {
-            super(testCandidate);
-        }
-        @ParametersFactory
-        public static Iterable<Object[]> parameters() throws IOException, RestTestParseException {
-            return createParameters(0, 8);
-        }
-    }
-    
-    public static class Rest1Tests extends ElasticsearchRestTestCase {
-        public Rest1Tests(@Name("yaml") RestTestCandidate testCandidate) {
-            super(testCandidate);
-        }
-        @ParametersFactory
-        public static Iterable<Object[]> parameters() throws IOException, RestTestParseException {
-            return createParameters(1, 8);
-        }
-    }
-    
-    public static class Rest2Tests extends ElasticsearchRestTestCase {
-        public Rest2Tests(@Name("yaml") RestTestCandidate testCandidate) {
-            super(testCandidate);
-        }
-        @ParametersFactory
-        public static Iterable<Object[]> parameters() throws IOException, RestTestParseException {
-            return createParameters(2, 8);
-        }
-    }
-    
-    public static class Rest3Tests extends ElasticsearchRestTestCase {
-        public Rest3Tests(@Name("yaml") RestTestCandidate testCandidate) {
-            super(testCandidate);
-        }
-        @ParametersFactory
-        public static Iterable<Object[]> parameters() throws IOException, RestTestParseException {
-            return createParameters(3, 8);
-        }
-    }
-    
-    public static class Rest4Tests extends ElasticsearchRestTestCase {
-        public Rest4Tests(@Name("yaml") RestTestCandidate testCandidate) {
-            super(testCandidate);
-        }
-        @ParametersFactory
-        public static Iterable<Object[]> parameters() throws IOException, RestTestParseException {
-            return createParameters(4, 8);
-        }
-    }
-    
-    public static class Rest5Tests extends ElasticsearchRestTestCase {
-        public Rest5Tests(@Name("yaml") RestTestCandidate testCandidate) {
-            super(testCandidate);
-        }
-        @ParametersFactory
-        public static Iterable<Object[]> parameters() throws IOException, RestTestParseException {
-            return createParameters(5, 8);
-        }
-    }
-    
-    public static class Rest6Tests extends ElasticsearchRestTestCase {
-        public Rest6Tests(@Name("yaml") RestTestCandidate testCandidate) {
-            super(testCandidate);
-        }
-        @ParametersFactory
-        public static Iterable<Object[]> parameters() throws IOException, RestTestParseException {
-            return createParameters(6, 8);
-        }
-    }
-    
-    public static class Rest7Tests extends ElasticsearchRestTestCase {
-        public Rest7Tests(@Name("yaml") RestTestCandidate testCandidate) {
-            super(testCandidate);
-        }
-        @ParametersFactory
-        public static Iterable<Object[]> parameters() throws IOException, RestTestParseException {
-            return createParameters(7, 8);
-        }
-    }
 }

src/test/java/org/elasticsearch/test/rest/Rest0Tests.java

@@ -0,0 +1,38 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.test.rest;
+
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.elasticsearch.test.rest.parser.RestTestParseException;
+
+import java.io.IOException;
+
+/** Rest API tests subset 0 */
+public class Rest0Tests extends ElasticsearchRestTestCase {
+    public Rest0Tests(@Name("yaml") RestTestCandidate testCandidate) {
+        super(testCandidate);
+    }
+    @ParametersFactory
+    public static Iterable<Object[]> parameters() throws IOException, RestTestParseException {
+        return createParameters(0, 8);
+    }
+}

src/test/java/org/elasticsearch/test/rest/Rest1Tests.java

@@ -0,0 +1,38 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.test.rest;
+
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.elasticsearch.test.rest.parser.RestTestParseException;
+
+import java.io.IOException;
+
+/** Rest API tests subset 1 */
+public class Rest1Tests extends ElasticsearchRestTestCase {
+    public Rest1Tests(@Name("yaml") RestTestCandidate testCandidate) {
+        super(testCandidate);
+    }
+    @ParametersFactory
+    public static Iterable<Object[]> parameters() throws IOException, RestTestParseException {
+        return createParameters(1, 8);
+    }
+}

src/test/java/org/elasticsearch/test/rest/Rest2Tests.java

@@ -0,0 +1,38 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.test.rest;
+
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.elasticsearch.test.rest.parser.RestTestParseException;
+
+import java.io.IOException;
+
+/** Rest API tests subset 2 */
+public class Rest2Tests extends ElasticsearchRestTestCase {
+    public Rest2Tests(@Name("yaml") RestTestCandidate testCandidate) {
+        super(testCandidate);
+    }
+    @ParametersFactory
+    public static Iterable<Object[]> parameters() throws IOException, RestTestParseException {
+        return createParameters(2, 8);
+    }
+}

src/test/java/org/elasticsearch/test/rest/Rest3Tests.java

@@ -0,0 +1,38 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.test.rest;
+
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.elasticsearch.test.rest.parser.RestTestParseException;
+
+import java.io.IOException;
+
+/** Rest API tests subset 3 */
+public class Rest3Tests extends ElasticsearchRestTestCase {
+    public Rest3Tests(@Name("yaml") RestTestCandidate testCandidate) {
+        super(testCandidate);
+    }
+    @ParametersFactory
+    public static Iterable<Object[]> parameters() throws IOException, RestTestParseException {
+        return createParameters(3, 8);
+    }
+}

src/test/java/org/elasticsearch/test/rest/Rest4Tests.java

@@ -0,0 +1,38 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.test.rest;
+
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.elasticsearch.test.rest.parser.RestTestParseException;
+
+import java.io.IOException;
+
+/** Rest API tests subset 4 */
+public class Rest4Tests extends ElasticsearchRestTestCase {
+    public Rest4Tests(@Name("yaml") RestTestCandidate testCandidate) {
+        super(testCandidate);
+    }
+    @ParametersFactory
+    public static Iterable<Object[]> parameters() throws IOException, RestTestParseException {
+        return createParameters(4, 8);
+    }
+}

src/test/java/org/elasticsearch/test/rest/Rest5Tests.java

@@ -0,0 +1,38 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.test.rest;
+
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.elasticsearch.test.rest.parser.RestTestParseException;
+
+import java.io.IOException;
+
+/** Rest API tests subset 5 */
+public class Rest5Tests extends ElasticsearchRestTestCase {
+    public Rest5Tests(@Name("yaml") RestTestCandidate testCandidate) {
+        super(testCandidate);
+    }
+    @ParametersFactory
+    public static Iterable<Object[]> parameters() throws IOException, RestTestParseException {
+        return createParameters(5, 8);
+    }
+}

src/test/java/org/elasticsearch/test/rest/Rest6Tests.java

@@ -0,0 +1,38 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.test.rest;
+
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.elasticsearch.test.rest.parser.RestTestParseException;
+
+import java.io.IOException;
+
+/** Rest API tests subset 6 */
+public class Rest6Tests extends ElasticsearchRestTestCase {
+    public Rest6Tests(@Name("yaml") RestTestCandidate testCandidate) {
+        super(testCandidate);
+    }
+    @ParametersFactory
+    public static Iterable<Object[]> parameters() throws IOException, RestTestParseException {
+        return createParameters(6, 8);
+    }
+}

src/test/java/org/elasticsearch/test/rest/Rest7Tests.java

@@ -0,0 +1,38 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.test.rest;
+
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.elasticsearch.test.rest.parser.RestTestParseException;
+
+import java.io.IOException;
+
+/** Rest API tests subset 7 */
+public class Rest7Tests extends ElasticsearchRestTestCase {
+    public Rest7Tests(@Name("yaml") RestTestCandidate testCandidate) {
+        super(testCandidate);
+    }
+    @ParametersFactory
+    public static Iterable<Object[]> parameters() throws IOException, RestTestParseException {
+        return createParameters(7, 8);
+    }
+}