Merge branch '1.5.x'

pull/8063/merge
Andy Wilkinson 8 years ago
commit 923393d5af

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -224,7 +224,7 @@ public class TestEntityManager {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public <T> T getId(Object entity, Class<T> idType) { public <T> T getId(Object entity, Class<T> idType) {
Object id = getId(entity); Object id = getId(entity);
Assert.isInstanceOf(idType, id, "ID mismatch"); Assert.isInstanceOf(idType, id, "ID mismatch:");
return (T) id; 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -191,7 +191,8 @@ public class TestEntityManagerTests {
public void getIdForTypeWhenTypeIsWrongShouldThrowException() throws Exception { public void getIdForTypeWhenTypeIsWrongShouldThrowException() throws Exception {
TestEntity entity = new TestEntity(); TestEntity entity = new TestEntity();
given(this.persistenceUnitUtil.getIdentifier(entity)).willReturn(123); given(this.persistenceUnitUtil.getIdentifier(entity)).willReturn(123);
this.thrown.expectMessage("ID mismatch: 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); this.testEntityManager.getId(entity, Long.class);
} }

Loading…
Cancel
Save