diff options
| author | Veronika Irvine | 2005-01-07 16:50:33 +0000 |
|---|---|---|
| committer | Veronika Irvine | 2005-01-07 16:50:33 +0000 |
| commit | 5689d8e849bba9fa425a7586a442195ae623d46c (patch) | |
| tree | 18bf650a84712a8a1d7262991a27d790e321604d /tests | |
| parent | ce30ea75cad37472e50a9581ebd6325715c7e4aa (diff) | |
| download | eclipse.platform.swt-5689d8e849bba9fa425a7586a442195ae623d46c.tar.gz eclipse.platform.swt-5689d8e849bba9fa425a7586a442195ae623d46c.tar.xz eclipse.platform.swt-5689d8e849bba9fa425a7586a442195ae623d46c.zip | |
improve font comparison
Diffstat (limited to 'tests')
2 files changed, 15 insertions, 6 deletions
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TableItem.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TableItem.java index 2e995f5d8b..5be6b22601 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TableItem.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TableItem.java @@ -513,9 +513,13 @@ public void test_setCheckedZ() { boolean compareFonts(Font font1, Font font2) { if (SwtJunit.isGTK) { - FontData fontData1 = font1.getFontData()[0]; - FontData fontData2 = font2.getFontData()[0]; - return fontData1.equals(fontData2); + FontData[] fontData1 = font1.getFontData(); + FontData[] fontData2 = font2.getFontData(); + if (fontData1.length != fontData2.length) return false; + for (int i = 0; i < fontData1.length; i++) { + if (!fontData1[i].equals(fontData2[i])) return false; + }; + return true; } return font1.handle == font2.handle; } diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TreeItem.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TreeItem.java index f4e5e6e7c4..ec7bea041e 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TreeItem.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TreeItem.java @@ -592,12 +592,17 @@ public void test_setExpandedZ() { boolean compareFonts(Font font1, Font font2) { if (SwtJunit.isGTK) { - FontData fontData1 = font1.getFontData()[0]; - FontData fontData2 = font2.getFontData()[0]; - return fontData1.equals(fontData2); + FontData[] fontData1 = font1.getFontData(); + FontData[] fontData2 = font2.getFontData(); + if (fontData1.length != fontData2.length) return false; + for (int i = 0; i < fontData1.length; i++) { + if (!fontData1[i].equals(fontData2[i])) return false; + }; + return true; } return font1.handle == font2.handle; } + public void test_setFontLorg_eclipse_swt_graphics_Font() { Font font = treeItem.getFont(); treeItem.setFont(font); |