Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing BitmapEncoder.addFileExtension handling of uppercase extensions #858

Merged
merged 1 commit into from
Jun 5, 2024
Merged

Fixing BitmapEncoder.addFileExtension handling of uppercase extensions #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions xchart/src/main/java/org/knowm/xchart/BitmapEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,16 @@ private BitmapEncoder() {}
*/
public static String addFileExtension(String fileName, BitmapFormat bitmapFormat) {

String fileNameWithFileExtension = fileName;
final String newFileExtension = "." + bitmapFormat.toString().toLowerCase();
if (fileName.length() <= newFileExtension.length()
final String fileNameWithFileExtension;
if (fileName.length() < newFileExtension.length()
|| !fileName
.substring(fileName.length() - newFileExtension.length(), fileName.length())
.substring(fileName.length() - newFileExtension.length())
.equalsIgnoreCase(newFileExtension)) {
fileNameWithFileExtension = fileName + newFileExtension;
} else {
// This is to ensure the lower-case for the extension
fileNameWithFileExtension = fileName.substring(0, fileName.length() - newFileExtension.length()) + newFileExtension;
}
return fileNameWithFileExtension;
}
Expand Down
26 changes: 26 additions & 0 deletions xchart/src/test/java/org/knowm/xchart/BitmapEncoderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package org.knowm.xchart;

import org.junit.jupiter.api.Test;

import java.util.Arrays;

import static org.junit.jupiter.api.Assertions.assertEquals;


public class BitmapEncoderTest {

@Test
public void testAddFileExtension() {
String fileName1 = "image";
String fileName2 = "image.png";
String fileName3 = "image.PNG";

for (String s : Arrays.asList(fileName1, fileName2, fileName3)) {
assertEquals("image.png", BitmapEncoder.addFileExtension(s, BitmapEncoder.BitmapFormat.PNG));
}
assertEquals("z.bmp", BitmapEncoder.addFileExtension("z", BitmapEncoder.BitmapFormat.BMP));
assertEquals("asdf.bmp", BitmapEncoder.addFileExtension("asdf", BitmapEncoder.BitmapFormat.BMP));
assertEquals(".bmp", BitmapEncoder.addFileExtension(".bmp", BitmapEncoder.BitmapFormat.BMP));
assertEquals(".bmp", BitmapEncoder.addFileExtension(".BmP", BitmapEncoder.BitmapFormat.BMP));
}
}
Loading