Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrate JUnit 3 tests to JUnit 4

Browse Source 
This commit migrates all remaining tests from JUnit 3 to JUnit 4, with
the exception of Spring's legacy JUnit 3.8 based testing framework that
is still in use in the spring-orm module.

Issue: SPR-13514
This commit is contained in:
Sam Brannen
2015-09-26 00:10:58 +02:00
parent 1580288815
commit d5ee787e1e
213 changed files with 4879 additions and 3939 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-context-support/src/test/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMapTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2005 the original author or authors.
* Copyright 2002-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,18 +18,21 @@ package org.springframework.mail.javamail;
import java.io.File;
import junit.framework.TestCase;
import org.junit.Test;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import static org.junit.Assert.*;
/**
* @author Rob Harrop
* @author Juergen Hoeller
*/
public class ConfigurableMimeFileTypeMapTests extends TestCase {
public class ConfigurableMimeFileTypeMapTests {
public void testAgainstDefaultConfiguration() throws Exception {
@Test
public void againstDefaultConfiguration() throws Exception {
ConfigurableMimeFileTypeMap ftm = new ConfigurableMimeFileTypeMap();
ftm.afterPropertiesSet();
@@ -41,12 +44,14 @@ public class ConfigurableMimeFileTypeMapTests extends TestCase {
assertEquals("Invalid default content type", "application/octet-stream", ftm.getContentType("foobar.foo"));
}
public void testAgainstDefaultConfigurationWithFilePath() throws Exception {
@Test
public void againstDefaultConfigurationWithFilePath() throws Exception {
ConfigurableMimeFileTypeMap ftm = new ConfigurableMimeFileTypeMap();
assertEquals("Invalid content type for HTM", "text/html", ftm.getContentType(new File("/tmp/foobar.HTM")));
}
public void testWithAdditionalMappings() throws Exception {
@Test
public void withAdditionalMappings() throws Exception {
ConfigurableMimeFileTypeMap ftm = new ConfigurableMimeFileTypeMap();
ftm.setMappings(new String[] {"foo/bar HTM foo", "foo/cpp c++"});
ftm.afterPropertiesSet();
@@ -56,7 +61,8 @@ public class ConfigurableMimeFileTypeMapTests extends TestCase {
assertEquals("Invalid content type for foo - new mapping didn't work", "foo/bar", ftm.getContentType("bar.foo"));
}
public void testWithCustomMappingLocation() throws Exception {
@Test
public void withCustomMappingLocation() throws Exception {
Resource resource = new ClassPathResource("test.mime.types", getClass());
ConfigurableMimeFileTypeMap ftm = new ConfigurableMimeFileTypeMap();

44
spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,62 +16,62 @@
package org.springframework.mail.javamail;
import junit.framework.TestCase;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* @author Brian Hanafee
* @author Sam Brannen
* @since 09.07.2005
*/
public class InternetAddressEditorTests extends TestCase {
public class InternetAddressEditorTests {
private static final String EMPTY = "";
private static final String SIMPLE = "nobody@nowhere.com";
private static final String BAD = "(";
private InternetAddressEditor editor;
private final InternetAddressEditor editor = new InternetAddressEditor();
@Override
protected void setUp() {
editor = new InternetAddressEditor();
}
public void testUninitialized() {
@Test
public void uninitialized() {
assertEquals("Uninitialized editor did not return empty value string", EMPTY, editor.getAsText());
}
public void testSetNull() {
@Test
public void setNull() {
editor.setAsText(null);
assertEquals("Setting null did not result in empty value string", EMPTY, editor.getAsText());
}
public void testSetEmpty() {
@Test
public void setEmpty() {
editor.setAsText(EMPTY);
assertEquals("Setting empty string did not result in empty value string", EMPTY, editor.getAsText());
}
public void testAllWhitespace() {
@Test
public void allWhitespace() {
editor.setAsText(" ");
assertEquals("All whitespace was not recognized", EMPTY, editor.getAsText());
}
public void testSimpleGoodAddess() {
@Test
public void simpleGoodAddess() {
editor.setAsText(SIMPLE);
assertEquals("Simple email address failed", SIMPLE, editor.getAsText());
}
public void testExcessWhitespace() {
@Test
public void excessWhitespace() {
editor.setAsText(" " + SIMPLE + " ");
assertEquals("Whitespace was not stripped", SIMPLE, editor.getAsText());
}
public void testSimpleBadAddress() {
try {
editor.setAsText(BAD);
fail("Should have failed on \"" + BAD + "\", instead got " + editor.getAsText());
}
catch (IllegalArgumentException e) {
// Passed the test
}
@Test(expected = IllegalArgumentException.class)
public void simpleBadAddress() {
editor.setAsText(BAD);
}
}

34
spring-context-support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 the original author or authors.
* Copyright 2002-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -41,13 +41,13 @@ import net.sf.jasperreports.engine.export.JRPdfExporter;
import net.sf.jasperreports.engine.export.JRPdfExporterParameter;
import net.sf.jasperreports.engine.export.JRXlsExporterParameter;
import net.sf.jasperreports.engine.util.JRLoader;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.junit.BeforeClass;
import org.junit.Test;
import org.springframework.core.io.ClassPathResource;
import org.springframework.tests.Assume;
@@ -58,6 +58,7 @@ import static org.junit.Assert.*;
* @author Juergen Hoeller
* @since 18.11.2004
*/
@SuppressWarnings("deprecation")
public class JasperReportsUtilsTests {
@BeforeClass
@@ -66,7 +67,7 @@ public class JasperReportsUtilsTests {
}
@Test
public void testRenderAsCsvWithDataSource() throws Exception {
public void renderAsCsvWithDataSource() throws Exception {
StringWriter writer = new StringWriter();
JasperReportsUtils.renderAsCsv(getReport(), getParameters(), getDataSource(), writer);
String output = writer.getBuffer().toString();
@@ -74,7 +75,7 @@ public class JasperReportsUtilsTests {
}
@Test
public void testRenderAsCsvWithCollection() throws Exception {
public void renderAsCsvWithCollection() throws Exception {
StringWriter writer = new StringWriter();
JasperReportsUtils.renderAsCsv(getReport(), getParameters(), getData(), writer);
String output = writer.getBuffer().toString();
@@ -82,7 +83,7 @@ public class JasperReportsUtilsTests {
}
@Test
public void testRenderAsCsvWithExporterParameters() throws Exception {
public void renderAsCsvWithExporterParameters() throws Exception {
StringWriter writer = new StringWriter();
Map<JRExporterParameter, Object> exporterParameters = new HashMap<JRExporterParameter, Object>();
exporterParameters.put(JRCsvExporterParameter.FIELD_DELIMITER, "~");
@@ -93,7 +94,7 @@ public class JasperReportsUtilsTests {
}
@Test
public void testRenderAsHtmlWithDataSource() throws Exception {
public void renderAsHtmlWithDataSource() throws Exception {
StringWriter writer = new StringWriter();
JasperReportsUtils.renderAsHtml(getReport(), getParameters(), getDataSource(), writer);
String output = writer.getBuffer().toString();
@@ -101,7 +102,7 @@ public class JasperReportsUtilsTests {
}
@Test
public void testRenderAsHtmlWithCollection() throws Exception {
public void renderAsHtmlWithCollection() throws Exception {
StringWriter writer = new StringWriter();
JasperReportsUtils.renderAsHtml(getReport(), getParameters(), getData(), writer);
String output = writer.getBuffer().toString();
@@ -109,7 +110,7 @@ public class JasperReportsUtilsTests {
}
@Test
public void testRenderAsHtmlWithExporterParameters() throws Exception {
public void renderAsHtmlWithExporterParameters() throws Exception {
StringWriter writer = new StringWriter();
Map<JRExporterParameter, Object> exporterParameters = new HashMap<JRExporterParameter, Object>();
String uri = "/my/uri";
@@ -121,7 +122,7 @@ public class JasperReportsUtilsTests {
}
@Test
public void testRenderAsPdfWithDataSource() throws Exception {
public void renderAsPdfWithDataSource() throws Exception {
ByteArrayOutputStream os = new ByteArrayOutputStream();
JasperReportsUtils.renderAsPdf(getReport(), getParameters(), getDataSource(), os);
byte[] output = os.toByteArray();
@@ -129,7 +130,7 @@ public class JasperReportsUtilsTests {
}
@Test
public void testRenderAsPdfWithCollection() throws Exception {
public void renderAsPdfWithCollection() throws Exception {
ByteArrayOutputStream os = new ByteArrayOutputStream();
JasperReportsUtils.renderAsPdf(getReport(), getParameters(), getData(), os);
byte[] output = os.toByteArray();
@@ -137,7 +138,7 @@ public class JasperReportsUtilsTests {
}
@Test
public void testRenderAsPdfWithExporterParameters() throws Exception {
public void renderAsPdfWithExporterParameters() throws Exception {
ByteArrayOutputStream os = new ByteArrayOutputStream();
Map<JRExporterParameter, Object> exporterParameters = new HashMap<JRExporterParameter, Object>();
exporterParameters.put(JRPdfExporterParameter.PDF_VERSION, JRPdfExporterParameter.PDF_VERSION_1_6.toString());
@@ -148,7 +149,7 @@ public class JasperReportsUtilsTests {
}
@Test
public void testRenderAsXlsWithDataSource() throws Exception {
public void renderAsXlsWithDataSource() throws Exception {
ByteArrayOutputStream os = new ByteArrayOutputStream();
JasperReportsUtils.renderAsXls(getReport(), getParameters(), getDataSource(), os);
byte[] output = os.toByteArray();
@@ -156,7 +157,7 @@ public class JasperReportsUtilsTests {
}
@Test
public void testRenderAsXlsWithCollection() throws Exception {
public void renderAsXlsWithCollection() throws Exception {
ByteArrayOutputStream os = new ByteArrayOutputStream();
JasperReportsUtils.renderAsXls(getReport(), getParameters(), getData(), os);
byte[] output = os.toByteArray();
@@ -164,7 +165,7 @@ public class JasperReportsUtilsTests {
}
@Test
public void testRenderAsXlsWithExporterParameters() throws Exception {
public void renderAsXlsWithExporterParameters() throws Exception {
ByteArrayOutputStream os = new ByteArrayOutputStream();
Map<JRExporterParameter, Object> exporterParameters = new HashMap<JRExporterParameter, Object>();
@@ -178,7 +179,7 @@ public class JasperReportsUtilsTests {
}
@Test
public void testRenderWithWriter() throws Exception {
public void renderWithWriter() throws Exception {
StringWriter writer = new StringWriter();
JasperPrint print = JasperFillManager.fillReport(getReport(), getParameters(), getDataSource());
JasperReportsUtils.render(new JRHtmlExporter(), print, writer);
@@ -187,7 +188,7 @@ public class JasperReportsUtilsTests {
}
@Test
public void testRenderWithOutputStream() throws Exception {
public void renderWithOutputStream() throws Exception {
ByteArrayOutputStream os = new ByteArrayOutputStream();
JasperPrint print = JasperFillManager.fillReport(getReport(), getParameters(), getDataSource());
JasperReportsUtils.render(new JRPdfExporter(), print, os);
@@ -214,6 +215,7 @@ public class JasperReportsUtilsTests {
assertTrue("Output should start with %PDF", translated.startsWith("%PDF"));
}
@SuppressWarnings("resource")
private void assertXlsOutputCorrect(byte[] output) throws Exception {
HSSFWorkbook workbook = new HSSFWorkbook(new ByteArrayInputStream(output));
HSSFSheet sheet = workbook.getSheetAt(0);