@@ -130,14 +130,6 @@ void convertsStringsToPrimitiveWrapperTypes() {
130
130
assertConverts ("42.2_3" , Double .class , 42.23 );
131
131
}
132
132
133
- @ Test
134
- void convertsTheWordNullToBooleanFalse () {
135
- assertConverts ("null" , boolean .class , false );
136
- assertConverts ("NULL" , boolean .class , false );
137
- assertConverts ("null" , Boolean .class , false );
138
- assertConverts ("NULL" , Boolean .class , false );
139
- }
140
-
141
133
@ ParameterizedTest (name = "[{index}] {0}" )
142
134
@ ValueSource (classes = { char .class , boolean .class , short .class , byte .class , int .class , long .class , float .class ,
143
135
double .class })
@@ -148,8 +140,8 @@ void throwsExceptionForNullToPrimitiveTypeConversion(Class<?> type) {
148
140
}
149
141
150
142
@ ParameterizedTest (name = "[{index}] {0}" )
151
- // NOTE: everything except Boolean.class and Character.class.
152
- @ ValueSource ( classes = { Short . class , Byte . class , Integer . class , Long . class , Float .class , Double .class })
143
+ @ ValueSource ( classes = { Boolean .class , Character .class , Short . class , Byte . class , Integer . class , Long . class ,
144
+ Float .class , Double .class })
153
145
void throwsExceptionWhenConvertingTheWordNullToPrimitiveWrapperType (Class <?> type ) {
154
146
assertThatExceptionOfType (ArgumentConversionException .class ) //
155
147
.isThrownBy (() -> convert ("null" , type )) //
@@ -172,6 +164,18 @@ void throwsExceptionOnInvalidStringForPrimitiveTypes() {
172
164
.withMessage ("Failed to convert String \" tru\" to type boolean" ) //
173
165
.havingCause () //
174
166
.withMessage ("String must be 'true' or 'false' (ignoring case): tru" );
167
+
168
+ assertThatExceptionOfType (ArgumentConversionException .class ) //
169
+ .isThrownBy (() -> convert ("null" , boolean .class )) //
170
+ .withMessage ("Failed to convert String \" null\" to type boolean" ) //
171
+ .havingCause () //
172
+ .withMessage ("String must be 'true' or 'false' (ignoring case): null" );
173
+
174
+ assertThatExceptionOfType (ArgumentConversionException .class ) //
175
+ .isThrownBy (() -> convert ("NULL" , boolean .class )) //
176
+ .withMessage ("Failed to convert String \" NULL\" to type boolean" ) //
177
+ .havingCause () //
178
+ .withMessage ("String must be 'true' or 'false' (ignoring case): NULL" );
175
179
}
176
180
177
181
@ Test
0 commit comments