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

fix GlobalTemplateVariablesDateTest #2649 #2652

Merged
merged 2 commits into from
Jan 2, 2025
Merged

fix GlobalTemplateVariablesDateTest #2649 #2652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e4872d
fix GlobalTemplateVariablesDateTest #2649
jukzi Jan 2, 2025
1099509
Version bump(s) for 4.35 stream
eclipse-platform-bot Jan 2, 2025
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
2 changes: 1 addition & 1 deletion tests/org.eclipse.text.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.text.tests
Bundle-Version: 3.14.700.qualifier
Bundle-Version: 3.14.800.qualifier
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
Export-Package:
Expand Down
31 changes: 20 additions & 11 deletions ...ipse.text.tests/src/org/eclipse/text/tests/templates/GlobalTemplateVariablesDateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,40 +64,42 @@ public void testWithoutParameter() throws Exception {

@Test
public void testOneParameter() throws Exception {
TemplateBuffer buffer= fTranslator.translate("This format ${d:date('dd MMM YYYY')} and not ${p:date('YYYY-MM-dd')}");
TemplateBuffer buffer = fTranslator
.translate("This format ${d:date('dd MMM yyyy')} and not ${p:date('yyyy-MM-dd')}");
fType.resolve(buffer, fContext);

StringBuilder expected= new StringBuilder();
expected.append("This format ");
expected.append(new SimpleDateFormat("dd MMM YYYY").format(new java.util.Date()));
expected.append(new SimpleDateFormat("dd MMM yyyy").format(new java.util.Date()));
expected.append(" and not ");
expected.append(new SimpleDateFormat("YYYY-MM-dd").format(new java.util.Date()));
expected.append(new SimpleDateFormat("yyyy-MM-dd").format(new java.util.Date()));
assertBufferStringAndVariables(expected.toString(), buffer);
}

@Test
public void testSimpleLocale() throws Exception {
TemplateBuffer buffer= fTranslator.translate("From ${d:date('dd MMM YYYY', 'fr')} to ${d}");
TemplateBuffer buffer = fTranslator.translate("From ${d:date('dd MMM yyyy', 'fr')} to ${d}");
fType.resolve(buffer, fContext);

StringBuilder expected= new StringBuilder();
expected.append("From ");
expected.append(new SimpleDateFormat("dd MMM YYYY", Locale.FRENCH).format(new java.util.Date()));
expected.append(new SimpleDateFormat("dd MMM yyyy", Locale.FRENCH).format(new java.util.Date()));
expected.append(" to ");
expected.append(new SimpleDateFormat("dd MMM YYYY", Locale.FRENCH).format(new java.util.Date()));
expected.append(new SimpleDateFormat("dd MMM yyyy", Locale.FRENCH).format(new java.util.Date()));
assertBufferStringAndVariables(expected.toString(), buffer);
}

@Test
public void testComplexLocale() throws Exception {
TemplateBuffer buffer= fTranslator.translate("France ${d:date('EEEE dd MMMM YYYY', 'fr_FR')} and Germany ${p:date('EEEE dd. MMMM YYYY', 'de_DE')}");
TemplateBuffer buffer = fTranslator.translate(
"France ${d:date('EEEE dd MMMM yyyy', 'fr_FR')} and Germany ${p:date('EEEE dd. MMMM yyyy', 'de_DE')}");
fType.resolve(buffer, fContext);

StringBuilder expected= new StringBuilder();
expected.append("France ");
expected.append(new SimpleDateFormat("EEEE dd MMMM YYYY", Locale.FRANCE).format(new java.util.Date()));
expected.append(new SimpleDateFormat("EEEE dd MMMM yyyy", Locale.FRANCE).format(new java.util.Date()));
expected.append(" and Germany ");
expected.append(new SimpleDateFormat("EEEE dd. MMMM YYYY", Locale.GERMANY).format(new java.util.Date()));
expected.append(new SimpleDateFormat("EEEE dd. MMMM yyyy", Locale.GERMANY).format(new java.util.Date()));
assertBufferStringAndVariables(expected.toString(), buffer);
}

Expand All @@ -115,13 +117,20 @@ public void testInvalidDateFormat() throws Exception {

@Test
public void testInvalidLocale() throws Exception {
TemplateBuffer buffer= fTranslator.translate("Today is ${d:date('YYYY-MM-dd', 'this_invalid_locale')}!");
@SuppressWarnings("deprecation")
java.util.Date problemDate = new java.util.Date(2024 - 1900, 12 - 1, 29);
assertEquals("2024-12-29",
new SimpleDateFormat("yyyy-MM-dd", Locale.GERMAN)
.format(problemDate).toString());
assertEquals("2025-12-29", new SimpleDateFormat("YYYY-MM-dd", Locale.GERMAN)
.format(problemDate).toString());
TemplateBuffer buffer = fTranslator.translate("Today is ${d:date('yyyy-MM-dd', 'this_invalid_locale')}!");
fType.resolve(buffer, fContext);

StringBuilder expected= new StringBuilder();
expected.append("Today is ");
expected.append(
new SimpleDateFormat("YYYY-MM-dd", new Locale("this_invalid_locale")).format(new java.util.Date()));
new SimpleDateFormat("yyyy-MM-dd", new Locale("this_invalid_locale")).format(new java.util.Date()));
expected.append("!");
assertBufferStringAndVariables(expected.toString(), buffer);
}
Expand Down
Loading