You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by md...@apache.org on 2015/12/07 09:06:24 UTC
[2/2] syncope git commit: [SYNCOPE-739] Merge from 1_2_X
[SYNCOPE-739] Merge from 1_2_X
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/dde2a124
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/dde2a124
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/dde2a124
Branch: refs/heads/master
Commit: dde2a124c809e5fb97447680192453493faa43a6
Parents: 3fa2dce
Author: Marco Di Sabatino Di Diodoro <md...@apache.org>
Authored: Fri Dec 4 17:50:41 2015 +0100
Committer: Marco Di Sabatino Di Diodoro <md...@apache.org>
Committed: Mon Dec 7 09:05:55 2015 +0100
----------------------------------------------------------------------
.../apache/syncope/core/persistence/jpa/inner/VirSchemaTest.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/dde2a124/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/VirSchemaTest.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/VirSchemaTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/VirSchemaTest.java
index 19193dd..2e99c34 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/VirSchemaTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/VirSchemaTest.java
@@ -49,7 +49,11 @@ public class VirSchemaTest extends AbstractTest {
@Test
public void findAll() {
+<<<<<<< da596533f9b9726802d360d51045a24a1cf23677:core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/VirSchemaTest.java
List<VirSchema> list = virSchemaDAO.findAll();
+=======
+ List<UVirSchema> list = virSchemaDAO.findAll(UVirSchema.class);
+>>>>>>> [SYNCOPE-739] Virtual attributes are not updated after a sync task:core/src/test/java/org/apache/syncope/core/persistence/dao/VirSchemaTest.java
assertEquals(3, list.size());
}