Skip to content

Commit 9a8a97e

Browse files
stokitostokito
committed
MessageTest: use string concatenation instead of StringBuilder
Simplify assertions.
1 parent ff709e1 commit 9a8a97e

1 file changed

Lines changed: 64 additions & 64 deletions

File tree

‎smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ public void setMessageTypeTest() throws IOException, SAXException {
4444
Message.Type type = Message.Type.chat;
4545
Message.Type type2 = Message.Type.headline;
4646

47-
StringBuilder controlBuilder = new StringBuilder();
48-
controlBuilder.append("<message")
49-
.append(" type=\"")
50-
.append(type)
51-
.append("\">")
52-
.append("</message>");
53-
String control = controlBuilder.toString();
47+
// @formatter:off
48+
String control = "<message" +
49+
" type=\"" +
50+
type +
51+
"\">" +
52+
"</message>";
53+
// @formatter:on
5454

5555
Message messageBuildWithBuilder = StanzaBuilder.buildMessage()
5656
.ofType(Message.Type.chat)
@@ -59,13 +59,13 @@ public void setMessageTypeTest() throws IOException, SAXException {
5959
assertEquals(type, messageBuildWithBuilder.getType());
6060
assertXmlSimilar(control, messageBuildWithBuilder.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
6161

62-
controlBuilder = new StringBuilder();
63-
controlBuilder.append("<message")
64-
.append(" type=\"")
65-
.append(type2)
66-
.append("\">")
67-
.append("</message>");
68-
control = controlBuilder.toString();
62+
// @formatter:off
63+
control = "<message" +
64+
" type=\"" +
65+
type2 +
66+
"\">" +
67+
"</message>";
68+
// @formatter:on
6969

7070
Message messageTypeSet = StanzaBuilder.buildMessage()
7171
.ofType(type2)
@@ -85,13 +85,13 @@ public void setNullMessageBodyTest() {
8585
public void setMessageSubjectTest() throws IOException, SAXException {
8686
final String messageSubject = "This is a test of the emergency broadcast system.";
8787

88-
StringBuilder controlBuilder = new StringBuilder();
89-
controlBuilder.append("<message>")
90-
.append("<subject>")
91-
.append(messageSubject)
92-
.append("</subject>")
93-
.append("</message>");
94-
String control = controlBuilder.toString();
88+
// @formatter:off
89+
String control = "<message>" +
90+
"<subject>" +
91+
messageSubject +
92+
"</subject>" +
93+
"</message>";
94+
// @formatter:on
9595

9696
Message message = StanzaBuilder.buildMessage()
9797
.setSubject(messageSubject)
@@ -104,13 +104,13 @@ public void setMessageSubjectTest() throws IOException, SAXException {
104104
public void oneMessageBodyTest() throws IOException, SAXException {
105105
final String messageBody = "This is a test of the emergency broadcast system.";
106106

107-
StringBuilder controlBuilder = new StringBuilder();
108-
controlBuilder.append("<message>")
109-
.append("<body>")
110-
.append(messageBody)
111-
.append("</body>")
112-
.append("</message>");
113-
String control = controlBuilder.toString();
107+
// @formatter:off
108+
String control = "<message>" +
109+
"<body>" +
110+
messageBody +
111+
"</body>" +
112+
"</message>";
113+
// @formatter:on
114114

115115
Message message = StanzaBuilder.buildMessage()
116116
.setBody(messageBody)
@@ -127,23 +127,23 @@ public void multipleMessageBodiesTest() throws IOException, SAXException {
127127
final String lang3 = "sp";
128128
final String messageBody3 = "This is a test of the emergency broadcast system, 3.";
129129

130-
StringBuilder controlBuilder = new StringBuilder();
131-
controlBuilder.append("<message>")
132-
.append("<body>")
133-
.append(messageBody1)
134-
.append("</body>")
135-
.append("<body xml:lang=\"")
136-
.append(lang2)
137-
.append("\">")
138-
.append(messageBody2)
139-
.append("</body>")
140-
.append("<body xml:lang=\"")
141-
.append(lang3)
142-
.append("\">")
143-
.append(messageBody3)
144-
.append("</body>")
145-
.append("</message>");
146-
String control = controlBuilder.toString();
130+
// @formatter:off
131+
String control = "<message>" +
132+
"<body>" +
133+
messageBody1 +
134+
"</body>" +
135+
"<body xml:lang=\"" +
136+
lang2 +
137+
"\">" +
138+
messageBody2 +
139+
"</body>" +
140+
"<body xml:lang=\"" +
141+
lang3 +
142+
"\">" +
143+
messageBody3 +
144+
"</body>" +
145+
"</message>";
146+
// @formatter:on
147147

148148
Message message = StanzaBuilder.buildMessage()
149149
.addBody(null, messageBody1)
@@ -157,37 +157,37 @@ public void multipleMessageBodiesTest() throws IOException, SAXException {
157157
controlLanguages.add(lang2);
158158
controlLanguages.add(lang3);
159159
controlLanguages.removeAll(languages);
160-
assertTrue(controlLanguages.size() == 0);
160+
assertTrue(controlLanguages.isEmpty());
161161
}
162162

163163
@Test
164164
public void simpleMessageBodyTest() {
165165
Message message = StanzaBuilder.buildMessage()
166166
.setBody("test")
167167
.build();
168-
assertTrue(message.getBodies().size() == 1);
168+
assertEquals(1, message.getBodies().size());
169169

170170
message = StanzaBuilder.buildMessage().build();
171-
assertTrue(message.getBodies().size() == 0);
171+
assertEquals(0, message.getBodies().size());
172172

173173

174174
message = StanzaBuilder.buildMessage()
175175
.addBody("es", "test")
176176
.build();
177-
assertTrue(message.getBodies().size() == 1);
177+
assertEquals(1, message.getBodies().size());
178178
}
179179

180180
@Test
181181
public void setMessageThreadTest() throws IOException, SAXException {
182182
final String messageThread = "1234";
183183

184-
StringBuilder controlBuilder = new StringBuilder();
185-
controlBuilder.append("<message>")
186-
.append("<thread>")
187-
.append(messageThread)
188-
.append("</thread>")
189-
.append("</message>");
190-
String control = controlBuilder.toString();
184+
// @formatter:off
185+
String control = "<message>" +
186+
"<thread>" +
187+
messageThread +
188+
"</thread>" +
189+
"</message>";
190+
// @formatter:on
191191

192192
Message message = StanzaBuilder.buildMessage()
193193
.setThread(messageThread)
@@ -201,13 +201,13 @@ public void setMessageThreadTest() throws IOException, SAXException {
201201
public void messageXmlLangTest() throws IOException, SAXException {
202202
final String lang = "sp";
203203

204-
StringBuilder controlBuilder = new StringBuilder();
205-
controlBuilder.append("<message")
206-
.append(" xml:lang=\"")
207-
.append(lang)
208-
.append("\">")
209-
.append("</message>");
210-
String control = controlBuilder.toString();
204+
// @formatter:off
205+
String control = "<message" +
206+
" xml:lang=\"" +
207+
lang +
208+
"\">" +
209+
"</message>";
210+
// @formatter:on
211211

212212
Message message = StanzaBuilder.buildMessage()
213213
.setLanguage(lang)
@@ -286,7 +286,7 @@ public void getBodyReturnsBody(SmackTestUtil.XmlPullParserKind parserKind)
286286

287287
var message = assertInstanceOf(Message.class, stanzas.get(0));
288288
// In this case, no xml:lang on the stream or the message and no explicit language argument provided to
289-
// getBody(), it is anbiguous which body we should return.
289+
// getBody(), it is ambiguous which body we should return.
290290
var body = message.getBody();
291291
assertNull(body);
292292
}

0 commit comments

Comments
 (0)