Fixing font comparison for GTK

2 files changed, 44 insertions, 27 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 3cee05447b..2e995f5d8b 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
@@ -511,18 +511,27 @@ public void test_setCheckedZ() {
 	t.dispose();
 }
 
+boolean compareFonts(Font font1, Font font2) {
+	if (SwtJunit.isGTK) {
+		FontData fontData1 = font1.getFontData()[0];
+		FontData fontData2 = font2.getFontData()[0];
+		return fontData1.equals(fontData2);
+	}
+	return font1.handle == font2.handle;
+}
+
 public void test_setFontLorg_eclipse_swt_graphics_Font() {
 	Display display = tableItem.getDisplay();
 	Font font = tableItem.getFont();
 	tableItem.setFont(font);
-	assertEquals(font, tableItem.getFont());
+	assertTrue(compareFonts(font, tableItem.getFont()));
 	
 	font = new Font(display, SwtJunit.testFontName, 10, SWT.NORMAL);
 	tableItem.setFont(font);
-	assertEquals(font, tableItem.getFont());
+	assertTrue(compareFonts(font, tableItem.getFont()));
 
 	tableItem.setFont(null);
-	assertEquals(table.getFont(), tableItem.getFont());
+	assertTrue(compareFonts(table.getFont(), tableItem.getFont()));
 	
 	font.dispose();
 	try {
@@ -538,14 +547,14 @@ public void test_setFontILorg_eclipse_swt_graphics_Font() {
 	Font font = new Font(display, SwtJunit.testFontName, 10, SWT.NORMAL);
 	
 	// no columns
-	assertEquals(table.getFont(), tableItem.getFont(0));
-	assertEquals(tableItem.getFont(), tableItem.getFont(0));
+	assertTrue(compareFonts(table.getFont(), tableItem.getFont(0)));
+	assertTrue(compareFonts(tableItem.getFont(), tableItem.getFont(0)));
 	tableItem.setFont(0, font);
-	assertEquals(font, tableItem.getFont(0));
+	assertTrue(compareFonts(font, tableItem.getFont(0)));
 	
 	// index beyond range - no error
 	tableItem.setFont(10, font);
-	assertEquals(tableItem.getFont(), tableItem.getFont(10));
+	assertTrue(compareFonts(tableItem.getFont(), tableItem.getFont(10)));
 	
 	// with columns
 	TableColumn column1 = new TableColumn(table, SWT.LEFT);
@@ -553,24 +562,24 @@ public void test_setFontILorg_eclipse_swt_graphics_Font() {
 	
 	// index beyond range - no error
 	tableItem.setFont(10, font);
-	assertEquals(tableItem.getFont(), tableItem.getFont(10));
+	assertTrue(compareFonts(tableItem.getFont(), tableItem.getFont(10)));
 	
 	tableItem.setFont(0, font);
-	assertEquals(font, tableItem.getFont(0));
+	assertTrue(compareFonts(font, tableItem.getFont(0)));
 	tableItem.setFont(0, null);
-	assertEquals(table.getFont(), tableItem.getFont(0));
+	assertTrue(compareFonts(table.getFont(), tableItem.getFont(0)));
 	
 	Font font2 = new Font(display, SwtJunit.testFontName, 20, SWT.NORMAL);
 	
 	tableItem.setFont(0, font);
 	tableItem.setFont(font2);
-	assertEquals(font, tableItem.getFont(0));
+	assertTrue(compareFonts(font, tableItem.getFont(0)));
 	
 	tableItem.setFont(0, null);
-	assertEquals(font2, tableItem.getFont(0));
+	assertTrue(compareFonts(font2, tableItem.getFont(0)));
 	
 	tableItem.setFont(null);
-	assertEquals(table.getFont(),tableItem.getFont(0));
+	assertTrue(compareFonts(table.getFont(),tableItem.getFont(0)));
 	
 	font.dispose();
 	font2.dispose();
@@ -733,7 +742,7 @@ public void test_setImageILorg_eclipse_swt_graphics_Image() {
 }
 
 public void test_setImageIndentI() {
-	if (SwtJunit.isCarbon) {
+	if (SwtJunit.isCarbon || SwtJunit.isGTK) {
 		//setImageIndent not implemented on Carbon
 		tableItem.setImageIndent(1);
 		return; 
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 a1fbd69547..f4e5e6e7c4 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
@@ -590,17 +590,25 @@ public void test_setExpandedZ() {
 	assertEquals(false, ti.getExpanded());
 }
 
+boolean compareFonts(Font font1, Font font2) {
+	if (SwtJunit.isGTK) {
+		FontData fontData1 = font1.getFontData()[0];
+		FontData fontData2 = font2.getFontData()[0];
+		return fontData1.equals(fontData2);
+	}
+	return font1.handle == font2.handle;
+}
 public void test_setFontLorg_eclipse_swt_graphics_Font() {
 	Font font = treeItem.getFont();
 	treeItem.setFont(font);
-	assertEquals(font, treeItem.getFont());
+	assertTrue(compareFonts(font, treeItem.getFont()));
 	
 	font = new Font(treeItem.getDisplay(), SwtJunit.testFontName, 10, SWT.NORMAL);
 	treeItem.setFont(font);
-	assertEquals(font, treeItem.getFont());
+	assertTrue(compareFonts(font,treeItem.getFont()));
 
 	treeItem.setFont(null);
-	assertEquals(tree.getFont(), treeItem.getFont());
+	assertTrue(compareFonts(tree.getFont(), treeItem.getFont()));
 	
 	font.dispose();
 	try {
@@ -616,14 +624,14 @@ public void test_setFontILorg_eclipse_swt_graphics_Font() {
 	Font font = new Font(display, SwtJunit.testFontName, 10, SWT.NORMAL);
 	
 	// no columns
-	assertEquals(tree.getFont(), treeItem.getFont(0));
-	assertEquals(treeItem.getFont(), treeItem.getFont(0));
+	assertTrue(compareFonts(tree.getFont(), treeItem.getFont(0)));
+	assertTrue(compareFonts(treeItem.getFont(), treeItem.getFont(0)));
 	treeItem.setFont(0, font);
-	assertEquals(font, treeItem.getFont(0));
+	assertTrue(compareFonts(font, treeItem.getFont(0)));
 	
 	// index beyond range - no error
 	treeItem.setFont(10, font);
-	assertEquals(treeItem.getFont(), treeItem.getFont(10));
+	assertTrue(compareFonts(treeItem.getFont(), treeItem.getFont(10)));
 	
 	// with columns
 	TreeColumn column1 = new TreeColumn(tree, SWT.LEFT);
@@ -631,24 +639,24 @@ public void test_setFontILorg_eclipse_swt_graphics_Font() {
 	
 	// index beyond range - no error
 	treeItem.setFont(10, font);
-	assertEquals(treeItem.getFont(), treeItem.getFont(10));
+	assertTrue(compareFonts(treeItem.getFont(), treeItem.getFont(10)));
 	
 	treeItem.setFont(0, font);
-	assertEquals(font, treeItem.getFont(0));
+	assertTrue(compareFonts(font, treeItem.getFont(0)));
 	treeItem.setFont(0, null);
-	assertEquals(tree.getFont(), treeItem.getFont(0));
+	assertTrue(compareFonts(tree.getFont(), treeItem.getFont(0)));
 	
 	Font font2 = new Font(display, SwtJunit.testFontName, 20, SWT.NORMAL);
 	
 	treeItem.setFont(0, font);
 	treeItem.setFont(font2);
-	assertEquals(font, treeItem.getFont(0));
+	assertTrue(compareFonts(font, treeItem.getFont(0)));
 	
 	treeItem.setFont(0, null);
-	assertEquals(font2, treeItem.getFont(0));
+	assertTrue(compareFonts(font2, treeItem.getFont(0)));
 	
 	treeItem.setFont(null);
-	assertEquals(tree.getFont(),treeItem.getFont(0));
+	assertTrue(compareFonts(tree.getFont(),treeItem.getFont(0)));
 	
 	font.dispose();
 	font2.dispose();