Skip to content

Commit 94be7ad

Browse files
ielatifielatif
committed
Migrate JUnit 4 assertions to AssertJ
1 parent 969b371 commit 94be7ad

File tree

2 files changed

+41
-46
lines changed

2 files changed

+41
-46
lines changed

‎spring-webflux/src/test/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerConfigurerTests.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import java.util.HashMap;
2121
import java.util.Properties;
2222

23+
import freemarker.cache.ClassTemplateLoader;
24+
import freemarker.cache.MultiTemplateLoader;
2325
import freemarker.template.Configuration;
2426
import freemarker.template.Template;
2527
import freemarker.template.TemplateException;
@@ -35,11 +37,8 @@
3537
import org.springframework.ui.freemarker.FreeMarkerTemplateUtils;
3638
import org.springframework.ui.freemarker.SpringTemplateLoader;
3739

40+
import static org.assertj.core.api.Assertions.assertThat;
3841
import static org.assertj.core.api.Assertions.assertThatIOException;
39-
import static org.hamcrest.MatcherAssert.assertThat;
40-
import static org.hamcrest.Matchers.instanceOf;
41-
import static org.junit.Assert.assertEquals;
42-
import static org.junit.Assert.assertTrue;
4342

4443
/**
4544
* @author Juergen Hoeller
@@ -52,7 +51,7 @@ public void freeMarkerConfigurerDefaultEncoding() throws IOException, TemplateEx
5251
FreeMarkerConfigurer configurer = new FreeMarkerConfigurer();
5352
configurer.afterPropertiesSet();
5453
Configuration cfg = configurer.getConfiguration();
55-
assertEquals("UTF-8", cfg.getDefaultEncoding());
54+
assertThat(cfg.getDefaultEncoding()).isEqualTo("UTF-8");
5655
}
5756

5857
@Test
@@ -72,7 +71,10 @@ public void freeMarkerConfigurerWithResourceLoaderPath() throws Exception {
7271
configurer.setTemplateLoaderPath("file:/mydir");
7372
configurer.afterPropertiesSet();
7473
Configuration cfg = configurer.getConfiguration();
75-
assertTrue(cfg.getTemplateLoader() instanceof SpringTemplateLoader);
74+
assertThat(cfg.getTemplateLoader()).isInstanceOf(MultiTemplateLoader.class);
75+
MultiTemplateLoader multiTemplateLoader = (MultiTemplateLoader)cfg.getTemplateLoader();
76+
assertThat(multiTemplateLoader.getTemplateLoader(0)).isInstanceOf(SpringTemplateLoader.class);
77+
assertThat(multiTemplateLoader.getTemplateLoader(1)).isInstanceOf(ClassTemplateLoader.class);
7678
}
7779

7880
@Test
@@ -97,10 +99,10 @@ public ClassLoader getClassLoader() {
9799
}
98100
});
99101
configurer.afterPropertiesSet();
100-
assertThat(configurer.getConfiguration(), instanceOf(Configuration.class));
102+
assertThat(configurer.getConfiguration()).isInstanceOf(Configuration.class);
101103
Configuration fc = configurer.getConfiguration();
102104
Template ft = fc.getTemplate("test");
103-
assertEquals("test", FreeMarkerTemplateUtils.processTemplateIntoString(ft, new HashMap()));
105+
assertThat(FreeMarkerTemplateUtils.processTemplateIntoString(ft, new HashMap())).isEqualTo("test");
104106
}
105107

106108
@Test // SPR-12448

‎spring-webflux/src/test/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerMacroTests.java

Lines changed: 31 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@
3737
import org.springframework.util.StringUtils;
3838
import org.springframework.web.reactive.result.view.DummyMacroRequestContext;
3939

40-
import static org.junit.Assert.assertEquals;
41-
import static org.junit.Assert.assertNotNull;
42-
import static org.junit.Assert.assertTrue;
40+
import static org.assertj.core.api.Assertions.assertThat;
4341

4442
/**
4543
* @author Darren Davison
@@ -62,127 +60,122 @@ public void setUp() throws Exception {
6260

6361
@Test
6462
public void testName() throws Exception {
65-
assertEquals("Darren", getMacroOutput("NAME"));
63+
assertThat(getMacroOutput("NAME")).isEqualTo("Darren");
6664
}
6765

6866
@Test
6967
public void testAge() throws Exception {
70-
assertEquals("99", getMacroOutput("AGE"));
68+
assertThat(getMacroOutput("AGE")).isEqualTo("99");
7169
}
7270

7371
@Test
7472
public void testMessage() throws Exception {
75-
assertEquals("Howdy Mundo", getMacroOutput("MESSAGE"));
73+
assertThat(getMacroOutput("MESSAGE")).isEqualTo("Howdy Mundo");
7674
}
7775

7876
@Test
7977
public void testDefaultMessage() throws Exception {
80-
assertEquals("hi planet", getMacroOutput("DEFAULTMESSAGE"));
78+
assertThat(getMacroOutput("DEFAULTMESSAGE")).isEqualTo("hi planet");
8179
}
8280

8381
@Test
8482
public void testMessageArgs() throws Exception {
85-
assertEquals("Howdy[World]", getMacroOutput("MESSAGEARGS"));
83+
assertThat(getMacroOutput("MESSAGEARGS")).isEqualTo("Howdy[World]");
8684
}
8785

8886
@Test
8987
public void testMessageArgsWithDefaultMessage() throws Exception {
90-
assertEquals("Hi", getMacroOutput("MESSAGEARGSWITHDEFAULTMESSAGE"));
88+
assertThat(getMacroOutput("MESSAGEARGSWITHDEFAULTMESSAGE")).isEqualTo("Hi");
9189
}
9290

9391
@Test
9492
public void testUrl() throws Exception {
95-
assertEquals("/springtest/aftercontext.html", getMacroOutput("URL"));
93+
assertThat(getMacroOutput("URL")).isEqualTo("/springtest/aftercontext.html");
9694
}
9795

9896
@Test
9997
public void testUrlParams() throws Exception {
100-
assertEquals("/springtest/aftercontext/bar?spam=bucket", getMacroOutput("URLPARAMS"));
98+
assertThat(getMacroOutput("URLPARAMS")).isEqualTo("/springtest/aftercontext/bar?spam=bucket");
10199
}
102100

103101
@Test
104102
public void testForm1() throws Exception {
105-
assertEquals("<input type=\"text\" id=\"name\" name=\"name\" value=\"Darren\" >", getMacroOutput("FORM1"));
103+
assertThat(getMacroOutput("FORM1")).isEqualTo("<input type=\"text\" id=\"name\" name=\"name\" value=\"Darren\" >");
106104
}
107105

108106
@Test
109107
public void testForm2() throws Exception {
110-
assertEquals("<input type=\"text\" id=\"name\" name=\"name\" value=\"Darren\" class=\"myCssClass\" >",
111-
getMacroOutput("FORM2"));
108+
assertThat(getMacroOutput("FORM2")).isEqualTo("<input type=\"text\" id=\"name\" name=\"name\" value=\"Darren\" class=\"myCssClass\" >");
112109
}
113110

114111
@Test
115112
public void testForm3() throws Exception {
116-
assertEquals("<textarea id=\"name\" name=\"name\" >\nDarren</textarea>", getMacroOutput("FORM3"));
113+
assertThat(getMacroOutput("FORM3")).isEqualTo("<textarea id=\"name\" name=\"name\" >\nDarren</textarea>");
117114
}
118115

119116
@Test
120117
public void testForm4() throws Exception {
121-
assertEquals("<textarea id=\"name\" name=\"name\" rows=10 cols=30>\nDarren</textarea>", getMacroOutput("FORM4"));
118+
assertThat(getMacroOutput("FORM4")).isEqualTo("<textarea id=\"name\" name=\"name\" rows=10 cols=30>\nDarren</textarea>");
122119
}
123120

124121
@Test
125122
public void testForm9() throws Exception {
126-
assertEquals("<input type=\"password\" id=\"name\" name=\"name\" value=\"\" >", getMacroOutput("FORM9"));
123+
assertThat(getMacroOutput("FORM9")).isEqualTo("<input type=\"password\" id=\"name\" name=\"name\" value=\"\" >");
127124
}
128125

129126
@Test
130127
public void testForm10() throws Exception {
131-
assertEquals("<input type=\"hidden\" id=\"name\" name=\"name\" value=\"Darren\" >",
132-
getMacroOutput("FORM10"));
128+
assertThat(getMacroOutput("FORM10")).isEqualTo("<input type=\"hidden\" id=\"name\" name=\"name\" value=\"Darren\" >");
133129
}
134130

135131
@Test
136132
public void testForm11() throws Exception {
137-
assertEquals("<input type=\"text\" id=\"name\" name=\"name\" value=\"Darren\" >", getMacroOutput("FORM11"));
133+
assertThat(getMacroOutput("FORM11")).isEqualTo("<input type=\"text\" id=\"name\" name=\"name\" value=\"Darren\" >");
138134
}
139135

140136
@Test
141137
public void testForm12() throws Exception {
142-
assertEquals("<input type=\"hidden\" id=\"name\" name=\"name\" value=\"Darren\" >",
143-
getMacroOutput("FORM12"));
138+
assertThat(getMacroOutput("FORM12")).isEqualTo("<input type=\"hidden\" id=\"name\" name=\"name\" value=\"Darren\" >");
144139
}
145140

146141
@Test
147142
public void testForm13() throws Exception {
148-
assertEquals("<input type=\"password\" id=\"name\" name=\"name\" value=\"\" >", getMacroOutput("FORM13"));
143+
assertThat(getMacroOutput("FORM13")).isEqualTo("<input type=\"password\" id=\"name\" name=\"name\" value=\"\" >");
149144
}
150145

151146
@Test
152147
public void testForm15() throws Exception {
153148
String output = getMacroOutput("FORM15");
154-
assertTrue("Wrong output: " + output, output.startsWith("<input type=\"hidden\" name=\"_name\" value=\"on\"/>"));
155-
assertTrue("Wrong output: " + output, output.contains("<input type=\"checkbox\" id=\"name\" name=\"name\" />"));
149+
assertThat(output.startsWith("<input type=\"hidden\" name=\"_name\" value=\"on\"/>")).as("Wrong output: " + output).isTrue();
150+
assertThat(output.contains("<input type=\"checkbox\" id=\"name\" name=\"name\" />")).as("Wrong output: " + output).isTrue();
156151
}
157152

158153
@Test
159154
public void testForm16() throws Exception {
160155
String output = getMacroOutput("FORM16");
161-
assertTrue("Wrong output: " + output, output.startsWith(
162-
"<input type=\"hidden\" name=\"_jedi\" value=\"on\"/>"));
163-
assertTrue("Wrong output: " + output, output.contains(
164-
"<input type=\"checkbox\" id=\"jedi\" name=\"jedi\" checked=\"checked\" />"));
156+
assertThat(output.startsWith(
157+
"<input type=\"hidden\" name=\"_jedi\" value=\"on\"/>")).as("Wrong output: " + output).isTrue();
158+
assertThat(output.contains(
159+
"<input type=\"checkbox\" id=\"jedi\" name=\"jedi\" checked=\"checked\" />")).as("Wrong output: " + output).isTrue();
165160
}
166161

167162
@Test
168163
public void testForm17() throws Exception {
169-
assertEquals(
170-
"<input type=\"text\" id=\"spouses0.name\" name=\"spouses[0].name\" value=\"Fred\" >",
171-
getMacroOutput("FORM17"));
164+
assertThat(getMacroOutput("FORM17")).isEqualTo("<input type=\"text\" id=\"spouses0.name\" name=\"spouses[0].name\" value=\"Fred\" >");
172165
}
173166

174167
@Test
175168
public void testForm18() throws Exception {
176169
String output = getMacroOutput("FORM18");
177-
assertTrue("Wrong output: " + output, output.startsWith(
178-
"<input type=\"hidden\" name=\"_spouses[0].jedi\" value=\"on\"/>"));
179-
assertTrue("Wrong output: " + output, output.contains(
180-
"<input type=\"checkbox\" id=\"spouses0.jedi\" name=\"spouses[0].jedi\" checked=\"checked\" />"));
170+
assertThat(output.startsWith(
171+
"<input type=\"hidden\" name=\"_spouses[0].jedi\" value=\"on\"/>")).as("Wrong output: " + output).isTrue();
172+
assertThat(output.contains(
173+
"<input type=\"checkbox\" id=\"spouses0.jedi\" name=\"spouses[0].jedi\" checked=\"checked\" />")).as("Wrong output: " + output).isTrue();
181174
}
182175

183176
private String getMacroOutput(String name) throws Exception {
184177
String macro = fetchMacro(name);
185-
assertNotNull(macro);
178+
assertThat(macro).isNotNull();
186179

187180
FileSystemResource resource = new FileSystemResource(System.getProperty("java.io.tmpdir") + "/tmp.ftl");
188181
FileCopyUtils.copy("<#import \"spring.ftl\" as spring />\n" + macro, new FileWriter(resource.getPath()));
@@ -230,7 +223,7 @@ private String getMacroOutput(String name) throws Exception {
230223

231224
private String fetchMacro(String name) throws Exception {
232225
ClassPathResource resource = new ClassPathResource("test-macro.ftl", getClass());
233-
assertTrue(resource.exists());
226+
assertThat(resource.exists()).isTrue();
234227
String all = FileCopyUtils.copyToString(new InputStreamReader(resource.getInputStream()));
235228
all = all.replace("\r\n", "\n");
236229
String[] macros = StringUtils.delimitedListToStringArray(all, "\n\n");

0 commit comments

Comments
 (0)