@@ -76,39 +76,38 @@ public void translationFileOnClasspath_instantiateDefaultI18N()
7676
7777 createTranslationFiles (translations );
7878
79- try (MockedStatic <I18NUtil > util = Mockito .mockStatic (I18NUtil .class ,
80- Mockito .CALLS_REAL_METHODS )) {
81- util .when (() -> I18NUtil .getClassLoader ())
82- .thenReturn (urlClassLoader );
83-
84- VaadinService service = Mockito .mock (VaadinService .class );
85- mockLookup (service );
86-
87- I18NProvider i18NProvider = new DefaultInstantiator (service )
88- .getI18NProvider ();
89- Assert .assertNotNull (i18NProvider );
90- Assert .assertTrue (i18NProvider instanceof DefaultI18NProvider );
91-
92- Assert .assertEquals ("Suomi" , i18NProvider .getTranslation ("title" ,
93- new Locale ("fi" , "FI" )));
94-
95- Assert .assertEquals ("deutsch" ,
96- i18NProvider .getTranslation ("title" , new Locale ("de" )));
97-
98- Assert .assertEquals (
99- "non existing country should select language bundle" ,
100- "deutsch" , i18NProvider .getTranslation ("title" ,
101- new Locale ("de" , "AT" )));
102-
103- Assert .assertEquals ("Korean" , i18NProvider .getTranslation ("title" ,
104- new Locale ("ko" , "KR" )));
105-
106- // Note!
107- // default translations.properties will be used if
108- // the locale AND system default locale is not found
109- Assert .assertEquals ("Default lang" , i18NProvider
110- .getTranslation ("title" , new Locale ("en" , "GB" )));
111- }
79+ VaadinService service = Mockito .mock (VaadinService .class );
80+ mockLookup (service );
81+
82+ DefaultInstantiator defaultInstantiator = new DefaultInstantiator (
83+ service ) {
84+ @ Override
85+ protected ClassLoader getClassLoader () {
86+ return urlClassLoader ;
87+ }
88+ };
89+ I18NProvider i18NProvider = defaultInstantiator .getI18NProvider ();
90+ Assert .assertNotNull (i18NProvider );
91+ Assert .assertTrue (i18NProvider instanceof DefaultI18NProvider );
92+
93+ Assert .assertEquals ("Suomi" ,
94+ i18NProvider .getTranslation ("title" , new Locale ("fi" , "FI" )));
95+
96+ Assert .assertEquals ("deutsch" ,
97+ i18NProvider .getTranslation ("title" , new Locale ("de" )));
98+
99+ Assert .assertEquals (
100+ "non existing country should select language bundle" , "deutsch" ,
101+ i18NProvider .getTranslation ("title" , new Locale ("de" , "AT" )));
102+
103+ Assert .assertEquals ("Korean" ,
104+ i18NProvider .getTranslation ("title" , new Locale ("ko" , "KR" )));
105+
106+ // Note!
107+ // default translations.properties will be used if
108+ // the locale AND system default locale is not found
109+ Assert .assertEquals ("Default lang" ,
110+ i18NProvider .getTranslation ("title" , new Locale ("en" , "GB" )));
112111 }
113112
114113 @ Test
@@ -119,34 +118,34 @@ public void onlyDefaultTranslation_instantiateDefaultI18N()
119118 Files .writeString (file .toPath (), "title=Default lang" ,
120119 StandardCharsets .UTF_8 , StandardOpenOption .CREATE );
121120
122- try ( MockedStatic < I18NUtil > util = Mockito .mockStatic ( I18NUtil .class ,
123- Mockito . CALLS_REAL_METHODS )) {
124- util . when (() -> I18NUtil . getClassLoader ())
125- . thenReturn ( urlClassLoader );
126-
127- VaadinService service = Mockito . mock ( VaadinService . class );
128- mockLookup ( service );
129-
130- I18NProvider i18NProvider = new DefaultInstantiator ( service )
131- . getI18NProvider () ;
132- Assert . assertNotNull ( i18NProvider );
133- Assert .assertTrue (i18NProvider instanceof DefaultI18NProvider );
134-
135- Assert . assertEquals ( "Default lang" , i18NProvider
136- . getTranslation ( "title" , new Locale ( "fi" , "FI" )));
137-
138- Assert . assertEquals ( "Default lang" ,
139- i18NProvider . getTranslation ( "title" , new Locale ( "de" )));
140-
141- Assert . assertEquals ( "Default lang" , i18NProvider
142- . getTranslation ( "title" , new Locale ( "ko" , "KR" )));
143-
144- // Note!
145- // default translations.properties will be used if
146- // the locale AND system default locale is not found
147- Assert . assertEquals ( "Default lang" , i18NProvider
148- . getTranslation ( "title" , new Locale ( "en" , "GB" )));
149- }
121+ VaadinService service = Mockito .mock ( VaadinService .class );
122+ mockLookup ( service );
123+
124+ DefaultInstantiator defaultInstantiator = new DefaultInstantiator (
125+ service ) {
126+ @ Override
127+ protected ClassLoader getClassLoader () {
128+ return urlClassLoader ;
129+ }
130+ } ;
131+ I18NProvider i18NProvider = defaultInstantiator . getI18NProvider ( );
132+ Assert .assertNotNull (i18NProvider );
133+ Assert . assertTrue ( i18NProvider instanceof DefaultI18NProvider );
134+
135+ Assert . assertEquals ( "Default lang" ,
136+ i18NProvider . getTranslation ( "title" , new Locale ( "fi" , "FI" )));
137+
138+ Assert . assertEquals ( "Default lang" ,
139+ i18NProvider . getTranslation ( "title" , new Locale ( "de" )));
140+
141+ Assert . assertEquals ( "Default lang" ,
142+ i18NProvider . getTranslation ( "title" , new Locale ( "ko" , "KR" )));
143+
144+ // Note!
145+ // default translations.properties will be used if
146+ // the locale AND system default locale is not found
147+ Assert . assertEquals ( "Default lang" ,
148+ i18NProvider . getTranslation ( "title" , new Locale ( "en" , "GB" )));
150149 }
151150
152151 @ Test
@@ -157,25 +156,25 @@ public void onlyLangTransalation_nonExistingLangReturnsKey()
157156 Files .writeString (file .toPath (), "title=No Default" ,
158157 StandardCharsets .UTF_8 , StandardOpenOption .CREATE );
159158
160- try ( MockedStatic < I18NUtil > util = Mockito .mockStatic ( I18NUtil .class ,
161- Mockito . CALLS_REAL_METHODS )) {
162- util . when (() -> I18NUtil . getClassLoader ())
163- . thenReturn ( urlClassLoader );
164-
165- VaadinService service = Mockito . mock ( VaadinService . class );
166- mockLookup ( service );
167-
168- I18NProvider i18NProvider = new DefaultInstantiator ( service )
169- . getI18NProvider () ;
170- Assert . assertNotNull ( i18NProvider );
171- Assert .assertTrue (i18NProvider instanceof DefaultI18NProvider );
172-
173- Assert . assertEquals ( "No Default" ,
174- i18NProvider . getTranslation ( "title" , new Locale ( "ja" )));
175-
176- Assert . assertEquals ( "title" , i18NProvider . getTranslation ( "title" ,
177- new Locale ( "en" , "GB" )));
178- }
159+ VaadinService service = Mockito .mock ( VaadinService .class );
160+ mockLookup ( service );
161+
162+ DefaultInstantiator defaultInstantiator = new DefaultInstantiator (
163+ service ) {
164+ @ Override
165+ protected ClassLoader getClassLoader () {
166+ return urlClassLoader ;
167+ }
168+ } ;
169+ I18NProvider i18NProvider = defaultInstantiator . getI18NProvider ( );
170+ Assert .assertNotNull (i18NProvider );
171+ Assert . assertTrue ( i18NProvider instanceof DefaultI18NProvider );
172+
173+ Assert . assertEquals ( "No Default" ,
174+ i18NProvider . getTranslation ( "title" , new Locale ( "ja" )));
175+
176+ Assert . assertEquals ( "title" ,
177+ i18NProvider . getTranslation ( "title" , new Locale ( "en" , "GB" )));
179178 }
180179
181180 private static void createTranslationFiles (File translationsFolder )
0 commit comments