mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '1.4.x' into 1.5.x
This commit is contained in:
commit
98a2ae3b91
@ -151,7 +151,7 @@
|
||||
<snakeyaml.version>1.17</snakeyaml.version>
|
||||
<solr.version>5.5.3</solr.version>
|
||||
<spock.version>1.0-groovy-2.4</spock.version>
|
||||
<spring.version>4.3.6.RELEASE</spring.version>
|
||||
<spring.version>4.3.7.BUILD-SNAPSHOT</spring.version>
|
||||
<spring-amqp.version>1.7.0.RELEASE</spring-amqp.version>
|
||||
<spring-cloud-connectors.version>1.2.3.RELEASE</spring-cloud-connectors.version>
|
||||
<spring-batch.version>3.0.7.RELEASE</spring-batch.version>
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2016 the original author or authors.
|
||||
* Copyright 2012-2017 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.
|
||||
@ -224,7 +224,7 @@ public class TestEntityManager {
|
||||
@SuppressWarnings("unchecked")
|
||||
public <T> T getId(Object entity, Class<T> idType) {
|
||||
Object id = getId(entity);
|
||||
Assert.isInstanceOf(idType, id, "ID mismatch");
|
||||
Assert.isInstanceOf(idType, id, "ID mismatch:");
|
||||
return (T) id;
|
||||
}
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2016 the original author or authors.
|
||||
* Copyright 2012-2017 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.
|
||||
@ -191,7 +191,7 @@ public class TestEntityManagerTests {
|
||||
public void getIdForTypeWhenTypeIsWrongShouldThrowException() throws Exception {
|
||||
TestEntity entity = new TestEntity();
|
||||
given(this.persistenceUnitUtil.getIdentifier(entity)).willReturn(123);
|
||||
this.thrown.expectMessage("ID mismatch Object of class [java.lang.Integer] "
|
||||
this.thrown.expectMessage("ID mismatch: Object of class [java.lang.Integer] "
|
||||
+ "must be an instance of class java.lang.Long");
|
||||
this.testEntityManager.getId(entity, Long.class);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user