root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #527 from marschall/spring-context-support-warnings 

* spring-context-support-warnings:
  Clean up spring-context-support tests warnings
This commit is contained in:
Stephane Nicoll 2014-04-22 07:32:20 +02:00
parent 21de937b2f 1e8c799a60
commit 36456f0f62
6 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheCacheManagerTests.java vendored
View File

@ -17,7 +17,6 @@
package org.springframework.cache.jcache;
import static org.mockito.BDDMockito.*;
import static org.mockito.Mockito.mock;
import javax.cache.Cache;
import javax.cache.CacheManager;

1
spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/AnnotationCacheOperationSourceTests.java vendored
View File

@ -18,7 +18,6 @@ package org.springframework.cache.jcache.interceptor;
import static org.junit.Assert.*;
import static org.mockito.BDDMockito.*;
import static org.mockito.Mockito.mock;
import java.lang.reflect.Method;
import java.util.Comparator;

1
spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/CacheResolverAdapterTests.java vendored
View File

@ -18,7 +18,6 @@ package org.springframework.cache.jcache.interceptor;
import static org.junit.Assert.*;
import static org.mockito.BDDMockito.*;
import static org.mockito.Mockito.mock;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;

1
spring-context-support/src/test/java/org/springframework/cache/jcache/support/TestableCacheResolver.java vendored
View File

@ -17,7 +17,6 @@
package org.springframework.cache.jcache.support;
import static org.mockito.BDDMockito.*;
import static org.mockito.Mockito.mock;
import java.lang.annotation.Annotation;

3
spring-context-support/src/test/java/org/springframework/cache/transaction/TransactionAwareCacheDecoratorTests.java vendored
View File

@ -26,11 +26,8 @@ import org.springframework.cache.concurrent.ConcurrentMapCache;
import org.springframework.tests.transaction.CallCountingTransactionManager;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionException;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.interceptor.DefaultTransactionAttribute;
import org.springframework.transaction.support.AbstractPlatformTransactionManager;
import org.springframework.transaction.support.DefaultTransactionStatus;
/**
* @author Stephane Nicoll

22
spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2014 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.
@ -75,19 +75,19 @@ public class JavaMailSenderTests extends TestCase {
assertEquals(1, sender.transport.getSentMessages().size());
MimeMessage sentMessage = sender.transport.getSentMessage(0);
List froms = Arrays.asList(sentMessage.getFrom());
List<Address> froms = Arrays.asList(sentMessage.getFrom());
assertEquals(1, froms.size());
assertEquals("me@mail.org", ((InternetAddress) froms.get(0)).getAddress());
List replyTos = Arrays.asList(sentMessage.getReplyTo());
List<Address> replyTos = Arrays.asList(sentMessage.getReplyTo());
assertEquals("reply@mail.org", ((InternetAddress) replyTos.get(0)).getAddress());
List tos = Arrays.asList(sentMessage.getRecipients(Message.RecipientType.TO));
List<Address> tos = Arrays.asList(sentMessage.getRecipients(Message.RecipientType.TO));
assertEquals(1, tos.size());
assertEquals("you@mail.org", ((InternetAddress) tos.get(0)).getAddress());
List ccs = Arrays.asList(sentMessage.getRecipients(Message.RecipientType.CC));
List<Address> ccs = Arrays.asList(sentMessage.getRecipients(Message.RecipientType.CC));
assertEquals(2, ccs.size());
assertEquals("he@mail.org", ((InternetAddress) ccs.get(0)).getAddress());
assertEquals("she@mail.org", ((InternetAddress) ccs.get(1)).getAddress());
List bccs = Arrays.asList(sentMessage.getRecipients(Message.RecipientType.BCC));
List<Address> bccs = Arrays.asList(sentMessage.getRecipients(Message.RecipientType.BCC));
assertEquals(2, bccs.size());
assertEquals("us@mail.org", ((InternetAddress) bccs.get(0)).getAddress());
assertEquals("them@mail.org", ((InternetAddress) bccs.get(1)).getAddress());
@ -115,11 +115,11 @@ public class JavaMailSenderTests extends TestCase {
assertEquals(2, sender.transport.getSentMessages().size());
MimeMessage sentMessage1 = sender.transport.getSentMessage(0);
List tos1 = Arrays.asList(sentMessage1.getRecipients(Message.RecipientType.TO));
List<Address> tos1 = Arrays.asList(sentMessage1.getRecipients(Message.RecipientType.TO));
assertEquals(1, tos1.size());
assertEquals("he@mail.org", ((InternetAddress) tos1.get(0)).getAddress());
MimeMessage sentMessage2 = sender.transport.getSentMessage(1);
List tos2 = Arrays.asList(sentMessage2.getRecipients(Message.RecipientType.TO));
List<Address> tos2 = Arrays.asList(sentMessage2.getRecipients(Message.RecipientType.TO));
assertEquals(1, tos2.size());
assertEquals("she@mail.org", ((InternetAddress) tos2.get(0)).getAddress());
}
@ -520,7 +520,7 @@ public class JavaMailSenderTests extends TestCase {
return closeCalled;
}
public List getSentMessages() {
public List<Message> getSentMessages() {
return sentMessages;
}
@ -552,8 +552,8 @@ public class JavaMailSenderTests extends TestCase {
if ("fail".equals(message.getSubject())) {
throw new MessagingException("failed");
}
List addr1 = Arrays.asList(message.getAllRecipients());
List addr2 = Arrays.asList(addresses);
List<Address> addr1 = Arrays.asList(message.getAllRecipients());
List<Address> addr2 = Arrays.asList(addresses);
if (!addr1.equals(addr2)) {
throw new MessagingException("addresses not correct");
}