Repair and execute Swing FormLayout tests

org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/model/FormLayoutInfo.java

@@ -61,7 +61,7 @@
 import com.jgoodies.forms.layout.FormSpec;
 import com.jgoodies.forms.layout.FormSpecs;
 import com.jgoodies.forms.layout.RowSpec;
-import com.jgoodies.forms.util.DefaultUnitConverter;
+import com.jgoodies.forms.util.UnitConverter;
 
 import org.apache.commons.collections4.BidiMap;
 import org.apache.commons.collections4.bidimap.DualHashBidiMap;
@@ -1440,7 +1440,7 @@ protected void refresh_afterCreate2() throws Exception {
 		}
 		// initialize default sizes in pixels
 		{
-			DefaultUnitConverter converter = DefaultUnitConverter.getInstance();
+			UnitConverter converter = FormSizeConstantInfo.getUnitConverter();
 			//
 			m_defaultColumnSize = converter.millimeterAsPixel(DEFAULT_SIZE, container);
 			m_defaultRowSize = converter.millimeterAsPixel(DEFAULT_SIZE, container);

org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/model/FormSizeConstantInfo.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2025 Google, Inc. and others.
+ * Copyright (c) 2011, 2026 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -26,6 +26,7 @@
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.Locale;
+import java.util.Objects;
 
 import javax.swing.JFrame;
 
@@ -36,6 +37,7 @@
  * @coverage swing.FormLayout.model
  */
 public final class FormSizeConstantInfo {
+	private static UnitConverter m_unitConverter = DefaultUnitConverter.getInstance();
 	private double m_value;
 	private Unit m_unit;
 
@@ -112,6 +114,20 @@ public void setUnit(Unit unit) throws Exception {
 		m_unit = unit;
 	}
 
+	/**
+	 * @return the {@link UnitConverter}
+	 */
+	public static UnitConverter getUnitConverter() {
+		return m_unitConverter;
+	}
+
+	/**
+	 * Sets the {@link UnitConverter}.
+	 */
+	public static void setUnitConverter(UnitConverter unitConverter) {
+		m_unitConverter = Objects.requireNonNull(unitConverter);
+	}
+
 	////////////////////////////////////////////////////////////////////////////
 	//
 	// Object
@@ -182,7 +198,7 @@ private static double convertValue(double value, Unit oldUnit, Unit newUnit) thr
 	 * @return the value in pixels for value in given {@link Unit}.
 	 */
 	public static int convertToPixels(double value, Unit unit) {
-		UnitConverter converter = DefaultUnitConverter.getInstance();
+		UnitConverter converter = getUnitConverter();
 		//
 		int pixels = 0;
 		if (unit == ConstantSize.PIXEL) {
@@ -231,7 +247,7 @@ public static double convertFromPixels(int pixels, Unit unit) throws Exception {
 	 *         in pixels.
 	 */
 	private static int convertFromPixelsInt(int pixels, String methodName) throws Exception {
-		UnitConverter converter = DefaultUnitConverter.getInstance();
+		UnitConverter converter = getUnitConverter();
 		Method method =
 				UnitConverter.class.getMethod(methodName, new Class[]{int.class, Component.class});
 		int result = 0;
@@ -251,7 +267,7 @@ private static int convertFromPixelsInt(int pixels, String methodName) throws Ex
 	 *         in pixels.
 	 */
 	private static double convertFromPixelsDouble(int pixels, String methodName) throws Exception {
-		UnitConverter converter = DefaultUnitConverter.getInstance();
+		UnitConverter converter = getUnitConverter();
 		Method method =
 				UnitConverter.class.getMethod(methodName, new Class[]{double.class, Component.class});
 		double result = 0;

org.eclipse.wb.tests/META-INF/MANIFEST.MF

@@ -148,8 +148,10 @@ Export-Package: org.eclipse.wb.tests.designer;x-internal:=true,
  org.eclipse.wb.tests.draw2d;x-internal:=true,
  org.eclipse.wb.tests.gef;x-internal:=true,
  org.eclipse.wb.tests.utils;x-internal:=true
-Import-Package: com.jgoodies.forms.factories;version="[1.9.0,2.0.0]",
+Import-Package: com.jgoodies.common.bean;version="[1.8.1,2.0.0)",
+ com.jgoodies.forms.factories;version="[1.9.0,2.0.0]",
  com.jgoodies.forms.layout;version="[1.9.0,2.0.0]",
+ com.jgoodies.forms.util;version="[1.9.0,2.0.0)",
  net.miginfocom.layout;version="[11.3.0,12.0.0]",
  net.miginfocom.swing;version="[11.3.0,12.0.0]",
  org.apache.commons.collections4;version="[4.4.0,5.0.0)",

org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/AbstractFormLayoutTest.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2024 Google, Inc.
+ * Copyright (c) 2011, 2026 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -13,13 +13,21 @@
 package org.eclipse.wb.tests.designer.swing.model.layout.FormLayout;
 
 import org.eclipse.wb.internal.core.utils.jdt.core.CodeUtils;
+import org.eclipse.wb.internal.swing.FormLayout.model.FormSizeConstantInfo;
 import org.eclipse.wb.internal.swing.laf.LafSupport;
 import org.eclipse.wb.tests.designer.swing.model.layout.AbstractLayoutTest;
 
 import com.jgoodies.forms.layout.FormLayout;
+import com.jgoodies.forms.layout.Sizes;
+import com.jgoodies.forms.util.AbstractUnitConverter;
+import com.jgoodies.forms.util.DefaultUnitConverter;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 
+import java.awt.Component;
+
 /**
  * Abstract test for {@link FormLayout}.
  *
@@ -33,6 +41,18 @@ public abstract class AbstractFormLayoutTest extends AbstractLayoutTest {
 	// Life cycle
 	//
 	////////////////////////////////////////////////////////////////////////////
+	@BeforeAll
+	public static void setUpUnitConverter() {
+		FormSizeConstantInfo.setUnitConverter(new UnitConverterStub());
+		Sizes.setUnitConverter(new UnitConverterStub());
+	}
+
+	@AfterAll
+	public static void tearDownUnitConverter() {
+		Sizes.setUnitConverter(DefaultUnitConverter.getInstance());
+		FormSizeConstantInfo.setUnitConverter(DefaultUnitConverter.getInstance());
+	}
+
 	@Override
 	@BeforeEach
 	public void setUp() throws Exception {
@@ -66,4 +86,23 @@ public String getTestSource(String... lines) {
 		}
 		return super.getTestSource(lines);
 	}
+
+	private static class UnitConverterStub extends AbstractUnitConverter {
+		private static final long serialVersionUID = 1L;
+
+		@Override
+		protected double getDialogBaseUnitsX(Component component) {
+			return 6;
+		}
+
+		@Override
+		protected double getDialogBaseUnitsY(Component component) {
+			return 12;
+		}
+
+		@Override
+		protected int getScreenResolution(Component c) {
+			return 96;
+		}
+	}
 }

org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swing/model/layout/FormLayout/CellConstraintsSupportTest.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2025 Google, Inc. and others.
+ * Copyright (c) 2011, 2026 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -53,23 +53,22 @@ public void setUp() throws Exception {
 		super.setUp();
 		//
 		if (m_testProject != null) {
-			m_panel =
-					parseContainer(
-							"public class Test extends JPanel {",
-							"  public Test() {",
-							"    setLayout(new FormLayout(new ColumnSpec[] {",
-							"        FormSpecs.RELATED_GAP_COLSPEC,",
-							"        FormSpecs.DEFAULT_COLSPEC,},",
-							"      new RowSpec[] {",
-							"        FormSpecs.RELATED_GAP_ROWSPEC,",
-							"        FormSpecs.DEFAULT_ROWSPEC,",
-							"        FormSpecs.DEFAULT_ROWSPEC,}));",
-							"    {",
-							"      JButton button = new JButton();",
-							"      add(button, '1, 2');",
-							"    }",
-							"  }",
-							"}");
+			m_panel = parseContainer("""
+					public class Test extends JPanel {
+						public Test() {
+							setLayout(new FormLayout(new ColumnSpec[] {
+									FormSpecs.RELATED_GAP_COLSPEC,
+									FormSpecs.DEFAULT_COLSPEC,},
+								new RowSpec[] {
+									FormSpecs.RELATED_GAP_ROWSPEC,
+									FormSpecs.DEFAULT_ROWSPEC,
+									FormSpecs.DEFAULT_ROWSPEC,}));
+							{
+								JButton button = new JButton();
+								add(button, "1, 2");
+							}
+						}
+					}""");
 			m_panel.refresh();
 			//
 			m_button = m_panel.getChildrenComponents().get(0);