Fix tests

nroduit · Dec 13, 2023 · 220429e · 220429e
1 parent a4e592f
commit 220429e
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 17 deletions.
diff --git a/weasis-core/src/test/java/org/weasis/core/ui/model/graphic/imp/AnnotationGraphicTest.java b/weasis-core/src/test/java/org/weasis/core/ui/model/graphic/imp/AnnotationGraphicTest.java
@@ -25,7 +25,7 @@ public class AnnotationGraphicTest extends GraphicTester<AnnotationGraphic> {
   private static final String XML_1 = "/graphic/annotation/annotation.graphic.1.xml"; // NON-NLS
 
   static final String BASIC_TPL =
-      "<annotation fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" uuid=\"%s\">" // NON-NLS
+      "<annotation fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" insideOpacity=\"%s\" uuid=\"%s\">" // NON-NLS
           + "<paint rgb=\"%s\"/>" // NON-NLS
           + "<pts/>" // NON-NLS
           + "</annotation>"; // NON-NLS
@@ -58,6 +58,7 @@ public Object[] getParameters() {
       Graphic.DEFAULT_FILLED,
       Graphic.DEFAULT_LABEL_VISIBLE,
       Graphic.DEFAULT_LINE_THICKNESS,
+      Graphic.DEFAULT_INTERIOR_OPACITY,
       getGraphicUuid(),
       WProperties.color2Hexadecimal(Graphic.DEFAULT_COLOR, true)
     };

diff --git a/weasis-core/src/test/java/org/weasis/core/ui/model/graphic/imp/PixelInfoGraphicTest.java b/weasis-core/src/test/java/org/weasis/core/ui/model/graphic/imp/PixelInfoGraphicTest.java
@@ -25,7 +25,7 @@ public class PixelInfoGraphicTest extends GraphicTester<PixelInfoGraphic> {
   private static final String XML_1 = "/graphic/pixel/pixel.graphic.1.xml"; // NON-NLS
 
   static final String BASIC_TPL =
-      "<pixelInfo fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" uuid=\"%s\">" // NON-NLS
+      "<pixelInfo fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" insideOpacity=\"%s\" uuid=\"%s\">" // NON-NLS
           + "<paint rgb=\"%s\"/>" // NON-NLS
           + "<pts/>" // NON-NLS
           + "</pixelInfo>"; // NON-NLS
@@ -58,6 +58,7 @@ public Object[] getParameters() {
       Graphic.DEFAULT_FILLED,
       Graphic.DEFAULT_LABEL_VISIBLE,
       Graphic.DEFAULT_LINE_THICKNESS,
+      Graphic.DEFAULT_INTERIOR_OPACITY,
       getGraphicUuid(),
       WProperties.color2Hexadecimal(Graphic.DEFAULT_COLOR, true)
     };

diff --git a/weasis-core/src/test/java/org/weasis/core/ui/model/graphic/imp/PointGraphicTest.java b/weasis-core/src/test/java/org/weasis/core/ui/model/graphic/imp/PointGraphicTest.java
@@ -24,7 +24,7 @@ public class PointGraphicTest extends GraphicTester<PointGraphic> {
   private static final String XML_1 = "/graphic/point/point.graphic.1.xml"; // NON-NLS
 
   static final String BASIC_TPL =
-      "<point pointSize=\"%s\" fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" uuid=\"%s\">" // NON-NLS
+      "<point pointSize=\"%s\" fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" insideOpacity=\"%s\" uuid=\"%s\">" // NON-NLS
           + "<paint rgb=\"%s\"/>" // NON-NLS
           + "<pts/>" // NON-NLS
           + "</point>"; // NON-NLS
@@ -52,6 +52,7 @@ public Object[] getParameters() {
       Graphic.DEFAULT_FILLED,
       Graphic.DEFAULT_LABEL_VISIBLE,
       Graphic.DEFAULT_LINE_THICKNESS,
+      Graphic.DEFAULT_INTERIOR_OPACITY,
       getGraphicUuid(),
       WProperties.color2Hexadecimal(Graphic.DEFAULT_COLOR, true)
     };

diff --git a/...s-core/src/test/java/org/weasis/core/ui/model/graphic/imp/angle/AngleToolGraphicTest.java b/...s-core/src/test/java/org/weasis/core/ui/model/graphic/imp/angle/AngleToolGraphicTest.java
@@ -21,7 +21,7 @@ public class AngleToolGraphicTest extends GraphicTester<AngleToolGraphic> {
   private static final String XML_1 = "/graphic/angle/angle.graphic.1.xml"; // NON-NLS
 
   public static final String BASIC_TPL =
-      "<angle fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" uuid=\"%s\">" // NON-NLS
+      "<angle fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" insideOpacity=\"%s\" uuid=\"%s\">" // NON-NLS
           + "<paint rgb=\"%s\"/>" // NON-NLS
           + "<pts/>" // NON-NLS
           + "</angle>"; // NON-NLS
@@ -50,6 +50,7 @@ public Object[] getParameters() {
       Graphic.DEFAULT_FILLED,
       Graphic.DEFAULT_LABEL_VISIBLE,
       Graphic.DEFAULT_LINE_THICKNESS,
+      Graphic.DEFAULT_INTERIOR_OPACITY,
       getGraphicUuid(),
       WProperties.color2Hexadecimal(Graphic.DEFAULT_COLOR, true)
     };

diff --git a/...re/src/test/java/org/weasis/core/ui/model/graphic/imp/angle/CobbAngleToolGraphicTest.java b/...re/src/test/java/org/weasis/core/ui/model/graphic/imp/angle/CobbAngleToolGraphicTest.java
@@ -21,7 +21,7 @@ public class CobbAngleToolGraphicTest extends GraphicTester<CobbAngleToolGraphic
   private static final String XML_1 = "/graphic/cobbAngle/cobbAngle.graphic.1.xml"; // NON-NLS
 
   public static final String BASIC_TPL =
-      "<cobbAngle fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" uuid=\"%s\">" // NON-NLS
+      "<cobbAngle fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" insideOpacity=\"%s\" uuid=\"%s\">" // NON-NLS
           + "<paint rgb=\"%s\"/>" // NON-NLS
           + "<pts/>" // NON-NLS
           + "</cobbAngle>"; // NON-NLS
@@ -52,6 +52,7 @@ public Object[] getParameters() {
       Graphic.DEFAULT_FILLED,
       Graphic.DEFAULT_LABEL_VISIBLE,
       Graphic.DEFAULT_LINE_THICKNESS,
+      Graphic.DEFAULT_INTERIOR_OPACITY,
       getGraphicUuid(),
       WProperties.color2Hexadecimal(Graphic.DEFAULT_COLOR, true)
     };

diff --git a/.../test/java/org/weasis/core/ui/model/graphic/imp/angle/FourPointsAngleToolGraphicTest.java b/.../test/java/org/weasis/core/ui/model/graphic/imp/angle/FourPointsAngleToolGraphicTest.java
@@ -23,7 +23,7 @@ public class FourPointsAngleToolGraphicTest extends GraphicTester<FourPointsAngl
       "/graphic/fourPointsAngle/fourPointsAngle.graphic.1.xml"; // NON-NLS
 
   public static final String BASIC_TPL =
-      "<fourPointsAngle fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" uuid=\"%s\">" // NON-NLS
+      "<fourPointsAngle fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" insideOpacity=\"%s\" uuid=\"%s\">" // NON-NLS
           + "<paint rgb=\"%s\"/>" // NON-NLS
           + "<pts/>" // NON-NLS
           + "</fourPointsAngle>"; // NON-NLS
@@ -57,6 +57,7 @@ public Object[] getParameters() {
       Graphic.DEFAULT_FILLED,
       Graphic.DEFAULT_LABEL_VISIBLE,
       Graphic.DEFAULT_LINE_THICKNESS,
+      Graphic.DEFAULT_INTERIOR_OPACITY,
       getGraphicUuid(),
       WProperties.color2Hexadecimal(Graphic.DEFAULT_COLOR, true)
     };

diff --git a/...re/src/test/java/org/weasis/core/ui/model/graphic/imp/angle/OpenAngleToolGraphicTest.java b/...re/src/test/java/org/weasis/core/ui/model/graphic/imp/angle/OpenAngleToolGraphicTest.java
@@ -21,7 +21,7 @@ public class OpenAngleToolGraphicTest extends GraphicTester<OpenAngleToolGraphic
   private static final String XML_1 = "/graphic/openAngle/openAngle.graphic.1.xml"; // NON-NLS
 
   public static final String BASIC_TPL =
-      "<openAngle fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" uuid=\"%s\">" // NON-NLS
+      "<openAngle fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" insideOpacity=\"%s\" uuid=\"%s\">" // NON-NLS
           + "<paint rgb=\"%s\"/>" // NON-NLS
           + "<pts/>" // NON-NLS
           + "</openAngle>"; // NON-NLS
@@ -51,6 +51,7 @@ public Object[] getParameters() {
       Graphic.DEFAULT_FILLED,
       Graphic.DEFAULT_LABEL_VISIBLE,
       Graphic.DEFAULT_LINE_THICKNESS,
+      Graphic.DEFAULT_INTERIOR_OPACITY,
       getGraphicUuid(),
       WProperties.color2Hexadecimal(Graphic.DEFAULT_COLOR, true)
     };

diff --git a/weasis-core/src/test/java/org/weasis/core/ui/model/graphic/imp/area/EllipseGraphicTest.java b/weasis-core/src/test/java/org/weasis/core/ui/model/graphic/imp/area/EllipseGraphicTest.java
@@ -21,7 +21,7 @@ public class EllipseGraphicTest extends GraphicTester<EllipseGraphic> {
   private static final String XML_1 = "/graphic/ellipse/ellipse.graphic.1.xml"; // NON-NLS
 
   public static final String BASIC_TPL =
-      "<ellipse fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" uuid=\"%s\">" // NON-NLS
+      "<ellipse fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" insideOpacity=\"%s\" uuid=\"%s\">" // NON-NLS
           + "<paint rgb=\"%s\"/>" // NON-NLS
           + "<pts/>" // NON-NLS
           + "</ellipse>"; // NON-NLS
@@ -51,6 +51,7 @@ public Object[] getParameters() {
       Graphic.DEFAULT_FILLED,
       Graphic.DEFAULT_LABEL_VISIBLE,
       Graphic.DEFAULT_LINE_THICKNESS,
+      Graphic.DEFAULT_INTERIOR_OPACITY,
       getGraphicUuid(),
       WProperties.color2Hexadecimal(Graphic.DEFAULT_COLOR, true)
     };

diff --git a/weasis-core/src/test/java/org/weasis/core/ui/model/graphic/imp/area/PolygonGraphicTest.java b/weasis-core/src/test/java/org/weasis/core/ui/model/graphic/imp/area/PolygonGraphicTest.java
@@ -21,7 +21,7 @@ public class PolygonGraphicTest extends GraphicTester<PolygonGraphic> {
   private static final String XML_1 = "/graphic/polygon/polygon.graphic.1.xml"; // NON-NLS
 
   public static final String BASIC_TPL =
-      "<polygon fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" uuid=\"%s\">" // NON-NLS
+      "<polygon fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" insideOpacity=\"%s\" uuid=\"%s\">" // NON-NLS
           + "<paint rgb=\"%s\"/>" // NON-NLS
           + "<pts/>" // NON-NLS
           + "</polygon>"; // NON-NLS
@@ -55,6 +55,7 @@ public Object[] getParameters() {
       Graphic.DEFAULT_FILLED,
       Graphic.DEFAULT_LABEL_VISIBLE,
       Graphic.DEFAULT_LINE_THICKNESS,
+      Graphic.DEFAULT_INTERIOR_OPACITY,
       getGraphicUuid(),
       WProperties.color2Hexadecimal(Graphic.DEFAULT_COLOR, true)
     };

diff --git a/...is-core/src/test/java/org/weasis/core/ui/model/graphic/imp/area/RectangleGraphicTest.java b/...is-core/src/test/java/org/weasis/core/ui/model/graphic/imp/area/RectangleGraphicTest.java
@@ -21,7 +21,7 @@ public class RectangleGraphicTest extends GraphicTester<ObliqueRectangleGraphic>
   private static final String XML_1 = "/graphic/rectangle/rectangle.graphic.1.xml"; // NON-NLS
 
   public static final String BASIC_TPL =
-      "<rectangle fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" uuid=\"%s\">" // NON-NLS
+      "<rectangle fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" insideOpacity=\"%s\" uuid=\"%s\">" // NON-NLS
           + "<paint rgb=\"%s\"/>" // NON-NLS
           + "<pts/>" // NON-NLS
           + "</rectangle>"; // NON-NLS
@@ -52,6 +52,7 @@ public Object[] getParameters() {
       Graphic.DEFAULT_FILLED,
       Graphic.DEFAULT_LABEL_VISIBLE,
       Graphic.DEFAULT_LINE_THICKNESS,
+      Graphic.DEFAULT_INTERIOR_OPACITY,
       getGraphicUuid(),
       WProperties.color2Hexadecimal(Graphic.DEFAULT_COLOR, true)
     };

diff --git a/...src/test/java/org/weasis/core/ui/model/graphic/imp/area/ThreePointsCircleGraphicTest.java b/...src/test/java/org/weasis/core/ui/model/graphic/imp/area/ThreePointsCircleGraphicTest.java
@@ -23,7 +23,7 @@ public class ThreePointsCircleGraphicTest extends GraphicTester<ThreePointsCircl
       "/graphic/threePointsCircle/threePointsCircle.graphic.1.xml"; // NON-NLS
 
   static final String BASIC_TPL =
-      "<threePointsCircle fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" uuid=\"%s\">" // NON-NLS
+      "<threePointsCircle fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" insideOpacity=\"%s\" uuid=\"%s\">" // NON-NLS
           + "<paint rgb=\"%s\"/>" // NON-NLS
           + "<pts/>" // NON-NLS
           + "</threePointsCircle>"; // NON-NLS
@@ -53,6 +53,7 @@ public Object[] getParameters() {
       Graphic.DEFAULT_FILLED,
       Graphic.DEFAULT_LABEL_VISIBLE,
       Graphic.DEFAULT_LINE_THICKNESS,
+      Graphic.DEFAULT_INTERIOR_OPACITY,
       getGraphicUuid(),
       WProperties.color2Hexadecimal(Graphic.DEFAULT_COLOR, true)
     };

diff --git a/weasis-core/src/test/java/org/weasis/core/ui/model/graphic/imp/line/LineGraphicTest.java b/weasis-core/src/test/java/org/weasis/core/ui/model/graphic/imp/line/LineGraphicTest.java
@@ -22,7 +22,7 @@ public class LineGraphicTest extends GraphicTester<LineGraphic> {
   private static final String XML_1 = "/graphic/line/line.graphic.1.xml"; // NON-NLS
 
   public static final String BASIC_TPL =
-      "<line fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" uuid=\"%s\">" // NON-NLS
+      "<line fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" insideOpacity=\"%s\" uuid=\"%s\">" // NON-NLS
           + "<paint rgb=\"%s\"/>" // NON-NLS
           + "<pts/>" // NON-NLS
           + "</line>"; // NON-NLS
@@ -49,6 +49,7 @@ public Object[] getParameters() {
       Graphic.DEFAULT_FILLED,
       Graphic.DEFAULT_LABEL_VISIBLE,
       Graphic.DEFAULT_LINE_THICKNESS,
+      Graphic.DEFAULT_INTERIOR_OPACITY,
       getGraphicUuid(),
       WProperties.color2Hexadecimal(Graphic.DEFAULT_COLOR, true)
     };

diff --git a/...-core/src/test/java/org/weasis/core/ui/model/graphic/imp/line/LineWithGapGraphicTest.java b/...-core/src/test/java/org/weasis/core/ui/model/graphic/imp/line/LineWithGapGraphicTest.java
@@ -24,7 +24,7 @@ public class LineWithGapGraphicTest extends GraphicTester<LineWithGapGraphic> {
   private static final String XML_1 = "/graphic/lineWithGap/lineWithGap.graphic.1.xml"; // NON-NLS
 
   static final String BASIC_TPL =
-      "<lineWithGap gapSize=\"%s\" fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" uuid=\"%s\">" // NON-NLS
+      "<lineWithGap gapSize=\"%s\" fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" insideOpacity=\"%s\" uuid=\"%s\">" // NON-NLS
           + "<paint rgb=\"%s\"/>" // NON-NLS
           + "<pts/>" // NON-NLS
           + "</lineWithGap>"; // NON-NLS
@@ -52,6 +52,7 @@ public Object[] getParameters() {
       Graphic.DEFAULT_FILLED,
       Graphic.DEFAULT_LABEL_VISIBLE,
       Graphic.DEFAULT_LINE_THICKNESS,
+      Graphic.DEFAULT_INTERIOR_OPACITY,
       getGraphicUuid(),
       WProperties.color2Hexadecimal(Graphic.DEFAULT_COLOR, true)
     };

diff --git a/...core/src/test/java/org/weasis/core/ui/model/graphic/imp/line/ParallelLineGraphicTest.java b/...core/src/test/java/org/weasis/core/ui/model/graphic/imp/line/ParallelLineGraphicTest.java
@@ -22,7 +22,7 @@ public class ParallelLineGraphicTest extends GraphicTester<ParallelLineGraphic>
   private static final String XML_1 = "/graphic/parallelLine/parallelLine.graphic.1.xml"; // NON-NLS
 
   static final String BASIC_TPL =
-      "<parallelLine fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" uuid=\"%s\">" // NON-NLS
+      "<parallelLine fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" insideOpacity=\"%s\" uuid=\"%s\">" // NON-NLS
           + "<paint rgb=\"%s\"/>" // NON-NLS
           + "<pts/>" // NON-NLS
           + "</parallelLine>"; // NON-NLS
@@ -56,6 +56,7 @@ public Object[] getParameters() {
       Graphic.DEFAULT_FILLED,
       Graphic.DEFAULT_LABEL_VISIBLE,
       Graphic.DEFAULT_LINE_THICKNESS,
+      Graphic.DEFAULT_INTERIOR_OPACITY,
       getGraphicUuid(),
       WProperties.color2Hexadecimal(Graphic.DEFAULT_COLOR, true)
     };

diff --git a/...src/test/java/org/weasis/core/ui/model/graphic/imp/line/PerpendicularLineGraphicTest.java b/...src/test/java/org/weasis/core/ui/model/graphic/imp/line/PerpendicularLineGraphicTest.java
@@ -23,7 +23,7 @@ public class PerpendicularLineGraphicTest extends GraphicTester<PerpendicularLin
       "/graphic/perpendicularLine/perpendicularLine.graphic.1.xml"; // NON-NLS
 
   static final String BASIC_TPL =
-      "<perpendicularLine fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" uuid=\"%s\">" // NON-NLS
+      "<perpendicularLine fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" insideOpacity=\"%s\" uuid=\"%s\">" // NON-NLS
           + "<paint rgb=\"%s\"/>" // NON-NLS
           + "<pts/>" // NON-NLS
           + "</perpendicularLine>"; // NON-NLS
@@ -53,6 +53,7 @@ public Object[] getParameters() {
       Graphic.DEFAULT_FILLED,
       Graphic.DEFAULT_LABEL_VISIBLE,
       Graphic.DEFAULT_LINE_THICKNESS,
+      Graphic.DEFAULT_INTERIOR_OPACITY,
       getGraphicUuid(),
       WProperties.color2Hexadecimal(Graphic.DEFAULT_COLOR, true)
     };

diff --git a/weasis-core/src/test/java/org/weasis/core/ui/model/graphic/imp/line/PolylineGraphicTest.java b/weasis-core/src/test/java/org/weasis/core/ui/model/graphic/imp/line/PolylineGraphicTest.java
@@ -21,7 +21,7 @@ public class PolylineGraphicTest extends GraphicTester<PolylineGraphic> {
   private static final String XML_1 = "/graphic/polyline/polyline.graphic.1.xml"; // NON-NLS
 
   static final String BASIC_TPL =
-      "<polyline fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" uuid=\"%s\">" // NON-NLS
+      "<polyline fill=\"%s\" showLabel=\"%s\" thickness=\"%s\" insideOpacity=\"%s\" uuid=\"%s\">" // NON-NLS
           + "<paint rgb=\"%s\"/>" // NON-NLS
           + "<pts/>" // NON-NLS
           + "</polyline>"; // NON-NLS
@@ -60,6 +60,7 @@ public Object[] getParameters() {
       Graphic.DEFAULT_FILLED,
       Graphic.DEFAULT_LABEL_VISIBLE,
       Graphic.DEFAULT_LINE_THICKNESS,
+      Graphic.DEFAULT_INTERIOR_OPACITY,
       getGraphicUuid(),
       WProperties.color2Hexadecimal(Graphic.DEFAULT_COLOR, true)
     };

diff --git a/weasis-core/src/test/java/org/weasis/core/ui/model/imp/suite/SerializationTest.java b/weasis-core/src/test/java/org/weasis/core/ui/model/imp/suite/SerializationTest.java
@@ -66,7 +66,7 @@ void test_add_one_point_graphic() throws Exception {
                 + "<layer level=\"40\" locked=\"false\" selectable=\"true\" type=\"DRAW\" visible=\"true\" uuid=\"%2$s\"/>" // NON-NLS
                 + "</layers>" // NON-NLS
                 + "<graphics>" // NON-NLS
-                + "<point pointSize=\"1\" fill=\"false\" showLabel=\"true\" thickness=\"3.0\" " // NON-NLS
+                + "<point pointSize=\"1\" fill=\"false\" showLabel=\"true\" thickness=\"3.0\" insideOpacity=\"1.0\" " // NON-NLS
                 + "uuid=\"%3$s\">" // NON-NLS
                 + "<paint rgb=\"ffff0000\"/>" // NON-NLS
                 + "<layer>%2$s</layer>" // NON-NLS