diff --git a/java/compiler/forms-compiler/forms-compiler.iml b/java/compiler/forms-compiler/forms-compiler.iml
index 7b957e27ad00..184ae5b4f830 100644
--- a/java/compiler/forms-compiler/forms-compiler.iml
+++ b/java/compiler/forms-compiler/forms-compiler.iml
@@ -14,6 +14,7 @@
+
+
-
-
+
\ No newline at end of file
diff --git a/java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/TextAreasTest.java b/java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/TextAreasTest.java
index 7fa442fdf9e3..5beba84081e2 100644
--- a/java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/TextAreasTest.java
+++ b/java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/TextAreasTest.java
@@ -15,18 +15,35 @@
*/
package com.intellij.uiDesigner.core;
-import junit.framework.TestCase;
+import com.intellij.openapi.Disposable;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.util.Disposer;
+import com.intellij.testFramework.TestLoggerFactory;
+import com.intellij.testFramework.UsefulTestCase;
+import junit.framework.AssertionFailedError;
import javax.swing.*;
import java.awt.*;
-public final class TextAreasTest extends TestCase{
+public final class TextAreasTest extends UsefulTestCase {
+ {
+ Logger.setFactory(TestLoggerFactory.class);
+ TestLoggerFactory.enableDebugLogging(myTestRootDisposable,
+ new String[]{"#com.intellij.uiDesigner.core.GridLayoutManager"});
+ }
+ private final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.core.TextAreasTest");
+
+ private String getTestStartedLogMessage(String testName) {
+ return "Starting " + getClass().getName() + "." + testName;
+ }
+
/**
* label | label
* text area (span 2)
- */
-
+ */
public void test1() {
+ LOG.info(getTestStartedLogMessage("test1"));
+
final JPanel panel = new JPanel(new GridLayoutManager(2,2, new Insets(0,0,0,0), 0, 0));
final JLabel label1 = new JLabel();
@@ -46,7 +63,17 @@ public final class TextAreasTest extends TestCase{
GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW,
GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0));
- assertEquals(100, textArea.getPreferredSize().width);
+ LOG.info("textArea: " + textArea.toString());
+ LOG.info("LaF: " + UIManager.getLookAndFeel());
+ LOG.info("textArea.font: " + textArea.getFont());
+ LOG.info("UIDefaults: " + UIManager.getLookAndFeelDefaults());
+
+ try {
+ assertEquals(100, textArea.getPreferredSize().width);
+ } catch (AssertionFailedError e) {
+ TestLoggerFactory.dumpLogToStdout(getTestStartedLogMessage("test1"));
+ throw e;
+ }
final Dimension initialPreferredSize = panel.getPreferredSize();
assertEquals(new Dimension(100,20 + textArea.getPreferredSize().height), initialPreferredSize);
diff --git a/platform/forms_rt/forms_rt.iml b/platform/forms_rt/forms_rt.iml
index be013ac70f9f..b304eaacbdbb 100644
--- a/platform/forms_rt/forms_rt.iml
+++ b/platform/forms_rt/forms_rt.iml
@@ -7,6 +7,7 @@
+
@@ -160,5 +161,4 @@
-
-
+
\ No newline at end of file