fix merge conflicts

Author: mstr2

modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundTest.java

@@ -256,8 +256,7 @@ public void fillsIsUnmodifiable() {
             final BackgroundFill fill = new BackgroundFill(Color.GREEN, new CornerRadii(3), new Insets(4));
             final BackgroundFill[] fills = new BackgroundFill[] { fill };
             Background b = new Background(fills);
-            assertThrows(UnsupportedOperationException.class,
-            () -> b.getFills().add(new BackgroundFill(Color.BLUE, new CornerRadii(6), new Insets(8))));
+            b.getFills().add(new BackgroundFill(Color.BLUE, new CornerRadii(6), new Insets(8)));
         });
     }
 
@@ -267,8 +266,7 @@ public void imagesIsUnmodifiable() {
             final BackgroundImage image = new BackgroundImage(IMAGE_2, SPACE, SPACE, null, null);
             final BackgroundImage[] images = new BackgroundImage[] { image };
             Background b = new Background(images);
-            assertThrows(UnsupportedOperationException.class,
-            () -> b.getImages().add(new BackgroundImage(IMAGE_3, ROUND, ROUND, null, null)));
+            b.getImages().add(new BackgroundImage(IMAGE_3, ROUND, ROUND, null, null));
         });
     }
 

modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BorderTest.java

@@ -258,8 +258,7 @@ public void strokesIsUnmodifiable() {
             final BorderStroke stroke = new BorderStroke(Color.GREEN, BorderStrokeStyle.SOLID, new CornerRadii(3), new BorderWidths(4));
             final BorderStroke[] strokes = new BorderStroke[] { stroke };
             Border b = new Border(strokes);
-            assertThrows(UnsupportedOperationException.class, () ->
-            b.getStrokes().add(new BorderStroke(Color.BLUE, BorderStrokeStyle.SOLID, new CornerRadii(6), new BorderWidths(8))));
+            b.getStrokes().add(new BorderStroke(Color.BLUE, BorderStrokeStyle.SOLID, new CornerRadii(6), new BorderWidths(8)));
         });
     }
 
@@ -270,11 +269,10 @@ public void imagesIsUnmodifiable() {
                                                       BorderWidths.EMPTY, false, REPEAT, REPEAT);
             final BorderImage[] images = new BorderImage[] { image };
             Border b = new Border(images);
-            assertThrows(UnsupportedOperationException.class, () ->
             b.getImages().add(
                     new BorderImage(
                             IMAGE_4, new BorderWidths(3), Insets.EMPTY,
-                            new BorderWidths(3, 4, 5, 6), true, STRETCH, SPACE)));
+                            new BorderWidths(3, 4, 5, 6), true, STRETCH, SPACE));
         });
     }
 

modules/javafx.graphics/src/test/java/test/javafx/scene/paint/LinearGradientTest.java

@@ -85,7 +85,7 @@ public void testGetStopsCannotChangeGradient() {
                     CycleMethod.NO_CYCLE, twoStopsWithNulls);
 
             List<Stop> returned = gradient.getStops();
-            assertThrows(UnsupportedOperationException.class, () -> returned.set(0, stop2));
+            returned.set(0, stop2);
         });
     }
 

modules/javafx.graphics/src/test/java/test/javafx/scene/paint/RadialGradientTest.java

@@ -86,7 +86,7 @@ public void testGetStopsCannotChangeGradient() {
                     CycleMethod.NO_CYCLE, twoStops);
 
             List<Stop> returned = gradient.getStops();
-            assertThrows(UnsupportedOperationException.class, () -> returned.set(0, stop2));
+            returned.set(0, stop2);
         });
     }