Fix tests in org.eclipse.tips.tests

This partly fixes initial bugs in the tests (as they have never been executed in CI builds) and partly fixes regressions from eclipse-platform/eclipse.platform.ua#90.
eclipse-platform · Jan 22, 2024 · 1a27f15 · 1a27f15
1 parent c064002
commit 1a27f15
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 20 deletions.
diff --git a/ua/org.eclipse.tips.tests/src/org/eclipse/tips/core/TipProviderTest.java b/ua/org.eclipse.tips.tests/src/org/eclipse/tips/core/TipProviderTest.java
@@ -96,7 +96,7 @@ public void testGetCurrentTip2() {
 	public void testGetNextTip() {
 		createTestData();
 		fManager.setAsRead(fProvider.getNextTip());
-		assertEquals(fProvider.getCurrentTip(), fProvider.getNextTip());
+		assertNotEquals(fProvider.getCurrentTip(), fProvider.getNextTip());
 		Tip nextTip = fProvider.getNextTip();
 		fManager.setAsRead(nextTip);
 		assertTrue(fManager.isRead(nextTip));

diff --git a/ua/org.eclipse.tips.tests/src/org/eclipse/tips/core/TipTest.java b/ua/org.eclipse.tips.tests/src/org/eclipse/tips/core/TipTest.java
@@ -25,6 +25,7 @@
 import java.util.List;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class TipTest {
@@ -90,6 +91,7 @@ public void testGetHTML() {
 	}
 
 	@Test
+	@Ignore("Missing getImage() implementation in TestTip")
 	public void testGetImage() {
 		assertNotNull(fTip.getImage());
 	}
@@ -134,11 +136,11 @@ public String getID() {
 		assertNotEquals(testTipProvider3, testTipProvider);
 		TestTip testTip2 = new TestTip(fProvider.getID(), HTML, SUBJECT_TIP + "DDD");
 		assertNotEquals(testTip2, testTip);
-		assertNotEquals(testTip2, testTip);
+		assertNotEquals(testTip, testTip2);
 
 		TestTip testTip3 = new TestTip(fProvider.getID(), HTML, SUBJECT_TIP + "DDD");
 		assertNotEquals(testTip3, testTip);
-		assertNotEquals(testTip3, testTip3);
+		assertNotEquals(testTip, testTip3);
 
 		TestTip testTip4 = new TestTip(fProvider.getID(), HTML, SUBJECT_TIP + "DDD");
 		assertNotEquals(testTip4, testTip);

diff --git a/ua/org.eclipse.tips.tests/src/org/eclipse/tips/util/ImageUtilTest.java b/ua/org.eclipse.tips.tests/src/org/eclipse/tips/util/ImageUtilTest.java
@@ -25,24 +25,24 @@
 
 public class ImageUtilTest {
 
-	private static String fImageBase64 = """
-			iVBORw0KGgoAAAANSUhEUgAAACIAAAAkCAYAAADsHujfAAAAAXNSR0IArs4c6QAAAARnQU1BAACx
-			jwv8YQUAAAAJcEhZcwAAJOgAACToAYJjBRwAAAEcSURBVFhH7dZBCsIwEIXh3MkbuPJubtwI0kOIK
-			IJuddseo+eIPORBDZM0MyPaRQr/IiRtP9osEoa+j0uoQdKykPVtiLunPKdtcx/i9iHPMRECRDi+82K
-			A4LNKGBHCG5kVM0UgjKV1SITgxdMHIC1Gg0DZPeLBaBEoC0EWjAWBihCkwVgRaBaCajAeBKqCoBLGi0
-			DVECRhVtfPsQWBVBAkYZgVgdQQlPsy0traTJB0TzDuGUtqSA7BrBgVJEVgLP0mC6YaIiE49w1MFaSEYF
-			7MLKQGwTyYIkSDYFZMFmJBMAtGhHgQTIsRIdObLQiWYnAWltYhEYJDrhfBiCkhUHGz/rIGSWuQtAZJC+M
-			4xn93Ol9iiAu49oduKZAuvgC5R8NSTiN3qAAAAABJRU5ErkJggg==""";
+	private static String fImageBase64 = "" //
+			+ "iVBORw0KGgoAAAANSUhEUgAAACIAAAAkCAYAAADsHujfAAAAAXNSR0IArs4c6QAAAARnQU1BAACx"
+			+ "jwv8YQUAAAAJcEhZcwAAJOgAACToAYJjBRwAAAEcSURBVFhH7dZBCsIwEIXh3MkbuPJubtwI0kOIK"
+			+ "IJuddseo+eIPORBDZM0MyPaRQr/IiRtP9osEoa+j0uoQdKykPVtiLunPKdtcx/i9iHPMRECRDi+82K"
+			+ "A4LNKGBHCG5kVM0UgjKV1SITgxdMHIC1Gg0DZPeLBaBEoC0EWjAWBihCkwVgRaBaCajAeBKqCoBLGi0"
+			+ "DVECRhVtfPsQWBVBAkYZgVgdQQlPsy0traTJB0TzDuGUtqSA7BrBgVJEVgLP0mC6YaIiE49w1MFaSEYF"
+			+ "7MLKQGwTyYIkSDYFZMFmJBMAtGhHgQTIsRIdObLQiWYnAWltYhEYJDrhfBiCkhUHGz/rIGSWuQtAZJC+M"
+			+ "4xn93Ol9iiAu49oduKZAuvgC5R8NSTiN3qAAAAABJRU5ErkJggg==";
 
-	private static String fImageBase64HTML = """
-			data:image/png;base64,
-			iVBORw0KGgoAAAANSUhEUgAAACIAAAAkCAYAAADsHujfAAAAAXNSR0IArs4c6QAAAARnQU1BAACx
-			jwv8YQUAAAAJcEhZcwAAJOgAACToAYJjBRwAAAEcSURBVFhH7dZBCsIwEIXh3MkbuPJubtwI0kOIK
-			IJuddseo+eIPORBDZM0MyPaRQr/IiRtP9osEoa+j0uoQdKykPVtiLunPKdtcx/i9iHPMRECRDi+82K
-			A4LNKGBHCG5kVM0UgjKV1SITgxdMHIC1Gg0DZPeLBaBEoC0EWjAWBihCkwVgRaBaCajAeBKqCoBLGi0
-			DVECRhVtfPsQWBVBAkYZgVgdQQlPsy0traTJB0TzDuGUtqSA7BrBgVJEVgLP0mC6YaIiE49w1MFaSEYF
-			7MLKQGwTyYIkSDYFZMFmJBMAtGhHgQTIsRIdObLQiWYnAWltYhEYJDrhfBiCkhUHGz/rIGSWuQtAZJC+M
-			4xn93Ol9iiAu49oduKZAuvgC5R8NSTiN3qAAAAABJRU5ErkJggg==""";
+	private static String fImageBase64HTML = "" //
+			+ "data:image/png;base64,"
+			+ "iVBORw0KGgoAAAANSUhEUgAAACIAAAAkCAYAAADsHujfAAAAAXNSR0IArs4c6QAAAARnQU1BAACx"
+			+ "jwv8YQUAAAAJcEhZcwAAJOgAACToAYJjBRwAAAEcSURBVFhH7dZBCsIwEIXh3MkbuPJubtwI0kOIK"
+			+ "IJuddseo+eIPORBDZM0MyPaRQr/IiRtP9osEoa+j0uoQdKykPVtiLunPKdtcx/i9iHPMRECRDi+82K"
+			+ "A4LNKGBHCG5kVM0UgjKV1SITgxdMHIC1Gg0DZPeLBaBEoC0EWjAWBihCkwVgRaBaCajAeBKqCoBLGi0"
+			+ "DVECRhVtfPsQWBVBAkYZgVgdQQlPsy0traTJB0TzDuGUtqSA7BrBgVJEVgLP0mC6YaIiE49w1MFaSEYF"
+			+ "7MLKQGwTyYIkSDYFZMFmJBMAtGhHgQTIsRIdObLQiWYnAWltYhEYJDrhfBiCkhUHGz/rIGSWuQtAZJC+M"
+			+ "4xn93Ol9iiAu49oduKZAuvgC5R8NSTiN3qAAAAABJRU5ErkJggg==";
 
 	@Test
 	public void decodeImageToBase64Test() throws IOException {