OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-14 12:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[JENKINS-68137] Enable custom icon symbols for plugins (#6395)

Browse Source 
Co-authored-by: Ullrich Hafner <ullrich.hafner@gmail.com>
Co-authored-by: Tim Jacomb <timjacomb1+github@gmail.com>
This commit is contained in:
Jan FaracikUllrich HafnerTim Jacomb
 authored and GitHub committed 2022-03-28 21:52:43 -07:00
1 parent 2716b07124
commit 04887f08ce
8 files changed
+87 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/test/java/hudson/FunctionsTest.java
+30
View File
@@ -25,6 +25,8 @@
package hudson;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.emptyString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -369,6 +371,34 @@ public class FunctionsTest {
assertEquals("&lt;discarded/&gt;\n", Functions.printLogRecordHtml(lr, null)[3]);
}
@Test
public void extractPluginNameFromIconSrcHandlesNull() {
String result = Functions.extractPluginNameFromIconSrc(null);
assertThat(result, is(emptyString()));
}
@Test
public void extractPluginNameFromIconSrcHandlesEmptyString() {
String result = Functions.extractPluginNameFromIconSrc("");
assertThat(result, is(emptyString()));
}
@Test
public void extractPluginNameFromIconSrcOnlyReturnsPluginFromStart() {
String result = Functions.extractPluginNameFromIconSrc("symbol-plugin-mailer plugin-design-library");
assertThat(result, is(equalTo("design-library")));
}
@Test
public void extractPluginNameFromIconSrcExtractsPlugin() {
String result = Functions.extractPluginNameFromIconSrc("symbol-padlock plugin-design-library");
assertThat(result, is(equalTo("design-library")));
}
@Issue("JDK-6507809")
@Test public void printThrowable() {
// Basics: a single exception. No change.
core/src/test/java/org/jenkins/ui/icon/IconSetTest.java
+6 -6
View File
@@ -21,7 +21,7 @@ public class IconSetTest {
@Test
void getSymbol() {
String symbol = IconSet.getSymbol("download", "Title", "Tooltip", "class1 class2");
String symbol = IconSet.getSymbol("download", "Title", "Tooltip", "class1 class2", "");
assertThat(symbol, containsString("<span class=\"jenkins-visually-hidden\">Title</span>"));
assertThat(symbol, containsString("tooltip=\"Tooltip\""));
@@ -30,8 +30,8 @@ public class IconSetTest {
@Test
void getSymbol_cachedSymbolDoesntReturnAttributes() {
IconSet.getSymbol("download", "Title", "Tooltip", "class1 class2");
String symbol = IconSet.getSymbol("download", "", "", "");
IconSet.getSymbol("download", "Title", "Tooltip", "class1 class2", "");
String symbol = IconSet.getSymbol("download", "", "", "", "");
assertThat(symbol, not(containsString("<span class=\"jenkins-visually-hidden\">Title</span>")));
assertThat(symbol, not(containsString("tooltip=\"Tooltip\"")));
@@ -40,8 +40,8 @@ public class IconSetTest {
@Test
void getSymbol_cachedSymbolAllowsSettingAllAttributes() {
IconSet.getSymbol("download", "Title", "Tooltip", "class1 class2");
String symbol = IconSet.getSymbol("download", "Title2", "Tooltip2", "class3 class4");
IconSet.getSymbol("download", "Title", "Tooltip", "class1 class2", "");
String symbol = IconSet.getSymbol("download", "Title2", "Tooltip2", "class3 class4", "");
assertThat(symbol, not(containsString("<span class=\"jenkins-visually-hidden\">Title</span>")));
assertThat(symbol, not(containsString("tooltip=\"Tooltip\"")));
@@ -57,7 +57,7 @@ public class IconSetTest {
*/
@Test
void getSymbol_notSettingTooltipDoesntAddTooltipAttribute() {
String symbol = IconSet.getSymbol("download", "Title", "", "class1 class2");
String symbol = IconSet.getSymbol("download", "Title", "", "class1 class2", "");
assertThat(symbol, not(containsString("tooltip")));
}