From 1dc18141be54309748517a47212916b77a28bd9f Mon Sep 17 00:00:00 2001
From: Grant Nicholas <grant.nicholas@starburstdata.com>
Date: Wed, 2 Mar 2022 16:09:27 -0600
Subject: [PATCH 1/2] Forbid usage of inner test classes in testNG

TestNG support for inner test classes is poor, see this issue:
https://github.com/trinodb/trino/pull/11185
---
 plugin/trino-kudu/pom.xml                     |  6 ++
 .../services/ReportInnerTestClasses.java      | 67 +++++++++++++++++++
 .../services/org.testng.ITestNGListener       |  1 +
 3 files changed, 74 insertions(+)
 create mode 100644 testing/trino-testing-services/src/main/java/io/trino/testng/services/ReportInnerTestClasses.java

diff --git a/plugin/trino-kudu/pom.xml b/plugin/trino-kudu/pom.xml
index 6fabce563049..02a58007ee9d 100644
--- a/plugin/trino-kudu/pom.xml
+++ b/plugin/trino-kudu/pom.xml
@@ -153,6 +153,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-tpch</artifactId>
diff --git a/testing/trino-testing-services/src/main/java/io/trino/testng/services/ReportInnerTestClasses.java b/testing/trino-testing-services/src/main/java/io/trino/testng/services/ReportInnerTestClasses.java
new file mode 100644
index 000000000000..09f4f3e870ff
--- /dev/null
+++ b/testing/trino-testing-services/src/main/java/io/trino/testng/services/ReportInnerTestClasses.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed 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 io.trino.testng.services;
+
+import org.testng.IClassListener;
+import org.testng.ITestClass;
+
+import java.util.Optional;
+
+import static com.google.common.base.Throwables.getStackTraceAsString;
+import static io.trino.testng.services.Listeners.reportListenerFailure;
+
+/**
+ * Detects test classes which are defined as inner classes
+ * TestNG support is poor for these inner test classes: https://github.com/trinodb/trino/pull/11185
+ */
+public class ReportInnerTestClasses
+        implements IClassListener
+{
+    @Override
+    public void onBeforeClass(ITestClass iTestClass)
+    {
+        try {
+            reportInnerTestClasses(iTestClass);
+        }
+        catch (RuntimeException | Error e) {
+            reportListenerFailure(
+                    ReportInnerTestClasses.class,
+                    "Failed to process %s: \n%s",
+                    iTestClass,
+                    getStackTraceAsString(e));
+        }
+    }
+
+    private void reportInnerTestClasses(ITestClass testClass)
+    {
+        Class<?> realClass = testClass.getRealClass();
+
+        if (realClass.getName().startsWith("io.trino.testng.services")) {
+            // ignore internal testcases
+            return;
+        }
+
+        Optional<Class<?>> maybeEnclosingClass = Optional.ofNullable(realClass.getEnclosingClass());
+        maybeEnclosingClass.ifPresent(enclosingClass ->
+                reportListenerFailure(ReportInnerTestClasses.class,
+                        "Test class %s is defined as an inner class, has an enclosing class %s",
+                        realClass.getName(),
+                        enclosingClass.getName()));
+    }
+
+    @Override
+    public void onAfterClass(ITestClass iTestClass)
+    {
+    }
+}
diff --git a/testing/trino-testing-services/src/main/resources/META-INF/services/org.testng.ITestNGListener b/testing/trino-testing-services/src/main/resources/META-INF/services/org.testng.ITestNGListener
index dd67f180b6b8..b1a3ced6b3ff 100644
--- a/testing/trino-testing-services/src/main/resources/META-INF/services/org.testng.ITestNGListener
+++ b/testing/trino-testing-services/src/main/resources/META-INF/services/org.testng.ITestNGListener
@@ -7,3 +7,4 @@ io.trino.testng.services.LogTestDurationListener
 io.trino.testng.services.RetryAnnotationTransformer
 io.trino.testng.services.FlakyAnnotationVerifier
 io.trino.testng.services.ProgressLoggingListener
+io.trino.testng.services.ReportInnerTestClasses

From c1d752737766e7cbe0ea5812016e623d3c341335 Mon Sep 17 00:00:00 2001
From: Ashhar Hasan <ashhar.hasan@starburstdata.com>
Date: Tue, 15 Mar 2022 16:21:20 +0530
Subject: [PATCH 2/2] empty for ci (trino-tests timedout)