Skip to content

Commit 868fae0

Browse files
author
Julien LE MÉNER
committed
Adjust assignation to fit existing tests
1 parent 3ad787d commit 868fae0

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

src/main/java/org/codehaus/mojo/license/header/transformer/AbstractFileHeaderTransformer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,13 +274,13 @@ public String getLineSeparator()
274274
*/
275275
public void setLineSeparator( String lineSeparator )
276276
{
277-
if ( lineSeparator != null )
277+
try
278278
{
279279
this.lineSeparator = Eol.valueOf(lineSeparator).getEolString();
280280
}
281-
else
281+
catch ( IllegalArgumentException e )
282282
{
283-
this.lineSeparator = null;
283+
this.lineSeparator = lineSeparator;
284284
}
285285
}
286286

src/test/java/org/codehaus/mojo/license/header/transformer/AbstractFileHeaderTransformerTest.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -324,14 +324,8 @@ public void testSetLineSeparator()
324324
transformer.setLineSeparator("CRLF");
325325
Assert.assertEquals("\r\n", transformer.getLineSeparator());
326326

327-
transformer.setLineSeparator(null);
328-
Assert.assertEquals(LINE_SEPARATOR, transformer.getLineSeparator());
329-
}
330-
331-
@Test(expected = IllegalArgumentException.class)
332-
public void testSetLineSeparatorUnknownEol()
333-
{
334-
transformer.setLineSeparator("INEXISTANT");
327+
transformer.setLineSeparator("RANDOM");
328+
Assert.assertEquals("RANDOM", transformer.getLineSeparator());
335329
}
336330

337331
public static void assertEquals( FileHeader model, FileHeader model2 )

0 commit comments

Comments
 (0)