[SYNCOPE-1016] Fixing test exec
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b170c261 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b170c261 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b170c261 Branch: refs/heads/2_0_X Commit: b170c261a64a12eea7bbacde628261d60ad61511 Parents: e5963f4 Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Thu Feb 16 09:30:23 2017 +0100 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Thu Feb 16 09:30:23 2017 +0100 ---------------------------------------------------------------------- .../syncope/core/persistence/jpa/entity/PlainAttrListener.java | 6 ++++-- .../apache/syncope/core/persistence/jpa/outer/UserTest.java | 4 ++-- .../src/test/java/org/apache/syncope/fit/core/GroupITCase.java | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/b170c261/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/PlainAttrListener.java ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/PlainAttrListener.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/PlainAttrListener.java index 6471ecd..a3aa93a 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/PlainAttrListener.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/PlainAttrListener.java @@ -27,7 +27,9 @@ public class PlainAttrListener extends AbstractSysInfoListener { @PrePersist @PreUpdate public void setSysInfoOnOwner(final PlainAttr<?> plainAttr) { - LOG.debug("Set system properties for owner of '{}'", plainAttr); - setSysInfoOnAnnotatedEntity(plainAttr.getOwner()); + if (plainAttr.getOwner() != null) { + LOG.debug("Set system properties for owner of '{}'", plainAttr); + setSysInfoOnAnnotatedEntity(plainAttr.getOwner()); + } } } http://git-wip-us.apache.org/repos/asf/syncope/blob/b170c261/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/UserTest.java ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/UserTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/UserTest.java index f9f02ba..0f915ea 100644 --- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/UserTest.java +++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/UserTest.java @@ -271,7 +271,7 @@ public class UserTest extends AbstractTest { @Test public void issueSYNCOPE1016() { - User user = userDAO.findByUsername("vivaldi"); + User user = userDAO.findByUsername("rossini"); Date initial = user.getLastChangeDate(); assertNotNull(initial); @@ -285,7 +285,7 @@ public class UserTest extends AbstractTest { userDAO.flush(); - user = userDAO.findByUsername("vivaldi"); + user = userDAO.findByUsername("rossini"); Date afterwards = user.getLastChangeDate(); assertNotNull(afterwards); http://git-wip-us.apache.org/repos/asf/syncope/blob/b170c261/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java index 0e94b58..2295fc8 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java @@ -1036,6 +1036,7 @@ public class GroupITCase extends AbstractITCase { assertEquals("11.23", groupTO.getPlainAttrMap().get(doubleSchemaName).getValues().get(0)); // 3. update schema, set conversion pattern + schema = schemaService.read(SchemaType.PLAIN, schema.getKey()); schema.setConversionPattern("0.000"); schemaService.update(SchemaType.PLAIN, schema);
