fix; move class

extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteNestedDataQueryMSQTest.java

@@ -19,21 +19,59 @@
 
 package org.apache.druid.msq.test;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Injector;
+import com.google.inject.Module;
+import org.apache.druid.guice.DruidInjectorBuilder;
 import org.apache.druid.java.util.common.ISE;
+import org.apache.druid.msq.exec.TestMSQSqlModule;
 import org.apache.druid.msq.sql.MSQTaskSqlEngine;
+import org.apache.druid.query.groupby.TestGroupByBuffers;
+import org.apache.druid.server.QueryLifecycleFactory;
 import org.apache.druid.sql.calcite.CalciteNestedDataQueryTest;
 import org.apache.druid.sql.calcite.QueryTestBuilder;
 import org.apache.druid.sql.calcite.SqlTestFrameworkConfig;
+import org.apache.druid.sql.calcite.TempDirProducer;
+import org.apache.druid.sql.calcite.run.SqlEngine;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 /**
  * Runs {@link CalciteNestedDataQueryTest} but with MSQ engine
  */
-@SqlTestFrameworkConfig.ComponentSupplier(StandardMSQComponentSupplier.class)
+@SqlTestFrameworkConfig.ComponentSupplier(CalciteNestedDataQueryMSQTest.NestedDataQueryMSQComponentSupplier.class)
 public class CalciteNestedDataQueryMSQTest extends CalciteNestedDataQueryTest
 {
+
+  public static class NestedDataQueryMSQComponentSupplier extends NestedComponentSupplier
+  {
+    public NestedDataQueryMSQComponentSupplier(TempDirProducer tempFolderProducer)
+    {
+      super(tempFolderProducer);
+    }
+
+    @Override
+    public void configureGuice(DruidInjectorBuilder builder)
+    {
+      super.configureGuice(builder);
+      builder.addModules(
+          CalciteMSQTestsHelper.fetchModules(tempDirProducer::newTempFolder, TestGroupByBuffers.createDefault()).toArray(new Module[0])
+      );
+      builder.addModule(new TestMSQSqlModule());
+    }
+
+    @Override
+    public SqlEngine createEngine(
+        QueryLifecycleFactory qlf,
+        ObjectMapper queryJsonMapper,
+        Injector injector
+    )
+    {
+      return injector.getInstance(MSQTaskSqlEngine.class);
+    }
+  }
+
   @Override
   protected QueryTestBuilder testBuilder()
   {

sql/src/test/java/org/apache/druid/sql/calcite/util/CompositeDruidModule.java

@@ -17,11 +17,12 @@
  * under the License.
  */
 
-package org.apache.druid.initialization;
+package org.apache.druid.sql.calcite.util;
 
 import com.fasterxml.jackson.databind.Module;
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Binder;
+import org.apache.druid.initialization.DruidModule;
 
 import java.util.List;
 

sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java

@@ -32,7 +32,6 @@ import org.apache.druid.guice.ExpressionModule;
 import org.apache.druid.guice.LazySingleton;
 import org.apache.druid.guice.SegmentWranglerModule;
 import org.apache.druid.guice.StartupInjectorBuilder;
-import org.apache.druid.initialization.CompositeDruidModule;
 import org.apache.druid.initialization.CoreInjectorBuilder;
 import org.apache.druid.initialization.ServiceInjectorBuilder;
 import org.apache.druid.java.util.common.RE;