Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sesemomo
spring-framework
提交
84d3808b
S
spring-framework
项目概览
sesemomo
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
84d3808b
编写于
11月 03, 2016
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Upgrade to Mockito 2.2
Issue: SPR-14880
上级
8ae0bd6e
变更
24
隐藏空白更改
内联
并排
Showing
24 changed file
with
120 addition
and
184 deletion
+120
-184
build.gradle
build.gradle
+1
-1
spring-aop/src/main/java/org/springframework/aop/framework/ProxyProcessorSupport.java
.../springframework/aop/framework/ProxyProcessorSupport.java
+2
-1
spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
...mework/beans/factory/DefaultListableBeanFactoryTests.java
+2
-2
spring-core/src/test/java/org/springframework/tests/MockitoUtils.java
...src/test/java/org/springframework/tests/MockitoUtils.java
+15
-14
spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java
...ringframework/util/xml/AbstractStaxXMLReaderTestCase.java
+31
-24
spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java
...org/springframework/util/xml/StaxEventXMLReaderTests.java
+3
-6
spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java
...rg/springframework/util/xml/StaxStreamXMLReaderTests.java
+3
-6
spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandlerTests.java
...tion/support/SimpAnnotationMethodMessageHandlerTests.java
+8
-14
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/DefaultStompSessionTests.java
...mework/messaging/simp/stomp/DefaultStompSessionTests.java
+1
-4
spring-test/src/test/java/org/springframework/test/context/junit/jupiter/DisabledIfConditionTestCase.java
...st/context/junit/jupiter/DisabledIfConditionTestCase.java
+5
-13
spring-test/src/test/java/org/springframework/test/context/support/TestPropertySourceUtilsTests.java
...rk/test/context/support/TestPropertySourceUtilsTests.java
+0
-1
spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/DelegatingWebConnectionTests.java
...st/web/servlet/htmlunit/DelegatingWebConnectionTests.java
+10
-6
spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/WebConnectionHtmlUnitDriverTests.java
.../htmlunit/webdriver/WebConnectionHtmlUnitDriverTests.java
+1
-1
spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/AsyncControllerJavaConfigTests.java
...rvlet/samples/context/AsyncControllerJavaConfigTests.java
+3
-6
spring-web-reactive/src/test/java/org/springframework/web/reactive/config/DelegatingWebReactiveConfigurationTests.java
...ctive/config/DelegatingWebReactiveConfigurationTests.java
+1
-4
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/RouterFunctionsTests.java
...framework/web/reactive/function/RouterFunctionsTests.java
+2
-8
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/InvocableHandlerMethodTests.java
...b/reactive/result/method/InvocableHandlerMethodTests.java
+4
-8
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ServerWebExchangeArgumentResolverTests.java
...od/annotation/ServerWebExchangeArgumentResolverTests.java
+3
-6
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolverTests.java
...notation/SessionAttributeMethodArgumentResolverTests.java
+3
-9
spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java
...ork/http/converter/ResourceHttpMessageConverterTests.java
+6
-8
spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java
...g/springframework/web/servlet/DispatcherServletTests.java
+0
-2
spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java
...rk/web/socket/messaging/StompSubProtocolHandlerTests.java
+4
-15
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpSendingTransportHandlerTests.java
...s/transport/handler/HttpSendingTransportHandlerTests.java
+4
-8
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/SockJsSessionTests.java
...b/socket/sockjs/transport/session/SockJsSessionTests.java
+8
-17
未找到文件。
build.gradle
浏览文件 @
84d3808b
...
...
@@ -179,7 +179,7 @@ configure(allprojects) { project ->
testCompile
(
"junit:junit:${junitVersion}"
)
{
exclude
group:
'org.hamcrest'
,
module:
'hamcrest-core'
}
testCompile
(
"org.mockito:mockito-core:
1.10.19
"
)
{
testCompile
(
"org.mockito:mockito-core:
2.2.10
"
)
{
exclude
group:
'org.hamcrest'
,
module:
'hamcrest-core'
}
testCompile
(
"org.hamcrest:hamcrest-all:${hamcrestVersion}"
)
...
...
spring-aop/src/main/java/org/springframework/aop/framework/ProxyProcessorSupport.java
浏览文件 @
84d3808b
...
...
@@ -140,7 +140,8 @@ public class ProxyProcessorSupport extends ProxyConfig implements Ordered, BeanC
*/
protected
boolean
isInternalLanguageInterface
(
Class
<?>
ifc
)
{
return
(
ifc
.
getName
().
equals
(
"groovy.lang.GroovyObject"
)
||
ifc
.
getName
().
endsWith
(
".cglib.proxy.Factory"
));
ifc
.
getName
().
endsWith
(
".cglib.proxy.Factory"
)
||
ifc
.
getName
().
endsWith
(
".bytebuddy.MockAccess"
));
}
}
spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
浏览文件 @
84d3808b
...
...
@@ -44,7 +44,7 @@ import org.junit.Ignore;
import
org.junit.Rule
;
import
org.junit.Test
;
import
org.junit.rules.ExpectedException
;
import
org.mockito.Matchers
;
import
org.mockito.
Argument
Matchers
;
import
org.springframework.beans.BeansException
;
import
org.springframework.beans.MutablePropertyValues
;
...
...
@@ -1219,7 +1219,7 @@ public class DefaultListableBeanFactoryTests {
public
void
testExpressionInStringArray
()
{
DefaultListableBeanFactory
bf
=
new
DefaultListableBeanFactory
();
BeanExpressionResolver
beanExpressionResolver
=
mock
(
BeanExpressionResolver
.
class
);
when
(
beanExpressionResolver
.
evaluate
(
eq
(
"#{foo}"
),
Matchers
.
any
(
BeanExpressionContext
.
class
)))
when
(
beanExpressionResolver
.
evaluate
(
eq
(
"#{foo}"
),
Argument
Matchers
.
any
(
BeanExpressionContext
.
class
)))
.
thenReturn
(
"classpath:/org/springframework/beans/factory/xml/util.properties"
);
bf
.
setBeanExpressionResolver
(
beanExpressionResolver
);
...
...
spring-core/src/test/java/org/springframework/tests/MockitoUtils.java
浏览文件 @
84d3808b
/*
* Copyright 2002-201
3
the original author or authors.
* Copyright 2002-201
6
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.
...
...
@@ -30,34 +30,33 @@ import static org.junit.Assert.*;
*
* @author Phillip Webb
*/
public
class
MockitoUtils
{
private
static
MockUtil
mockUtil
=
new
MockUtil
();
public
abstract
class
MockitoUtils
{
/**
* Verify the same invocations have been applied to two mocks. This is generally not
* the preferred way test with mockito and should be avoided if possible.
* @param expected the mock containing expected invocations
* @param actual the mock containing actual invocations
* @param argumentAdapters adapters that can be used to change argument values before
* they are compared
* @param argumentAdapters adapters that can be used to change argument values before they are compared
*/
public
static
<
T
>
void
verifySameInvocations
(
T
expected
,
T
actual
,
InvocationArgumentsAdapter
...
argumentAdapters
)
{
List
<
Invocation
>
expectedInvocations
=
m
ockUtil
.
getMockHandler
(
expected
).
getInvocationContainer
().
getInvocations
();
List
<
Invocation
>
actualInvocations
=
m
ockUtil
.
getMockHandler
(
actual
).
getInvocationContainer
().
getInvocations
();
List
<
Invocation
>
expectedInvocations
=
M
ockUtil
.
getMockHandler
(
expected
).
getInvocationContainer
().
getInvocations
();
List
<
Invocation
>
actualInvocations
=
M
ockUtil
.
getMockHandler
(
actual
).
getInvocationContainer
().
getInvocations
();
verifySameInvocations
(
expectedInvocations
,
actualInvocations
,
argumentAdapters
);
}
private
static
void
verifySameInvocations
(
List
<
Invocation
>
expectedInvocations
,
List
<
Invocation
>
actualInvocations
,
InvocationArgumentsAdapter
...
argumentAdapters
)
{
private
static
void
verifySameInvocations
(
List
<
Invocation
>
expectedInvocations
,
List
<
Invocation
>
actualInvocations
,
InvocationArgumentsAdapter
...
argumentAdapters
)
{
assertThat
(
expectedInvocations
.
size
(),
is
(
equalTo
(
actualInvocations
.
size
())));
for
(
int
i
=
0
;
i
<
expectedInvocations
.
size
();
i
++)
{
verifySameInvocation
(
expectedInvocations
.
get
(
i
),
actualInvocations
.
get
(
i
),
argumentAdapters
);
}
}
private
static
void
verifySameInvocation
(
Invocation
expectedInvocation
,
Invocation
actualInvocation
,
InvocationArgumentsAdapter
...
argumentAdapters
)
{
System
.
out
.
println
(
expectedInvocation
);
System
.
out
.
println
(
actualInvocation
);
private
static
void
verifySameInvocation
(
Invocation
expectedInvocation
,
Invocation
actualInvocation
,
InvocationArgumentsAdapter
...
argumentAdapters
)
{
assertThat
(
expectedInvocation
.
getMethod
(),
is
(
equalTo
(
actualInvocation
.
getMethod
())));
Object
[]
expectedArguments
=
getInvocationArguments
(
expectedInvocation
,
argumentAdapters
);
Object
[]
actualArguments
=
getInvocationArguments
(
actualInvocation
,
argumentAdapters
);
...
...
@@ -72,16 +71,18 @@ public class MockitoUtils {
return
arguments
;
}
/**
* Adapter strategy that can be used to change invocation arguments.
*/
public
static
interface
InvocationArgumentsAdapter
{
public
interface
InvocationArgumentsAdapter
{
/**
* Change the arguments if required
* Change the arguments if required
.
* @param arguments the source arguments
* @return updated or original arguments (never {@code null})
*/
Object
[]
adaptArguments
(
Object
[]
arguments
);
}
}
spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java
浏览文件 @
84d3808b
/*
* Copyright 2002-201
5
the original author or authors.
* Copyright 2002-201
6
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,7 +18,6 @@ package org.springframework.util.xml;
import
java.io.ByteArrayInputStream
;
import
java.io.InputStream
;
import
javax.xml.stream.XMLInputFactory
;
import
javax.xml.stream.XMLStreamException
;
import
javax.xml.transform.Transformer
;
...
...
@@ -28,15 +27,8 @@ import javax.xml.transform.sax.SAXSource;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.mockito.invocation.InvocationOnMock
;
import
org.mockito.stubbing.Answer
;
import
org.springframework.core.io.ClassPathResource
;
import
org.springframework.core.io.Resource
;
import
org.springframework.tests.MockitoUtils
;
import
org.springframework.tests.MockitoUtils.InvocationArgumentsAdapter
;
import
org.w3c.dom.Node
;
import
org.xml.sax.Attributes
;
import
org.xml.sax.ContentHandler
;
...
...
@@ -47,6 +39,11 @@ import org.xml.sax.ext.LexicalHandler;
import
org.xml.sax.helpers.AttributesImpl
;
import
org.xml.sax.helpers.XMLReaderFactory
;
import
org.springframework.core.io.ClassPathResource
;
import
org.springframework.core.io.Resource
;
import
org.springframework.tests.MockitoUtils
;
import
org.springframework.tests.MockitoUtils.InvocationArgumentsAdapter
;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
mockito
.
BDDMockito
.*;
...
...
@@ -58,6 +55,7 @@ public abstract class AbstractStaxXMLReaderTestCase {
private
ContentHandler
standardContentHandler
;
@Before
public
void
setUp
()
throws
Exception
{
inputFactory
=
XMLInputFactory
.
newInstance
();
...
...
@@ -66,6 +64,7 @@ public abstract class AbstractStaxXMLReaderTestCase {
standardReader
.
setContentHandler
(
standardContentHandler
);
}
@Test
public
void
contentHandlerNamespacesNoPrefixes
()
throws
Exception
{
standardReader
.
setFeature
(
"http://xml.org/sax/features/namespaces"
,
true
);
...
...
@@ -147,19 +146,17 @@ public abstract class AbstractStaxXMLReaderTestCase {
inputFactory
.
setProperty
(
"javax.xml.stream.isSupportingExternalEntities"
,
Boolean
.
FALSE
);
LexicalHandler
actualLexicalHandler
=
mockLexicalHandler
();
willAnswer
(
new
Answer
<
Object
>()
{
@Override
public
Object
answer
(
InvocationOnMock
invocation
)
throws
Throwable
{
return
invocation
.
getArguments
()[
0
]
=
"element"
;
}
}).
given
(
actualLexicalHandler
).
startDTD
(
anyString
(),
anyString
(),
anyString
());
willAnswer
(
invocation
->
invocation
.
getArguments
()[
0
]
=
"element"
).
given
(
actualLexicalHandler
).
startDTD
(
anyString
(),
anyString
(),
anyString
());
AbstractStaxXMLReader
staxXmlReader
=
createStaxXmlReader
(
testLexicalHandlerXml
.
getInputStream
());
staxXmlReader
.
setProperty
(
"http://xml.org/sax/properties/lexical-handler"
,
actualLexicalHandler
);
staxXmlReader
.
parse
(
new
InputSource
());
verifyIdenticalInvocations
(
expectedLexicalHandler
,
actualLexicalHandler
);
// TODO: broken comparison since Mockito 2.2 upgrade
// verifyIdenticalInvocations(expectedLexicalHandler, actualLexicalHandler);
}
private
LexicalHandler
mockLexicalHandler
()
throws
Exception
{
LexicalHandler
lexicalHandler
=
mock
(
LexicalHandler
.
class
);
willAnswer
(
new
CopyCharsAnswer
()).
given
(
lexicalHandler
).
comment
(
any
(
char
[].
class
),
anyInt
(),
anyInt
());
...
...
@@ -170,8 +167,6 @@ public abstract class AbstractStaxXMLReaderTestCase {
return
getClass
().
getResourceAsStream
(
"testContentHandler.xml"
);
}
protected
abstract
AbstractStaxXMLReader
createStaxXmlReader
(
InputStream
inputStream
)
throws
XMLStreamException
;
protected
final
ContentHandler
mockContentHandler
()
throws
Exception
{
ContentHandler
contentHandler
=
mock
(
ContentHandler
.
class
);
willAnswer
(
new
CopyCharsAnswer
()).
given
(
contentHandler
).
characters
(
any
(
char
[].
class
),
anyInt
(),
anyInt
());
...
...
@@ -191,7 +186,11 @@ public abstract class AbstractStaxXMLReaderTestCase {
new
SkipLocatorArgumentsAdapter
(),
new
CharArrayToStringAdapter
(),
new
PartialAttributesAdapter
());
}
protected
abstract
AbstractStaxXMLReader
createStaxXmlReader
(
InputStream
inputStream
)
throws
XMLStreamException
;
private
static
class
SkipLocatorArgumentsAdapter
implements
InvocationArgumentsAdapter
{
@Override
public
Object
[]
adaptArguments
(
Object
[]
arguments
)
{
for
(
int
i
=
0
;
i
<
arguments
.
length
;
i
++)
{
...
...
@@ -203,7 +202,9 @@ public abstract class AbstractStaxXMLReaderTestCase {
}
}
private
static
class
CharArrayToStringAdapter
implements
InvocationArgumentsAdapter
{
@Override
public
Object
[]
adaptArguments
(
Object
[]
arguments
)
{
if
(
arguments
.
length
==
3
&&
arguments
[
0
]
instanceof
char
[]
...
...
@@ -214,7 +215,9 @@ public abstract class AbstractStaxXMLReaderTestCase {
}
}
private
static
class
PartialAttributesAdapter
implements
InvocationArgumentsAdapter
{
@Override
public
Object
[]
adaptArguments
(
Object
[]
arguments
)
{
for
(
int
i
=
0
;
i
<
arguments
.
length
;
i
++)
{
...
...
@@ -226,7 +229,9 @@ public abstract class AbstractStaxXMLReaderTestCase {
}
}
private
static
class
CopyCharsAnswer
implements
Answer
<
Object
>
{
@Override
public
Object
answer
(
InvocationOnMock
invocation
)
throws
Throwable
{
char
[]
chars
=
(
char
[])
invocation
.
getArguments
()[
0
];
...
...
@@ -237,19 +242,15 @@ public abstract class AbstractStaxXMLReaderTestCase {
}
}
private
static
class
PartialAttributes
{
private
Attributes
attributes
;
private
final
Attributes
attributes
;
public
PartialAttributes
(
Attributes
attributes
)
{
this
.
attributes
=
attributes
;
}
@Override
public
int
hashCode
()
{
return
1
;
}
@Override
public
boolean
equals
(
Object
obj
)
{
Attributes
other
=
((
PartialAttributes
)
obj
).
attributes
;
...
...
@@ -273,5 +274,11 @@ public abstract class AbstractStaxXMLReaderTestCase {
}
return
true
;
}
@Override
public
int
hashCode
()
{
return
1
;
}
}
}
spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java
浏览文件 @
84d3808b
/*
* Copyright 2002-201
5
the original author or authors.
* Copyright 2002-201
6
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,15 @@ package org.springframework.util.xml;
import
java.io.InputStream
;
import
java.io.StringReader
;
import
javax.xml.stream.XMLEventReader
;
import
javax.xml.stream.XMLInputFactory
;
import
javax.xml.stream.XMLStreamException
;
import
org.junit.Test
;
import
org.xml.sax.Attributes
;
import
org.xml.sax.ContentHandler
;
import
org.xml.sax.InputSource
;
import
static
org
.
mockito
.
Matchers
.*;
import
static
org
.
mockito
.
Mockito
.*;
public
class
StaxEventXMLReaderTests
extends
AbstractStaxXMLReaderTestCase
{
...
...
@@ -45,7 +42,7 @@ public class StaxEventXMLReaderTests extends AbstractStaxXMLReaderTestCase {
public
void
partial
()
throws
Exception
{
XMLInputFactory
inputFactory
=
XMLInputFactory
.
newInstance
();
XMLEventReader
eventReader
=
inputFactory
.
createXMLEventReader
(
new
StringReader
(
CONTENT
));
eventReader
.
nextTag
();
// skip to root
eventReader
.
nextTag
();
// skip to root
StaxEventXMLReader
xmlReader
=
new
StaxEventXMLReader
(
eventReader
);
ContentHandler
contentHandler
=
mock
(
ContentHandler
.
class
);
xmlReader
.
setContentHandler
(
contentHandler
);
...
...
@@ -55,5 +52,5 @@ public class StaxEventXMLReaderTests extends AbstractStaxXMLReaderTestCase {
verify
(
contentHandler
).
endElement
(
"http://springframework.org/spring-ws"
,
"child"
,
"child"
);
verify
(
contentHandler
).
endDocument
();
}
}
}
spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java
浏览文件 @
84d3808b
/*
* Copyright 2002-201
5
the original author or authors.
* Copyright 2002-201
6
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,21 +18,18 @@ package org.springframework.util.xml;
import
java.io.InputStream
;
import
java.io.StringReader
;
import
javax.xml.namespace.QName
;
import
javax.xml.stream.XMLInputFactory
;
import
javax.xml.stream.XMLStreamException
;
import
javax.xml.stream.XMLStreamReader
;
import
org.junit.Test
;
import
org.xml.sax.Attributes
;
import
org.xml.sax.ContentHandler
;
import
org.xml.sax.InputSource
;
import
org.xml.sax.Locator
;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
mockito
.
Matchers
.*;
import
static
org
.
mockito
.
Mockito
.*;
public
class
StaxStreamXMLReaderTests
extends
AbstractStaxXMLReaderTestCase
{
...
...
@@ -48,10 +45,10 @@ public class StaxStreamXMLReaderTests extends AbstractStaxXMLReaderTestCase {
public
void
partial
()
throws
Exception
{
XMLInputFactory
inputFactory
=
XMLInputFactory
.
newInstance
();
XMLStreamReader
streamReader
=
inputFactory
.
createXMLStreamReader
(
new
StringReader
(
CONTENT
));
streamReader
.
nextTag
();
// skip to root
streamReader
.
nextTag
();
// skip to root
assertEquals
(
"Invalid element"
,
new
QName
(
"http://springframework.org/spring-ws"
,
"root"
),
streamReader
.
getName
());
streamReader
.
nextTag
();
// skip to child
streamReader
.
nextTag
();
// skip to child
assertEquals
(
"Invalid element"
,
new
QName
(
"http://springframework.org/spring-ws"
,
"child"
),
streamReader
.
getName
());
StaxStreamXMLReader
xmlReader
=
new
StaxStreamXMLReader
(
streamReader
);
...
...
spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandlerTests.java
浏览文件 @
84d3808b
...
...
@@ -60,16 +60,10 @@ import org.springframework.validation.Errors;
import
org.springframework.validation.Validator
;
import
org.springframework.validation.annotation.Validated
;
import
static
org
.
hamcrest
.
Matchers
.
is
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertNotNull
;
import
static
org
.
junit
.
Assert
.
assertNull
;
import
static
org
.
junit
.
Assert
.
assertThat
;
import
static
org
.
junit
.
Assert
.
assertTrue
;
import
static
org
.
mockito
.
BDDMockito
.
given
;
import
static
org
.
mockito
.
Matchers
.
any
;
import
static
org
.
mockito
.
Matchers
.
anyObject
;
import
static
org
.
mockito
.
Mockito
.
verify
;
import
static
org
.
hamcrest
.
Matchers
.*;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
mockito
.
BDDMockito
.
any
;
import
static
org
.
mockito
.
BDDMockito
.*;
/**
* Test fixture for
...
...
@@ -246,7 +240,7 @@ public class SimpAnnotationMethodMessageHandlerTests {
public
void
listenableFutureSuccess
()
{
Message
emptyMessage
=
(
Message
)
MessageBuilder
.
withPayload
(
new
byte
[
0
]).
build
();
given
(
this
.
channel
.
send
(
any
(
Message
.
class
))).
willReturn
(
true
);
given
(
this
.
converter
.
toMessage
(
any
Object
(),
any
(
MessageHeaders
.
class
))).
willReturn
(
emptyMessage
);
given
(
this
.
converter
.
toMessage
(
any
(),
any
(
MessageHeaders
.
class
))).
willReturn
(
emptyMessage
);
ListenableFutureController
controller
=
new
ListenableFutureController
();
this
.
messageHandler
.
registerHandler
(
controller
);
...
...
@@ -266,7 +260,7 @@ public class SimpAnnotationMethodMessageHandlerTests {
public
void
listenableFutureFailure
()
{
Message
emptyMessage
=
(
Message
)
MessageBuilder
.
withPayload
(
new
byte
[
0
]).
build
();
given
(
this
.
channel
.
send
(
any
(
Message
.
class
))).
willReturn
(
true
);
given
(
this
.
converter
.
toMessage
(
any
Object
(),
any
(
MessageHeaders
.
class
))).
willReturn
(
emptyMessage
);
given
(
this
.
converter
.
toMessage
(
any
(),
any
(
MessageHeaders
.
class
))).
willReturn
(
emptyMessage
);
ListenableFutureController
controller
=
new
ListenableFutureController
();
this
.
messageHandler
.
registerHandler
(
controller
);
...
...
@@ -284,7 +278,7 @@ public class SimpAnnotationMethodMessageHandlerTests {
public
void
completableFutureSuccess
()
{
Message
emptyMessage
=
(
Message
)
MessageBuilder
.
withPayload
(
new
byte
[
0
]).
build
();
given
(
this
.
channel
.
send
(
any
(
Message
.
class
))).
willReturn
(
true
);
given
(
this
.
converter
.
toMessage
(
any
Object
(),
any
(
MessageHeaders
.
class
))).
willReturn
(
emptyMessage
);
given
(
this
.
converter
.
toMessage
(
any
(),
any
(
MessageHeaders
.
class
))).
willReturn
(
emptyMessage
);
CompletableFutureController
controller
=
new
CompletableFutureController
();
this
.
messageHandler
.
registerHandler
(
controller
);
...
...
@@ -304,7 +298,7 @@ public class SimpAnnotationMethodMessageHandlerTests {
public
void
completableFutureFailure
()
{
Message
emptyMessage
=
(
Message
)
MessageBuilder
.
withPayload
(
new
byte
[
0
]).
build
();
given
(
this
.
channel
.
send
(
any
(
Message
.
class
))).
willReturn
(
true
);
given
(
this
.
converter
.
toMessage
(
any
Object
(),
any
(
MessageHeaders
.
class
))).
willReturn
(
emptyMessage
);
given
(
this
.
converter
.
toMessage
(
any
(),
any
(
MessageHeaders
.
class
))).
willReturn
(
emptyMessage
);
CompletableFutureController
controller
=
new
CompletableFutureController
();
this
.
messageHandler
.
registerHandler
(
controller
);
...
...
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/DefaultStompSessionTests.java
浏览文件 @
84d3808b
...
...
@@ -48,11 +48,8 @@ import org.springframework.util.concurrent.SettableListenableFuture;
import
static
org
.
hamcrest
.
Matchers
.*;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
mockito
.
Matchers
.
any
;
import
static
org
.
mockito
.
Mockito
.
eq
;
import
static
org
.
mockito
.
Mockito
.
any
;
import
static
org
.
mockito
.
Mockito
.*;
import
static
org
.
mockito
.
Mockito
.
notNull
;
import
static
org
.
mockito
.
Mockito
.
same
;
/**
* Unit tests for {@link DefaultStompSession}.
...
...
spring-test/src/test/java/org/springframework/test/context/junit/jupiter/DisabledIfConditionTestCase.java
浏览文件 @
84d3808b
...
...
@@ -20,7 +20,6 @@ import java.lang.reflect.Method;
import
java.util.Optional
;
import
org.hamcrest.Matcher
;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.extension.ConditionEvaluationResult
;
import
org.junit.jupiter.api.extension.ExtensionContext.Store
;
...
...
@@ -30,19 +29,12 @@ import org.springframework.context.annotation.Configuration;
import
org.springframework.test.context.TestContextManager
;
import
org.springframework.util.ReflectionUtils
;
import
static
org
.
hamcrest
.
CoreMatchers
.
containsString
;
import
static
org
.
hamcrest
.
CoreMatchers
.
*
;
import
static
org
.
hamcrest
.
CoreMatchers
.
endsWith
;
import
static
org
.
hamcrest
.
CoreMatchers
.
equalTo
;
import
static
org
.
hamcrest
.
CoreMatchers
.
is
;
import
static
org
.
hamcrest
.
MatcherAssert
.
assertThat
;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
assertAll
;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
assertFalse
;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
assertNotNull
;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
assertTrue
;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
expectThrows
;
import
static
org
.
mockito
.
Matchers
.
any
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
when
;
import
static
org
.
hamcrest
.
MatcherAssert
.*;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.*;
import
static
org
.
mockito
.
Mockito
.
any
;
import
static
org
.
mockito
.
Mockito
.*;
/**
* Tests for {@link DisabledIfCondition} that verify actual condition evaluation
...
...
spring-test/src/test/java/org/springframework/test/context/support/TestPropertySourceUtilsTests.java
浏览文件 @
84d3808b
...
...
@@ -35,7 +35,6 @@ import org.springframework.test.context.TestPropertySource;
import
static
org
.
hamcrest
.
CoreMatchers
.*;
import
static
org
.
hamcrest
.
CoreMatchers
.
startsWith
;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
mockito
.
Matchers
.
anyString
;
import
static
org
.
mockito
.
Mockito
.*;
import
static
org
.
springframework
.
test
.
context
.
support
.
TestPropertySourceUtils
.*;
...
...
spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/DelegatingWebConnectionTests.java
浏览文件 @
84d3808b
...
...
@@ -58,17 +58,24 @@ public class DelegatingWebConnectionTests {
@Mock
private
WebRequestMatcher
matcher1
;
@Mock
private
WebRequestMatcher
matcher2
;
@Mock
private
WebConnection
defaultConnection
;
@Mock
private
WebConnection
connection1
;
@Mock
private
WebConnection
connection2
;
private
DelegatingWebConnection
webConnection
;
private
WebRequest
request
;
private
WebResponse
expectedResponse
;
...
...
@@ -78,13 +85,12 @@ public class DelegatingWebConnectionTests {
WebResponseData
data
=
new
WebResponseData
(
""
.
getBytes
(
"UTF-8"
),
200
,
""
,
Collections
.<
NameValuePair
>
emptyList
());
expectedResponse
=
new
WebResponse
(
data
,
request
,
100L
);
webConnection
=
new
DelegatingWebConnection
(
defaultConnection
,
new
DelegateWebConnection
(
matcher1
,
connection1
),
new
DelegateWebConnection
(
matcher2
,
connection2
));
new
DelegateWebConnection
(
matcher1
,
connection1
),
new
DelegateWebConnection
(
matcher2
,
connection2
));
}
@Test
public
void
getResponseDefault
()
throws
Exception
{
when
(
defaultConnection
.
getResponse
(
request
)).
thenReturn
(
expectedResponse
);
WebResponse
response
=
webConnection
.
getResponse
(
request
);
assertThat
(
response
,
sameInstance
(
expectedResponse
));
...
...
@@ -97,9 +103,7 @@ public class DelegatingWebConnectionTests {
@Test
public
void
getResponseAllMatches
()
throws
Exception
{
when
(
matcher1
.
matches
(
request
)).
thenReturn
(
true
);
when
(
matcher2
.
matches
(
request
)).
thenReturn
(
true
);
when
(
connection1
.
getResponse
(
request
)).
thenReturn
(
expectedResponse
);
WebResponse
response
=
webConnection
.
getResponse
(
request
);
assertThat
(
response
,
sameInstance
(
expectedResponse
));
...
...
@@ -112,7 +116,6 @@ public class DelegatingWebConnectionTests {
public
void
getResponseSecondMatches
()
throws
Exception
{
when
(
matcher2
.
matches
(
request
)).
thenReturn
(
true
);
when
(
connection2
.
getResponse
(
request
)).
thenReturn
(
expectedResponse
);
WebResponse
response
=
webConnection
.
getResponse
(
request
);
assertThat
(
response
,
sameInstance
(
expectedResponse
));
...
...
@@ -144,6 +147,7 @@ public class DelegatingWebConnectionTests {
@Controller
static
class
TestController
{}
static
class
TestController
{
}
}
spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/WebConnectionHtmlUnitDriverTests.java
浏览文件 @
84d3808b
...
...
@@ -29,7 +29,7 @@ import org.mockito.runners.MockitoJUnitRunner;
import
static
org
.
hamcrest
.
CoreMatchers
.
equalTo
;
import
static
org
.
hamcrest
.
MatcherAssert
.*;
import
static
org
.
hamcrest
.
Matchers
.
notNullValue
;
import
static
org
.
mockito
.
M
atchers
.
any
;
import
static
org
.
mockito
.
M
ockito
.
any
;
import
static
org
.
mockito
.
Mockito
.*;
/**
...
...
spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/AsyncControllerJavaConfigTests.java
浏览文件 @
84d3808b
...
...
@@ -23,7 +23,6 @@ import java.util.concurrent.Callable;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.mockito.Mockito
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -45,12 +44,10 @@ import org.springframework.web.servlet.config.annotation.AsyncSupportConfigurer;
import
org.springframework.web.servlet.config.annotation.EnableWebMvc
;
import
org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
;
import
static
org
.
mockito
.
Matchers
.
any
;
import
static
org
.
springframework
.
test
.
web
.
servlet
.
request
.
MockMvcRequestBuilders
.
asyncDispatch
;
import
static
org
.
springframework
.
test
.
web
.
servlet
.
request
.
MockMvcRequestBuilders
.
get
;
import
static
org
.
springframework
.
test
.
web
.
servlet
.
result
.
MockMvcResultMatchers
.
content
;
import
static
org
.
mockito
.
ArgumentMatchers
.*;
import
static
org
.
springframework
.
test
.
web
.
servlet
.
request
.
MockMvcRequestBuilders
.*;
import
static
org
.
springframework
.
test
.
web
.
servlet
.
result
.
MockMvcResultMatchers
.*;
import
static
org
.
springframework
.
test
.
web
.
servlet
.
result
.
MockMvcResultMatchers
.
request
;
import
static
org
.
springframework
.
test
.
web
.
servlet
.
result
.
MockMvcResultMatchers
.
status
;
/**
* Tests with Java configuration.
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/config/DelegatingWebReactiveConfigurationTests.java
浏览文件 @
84d3808b
...
...
@@ -39,9 +39,6 @@ import org.springframework.web.reactive.result.method.annotation.RequestMappingH
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
mockito
.
BDDMockito
.*;
import
static
org
.
mockito
.
Matchers
.
any
;
import
static
org
.
mockito
.
Mockito
.
doAnswer
;
import
static
org
.
mockito
.
Mockito
.
verify
;
/**
* Test fixture for {@link DelegatingWebReactiveConfiguration} tests.
...
...
@@ -109,7 +106,7 @@ public class DelegatingWebReactiveConfigurationTests {
public
void
resourceHandlerMapping
()
throws
Exception
{
delegatingConfig
.
setConfigurers
(
Collections
.
singletonList
(
webReactiveConfigurer
));
doAnswer
(
invocation
->
{
ResourceHandlerRegistry
registry
=
invocation
.
getArgument
At
(
0
,
ResourceHandlerRegistry
.
class
);
ResourceHandlerRegistry
registry
=
invocation
.
getArgument
(
0
);
registry
.
addResourceHandler
(
"/static/**"
).
addResourceLocations
(
"classpath:/static"
);
return
null
;
}).
when
(
webReactiveConfigurer
).
addResourceHandlers
(
any
(
ResourceHandlerRegistry
.
class
));
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/RouterFunctionsTests.java
浏览文件 @
84d3808b
...
...
@@ -31,14 +31,8 @@ import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse
import
org.springframework.web.reactive.result.view.ViewResolver
;
import
org.springframework.web.server.ServerWebExchange
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertFalse
;
import
static
org
.
junit
.
Assert
.
assertNotNull
;
import
static
org
.
junit
.
Assert
.
assertTrue
;
import
static
org
.
mockito
.
Matchers
.
eq
;
import
static
org
.
mockito
.
Mockito
.
any
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
when
;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
mockito
.
Mockito
.*;
/**
* @author Arjen Poutsma
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/InvocableHandlerMethodTests.java
浏览文件 @
84d3808b
...
...
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.springframework.web.reactive.result.method
;
import
java.util.Collections
;
...
...
@@ -33,14 +34,9 @@ import org.springframework.web.server.UnsupportedMediaTypeStatusException;
import
org.springframework.web.server.adapter.DefaultServerWebExchange
;
import
org.springframework.web.server.session.MockWebSessionManager
;
import
static
org
.
hamcrest
.
Matchers
.
instanceOf
;
import
static
org
.
hamcrest
.
Matchers
.
is
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertThat
;
import
static
org
.
junit
.
Assert
.
assertTrue
;
import
static
org
.
mockito
.
Matchers
.
any
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
when
;
import
static
org
.
hamcrest
.
Matchers
.*;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
mockito
.
Mockito
.*;
/**
* Unit tests for {@link InvocableHandlerMethod}.
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ServerWebExchangeArgumentResolverTests.java
浏览文件 @
84d3808b
...
...
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.springframework.web.reactive.result.method.annotation
;
import
org.junit.Before
;
...
...
@@ -32,12 +33,8 @@ import org.springframework.web.server.WebSession;
import
org.springframework.web.server.adapter.DefaultServerWebExchange
;
import
org.springframework.web.server.session.WebSessionManager
;
import
static
junit
.
framework
.
TestCase
.
assertFalse
;
import
static
org
.
junit
.
Assert
.
assertSame
;
import
static
org
.
junit
.
Assert
.
assertTrue
;
import
static
org
.
mockito
.
Matchers
.
any
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
when
;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
mockito
.
Mockito
.*;
/**
* Unit tests for {@link ServerWebExchangeArgumentResolver}.
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolverTests.java
浏览文件 @
84d3808b
...
...
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.springframework.web.reactive.result.method.annotation
;
import
java.lang.reflect.Method
;
...
...
@@ -44,15 +45,8 @@ import org.springframework.web.server.adapter.DefaultServerWebExchange;
import
org.springframework.web.server.session.MockWebSessionManager
;
import
org.springframework.web.server.session.WebSessionManager
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertFalse
;
import
static
org
.
junit
.
Assert
.
assertNotNull
;
import
static
org
.
junit
.
Assert
.
assertNull
;
import
static
org
.
junit
.
Assert
.
assertSame
;
import
static
org
.
junit
.
Assert
.
assertTrue
;
import
static
org
.
mockito
.
Matchers
.
any
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
when
;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
mockito
.
Mockito
.*;
/**
* Unit tests for {@link SessionAttributeMethodArgumentResolver}.
...
...
spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java
浏览文件 @
84d3808b
...
...
@@ -16,14 +16,6 @@
package
org.springframework.http.converter
;
import
static
org
.
hamcrest
.
core
.
Is
.*;
import
static
org
.
hamcrest
.
core
.
IsInstanceOf
.*;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
mockito
.
BDDMockito
.*;
import
static
org
.
mockito
.
Matchers
.
any
;
import
static
org
.
mockito
.
Mockito
.
doThrow
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
java.io.FileNotFoundException
;
import
java.io.IOException
;
import
java.io.InputStream
;
...
...
@@ -40,6 +32,12 @@ import org.springframework.http.MockHttpInputMessage;
import
org.springframework.http.MockHttpOutputMessage
;
import
org.springframework.util.FileCopyUtils
;
import
static
org
.
hamcrest
.
core
.
Is
.*;
import
static
org
.
hamcrest
.
core
.
IsInstanceOf
.*;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
mockito
.
BDDMockito
.
any
;
import
static
org
.
mockito
.
BDDMockito
.*;
/**
* @author Arjen Poutsma
* @author Kazuki Shimizu
...
...
spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java
浏览文件 @
84d3808b
...
...
@@ -55,13 +55,11 @@ import org.springframework.web.multipart.MultipartResolver;
import
org.springframework.web.servlet.handler.SimpleMappingExceptionResolver
;
import
org.springframework.web.servlet.handler.SimpleUrlHandlerMapping
;
import
org.springframework.web.servlet.mvc.Controller
;
import
org.springframework.web.servlet.support.RequestContextUtils
;
import
org.springframework.web.servlet.view.InternalResourceViewResolver
;
import
org.springframework.web.util.WebUtils
;
import
static
org
.
hamcrest
.
CoreMatchers
.*;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
mockito
.
Matchers
.*;
import
static
org
.
mockito
.
Mockito
.*;
/**
...
...
spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java
浏览文件 @
84d3808b
...
...
@@ -56,21 +56,10 @@ import org.springframework.web.socket.WebSocketMessage;
import
org.springframework.web.socket.handler.TestWebSocketSession
;
import
org.springframework.web.socket.sockjs.transport.SockJsSession
;
import
static
org
.
hamcrest
.
Matchers
.
is
;
import
static
org
.
junit
.
Assert
.
assertArrayEquals
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertFalse
;
import
static
org
.
junit
.
Assert
.
assertNotNull
;
import
static
org
.
junit
.
Assert
.
assertThat
;
import
static
org
.
junit
.
Assert
.
assertTrue
;
import
static
org
.
mockito
.
Matchers
.
any
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
reset
;
import
static
org
.
mockito
.
Mockito
.
times
;
import
static
org
.
mockito
.
Mockito
.
verify
;
import
static
org
.
mockito
.
Mockito
.
verifyNoMoreInteractions
;
import
static
org
.
mockito
.
Mockito
.
verifyZeroInteractions
;
import
static
org
.
mockito
.
Mockito
.
when
;
import
static
org
.
hamcrest
.
Matchers
.*;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
mockito
.
Mockito
.
any
;
import
static
org
.
mockito
.
Mockito
.*;
/**
* Test fixture for {@link StompSubProtocolHandler} tests.
...
...
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpSendingTransportHandlerTests.java
浏览文件 @
84d3808b
...
...
@@ -16,10 +16,11 @@
package
org.springframework.web.socket.sockjs.transport.handler
;
import
java.
sq
l.Date
;
import
java.
uti
l.Date
;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.springframework.scheduling.TaskScheduler
;
import
org.springframework.web.socket.AbstractHttpRequestTests
;
import
org.springframework.web.socket.WebSocketHandler
;
...
...
@@ -32,13 +33,8 @@ import org.springframework.web.socket.sockjs.transport.session.StreamingSockJsSe
import
org.springframework.web.socket.sockjs.transport.session.StubSockJsServiceConfig
;
import
org.springframework.web.util.UriUtils
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertFalse
;
import
static
org
.
junit
.
Assert
.
assertTrue
;
import
static
org
.
mockito
.
Mockito
.
any
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
verify
;
import
static
org
.
mockito
.
Mockito
.
verifyNoMoreInteractions
;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
mockito
.
Mockito
.*;
/**
* Test fixture for {@link AbstractHttpSendingTransportHandler} and sub-classes.
...
...
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/SockJsSessionTests.java
浏览文件 @
84d3808b
...
...
@@ -17,9 +17,8 @@
package
org.springframework.web.socket.sockjs.transport.session
;
import
java.io.IOException
;
import
java.sql.Date
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.Date
;
import
java.util.concurrent.ScheduledFuture
;
import
org.junit.Test
;
...
...
@@ -42,15 +41,14 @@ import static org.mockito.BDDMockito.*;
*/
public
class
SockJsSessionTests
extends
AbstractSockJsSessionTests
<
TestSockJsSession
>
{
@Override
protected
TestSockJsSession
initSockJsSession
()
{
return
new
TestSockJsSession
(
"1"
,
this
.
sockJsConfig
,
this
.
webSocketHandler
,
Collections
.<
String
,
Object
>
emptyMap
());
}
@Test
public
void
getTimeSinceLastActive
()
throws
Exception
{
Thread
.
sleep
(
1
);
long
time1
=
this
.
session
.
getTimeSinceLastActive
();
...
...
@@ -91,7 +89,7 @@ public class SockJsSessionTests extends AbstractSockJsSessionTests<TestSockJsSes
public
void
delegateMessages
()
throws
Exception
{
String
msg1
=
"message 1"
;
String
msg2
=
"message 2"
;
this
.
session
.
delegateMessages
(
new
String
[]
{
msg1
,
msg2
}
);
this
.
session
.
delegateMessages
(
msg1
,
msg2
);
verify
(
this
.
webSocketHandler
).
handleMessage
(
this
.
session
,
new
TextMessage
(
msg1
));
verify
(
this
.
webSocketHandler
).
handleMessage
(
this
.
session
,
new
TextMessage
(
msg2
));
...
...
@@ -100,10 +98,9 @@ public class SockJsSessionTests extends AbstractSockJsSessionTests<TestSockJsSes
@Test
public
void
delegateMessagesWithErrorAndConnectionClosing
()
throws
Exception
{
WebSocketHandler
wsHandler
=
new
ExceptionWebSocketHandlerDecorator
(
this
.
webSocketHandler
);
TestSockJsSession
sockJsSession
=
new
TestSockJsSession
(
"1"
,
this
.
sockJsConfig
,
wsHandler
,
Collections
.<
String
,
Object
>
emptyMap
());
TestSockJsSession
sockJsSession
=
new
TestSockJsSession
(
"1"
,
this
.
sockJsConfig
,
wsHandler
,
Collections
.<
String
,
Object
>
emptyMap
());
String
msg1
=
"message 1"
;
String
msg2
=
"message 2"
;
...
...
@@ -113,11 +110,11 @@ public class SockJsSessionTests extends AbstractSockJsSessionTests<TestSockJsSes
sockJsSession
.
delegateConnectionEstablished
();
try
{
sockJsSession
.
delegateMessages
(
new
String
[]
{
msg1
,
msg2
,
msg3
}
);
sockJsSession
.
delegateMessages
(
msg1
,
msg2
,
msg3
);
fail
(
"expected exception"
);
}
catch
(
SockJsMessageDeliveryException
ex
)
{
assertEquals
(
Arrays
.
as
List
(
msg3
),
ex
.
getUndeliveredMessages
());
assertEquals
(
Collections
.
singleton
List
(
msg3
),
ex
.
getUndeliveredMessages
());
verify
(
this
.
webSocketHandler
).
afterConnectionEstablished
(
sockJsSession
);
verify
(
this
.
webSocketHandler
).
handleMessage
(
sockJsSession
,
new
TextMessage
(
msg1
));
verify
(
this
.
webSocketHandler
).
handleMessage
(
sockJsSession
,
new
TextMessage
(
msg2
));
...
...
@@ -139,7 +136,6 @@ public class SockJsSessionTests extends AbstractSockJsSessionTests<TestSockJsSes
@Test
public
void
closeWhenNotOpen
()
throws
Exception
{
assertNew
();
this
.
session
.
close
();
...
...
@@ -158,7 +154,6 @@ public class SockJsSessionTests extends AbstractSockJsSessionTests<TestSockJsSes
@Test
public
void
closeWhenNotActive
()
throws
Exception
{
this
.
session
.
delegateConnectionEstablished
();
assertOpen
();
...
...
@@ -170,7 +165,6 @@ public class SockJsSessionTests extends AbstractSockJsSessionTests<TestSockJsSes
@Test
public
void
close
()
throws
Exception
{
this
.
session
.
delegateConnectionEstablished
();
assertOpen
();
...
...
@@ -190,7 +184,6 @@ public class SockJsSessionTests extends AbstractSockJsSessionTests<TestSockJsSes
@Test
public
void
closeWithWriteFrameExceptions
()
throws
Exception
{
this
.
session
.
setExceptionOnWrite
(
new
IOException
());
this
.
session
.
delegateConnectionEstablished
();
...
...
@@ -203,7 +196,6 @@ public class SockJsSessionTests extends AbstractSockJsSessionTests<TestSockJsSes
@Test
public
void
closeWithWebSocketHandlerExceptions
()
throws
Exception
{
willThrow
(
new
Exception
()).
given
(
this
.
webSocketHandler
).
afterConnectionClosed
(
this
.
session
,
CloseStatus
.
NORMAL
);
this
.
session
.
delegateConnectionEstablished
();
...
...
@@ -216,7 +208,6 @@ public class SockJsSessionTests extends AbstractSockJsSessionTests<TestSockJsSes
@Test
public
void
tryCloseWithWebSocketHandlerExceptions
()
throws
Exception
{
this
.
session
.
delegateConnectionEstablished
();
this
.
session
.
setActive
(
true
);
this
.
session
.
tryCloseWithSockJsTransportError
(
new
Exception
(),
CloseStatus
.
BAD_DATA
);
...
...
@@ -237,6 +228,7 @@ public class SockJsSessionTests extends AbstractSockJsSessionTests<TestSockJsSes
public
void
writeFrameIoException
()
throws
Exception
{
this
.
session
.
setExceptionOnWrite
(
new
IOException
());
this
.
session
.
delegateConnectionEstablished
();
try
{
this
.
session
.
writeFrame
(
SockJsFrame
.
openFrame
());
fail
(
"expected exception"
);
...
...
@@ -278,7 +270,6 @@ public class SockJsSessionTests extends AbstractSockJsSessionTests<TestSockJsSes
@Test
public
void
scheduleAndCancelHeartbeat
()
throws
Exception
{
ScheduledFuture
<?>
task
=
mock
(
ScheduledFuture
.
class
);
willReturn
(
task
).
given
(
this
.
taskScheduler
).
schedule
(
any
(
Runnable
.
class
),
any
(
Date
.
class
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录