merge conflict

Author: jack-berg

sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SamplerFactoryTest.java

@@ -175,26 +175,6 @@ void createInvalid(SamplerModel model, String expectedMessage) {
         .isEqualTo(expectedMessage);
   }
 
-  private static Stream<Arguments> createInvalidArguments() {
-    return Stream.of(
-        Arguments.of(
-            new SamplerModel()
-                .withCompositeDevelopment(
-                    new ExperimentalComposableSamplerModel()
-                        .withParentThreshold(
-                            new ExperimentalComposableParentThresholdSamplerModel())),
-            "parent threshold sampler root is required but is null"));
-  }
-
-  @ParameterizedTest
-  @MethodSource("createInvalidArguments")
-  void createInvalid(SamplerModel model, String expectedMessage) {
-    assertThatThrownBy(() -> SamplerFactory.getInstance().create(model, context))
-        .isInstanceOf(DeclarativeConfigException.class)
-        .cause()
-        .hasMessage(expectedMessage);
-  }
-
   private static Stream<Arguments> createInvalidArguments() {
     return Stream.of(
         Arguments.of(
@@ -206,7 +186,14 @@ private static Stream<Arguments> createInvalidArguments() {
                 .withJaegerRemoteDevelopment(
                     new ExperimentalJaegerRemoteSamplerModel()
                         .withEndpoint("http://jaeger-remote-endpoint")),
-            "jaeger remote sampler initial_sampler is required"));
+            "jaeger remote sampler initial_sampler is required"),
+        Arguments.of(
+            new SamplerModel()
+                .withCompositeDevelopment(
+                    new ExperimentalComposableSamplerModel()
+                        .withParentThreshold(
+                            new ExperimentalComposableParentThresholdSamplerModel())),
+            "parent threshold sampler root is required but is null"));
   }
 
   @Test