Fix failing ExportedKeyLoaderIT test
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/7cd1b200 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/7cd1b200 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/7cd1b200 Branch: refs/heads/master Commit: 7cd1b2004c175193555873b858df619e9658b649 Parents: 17053f9 Author: Nikita Timofeev <stari...@gmail.com> Authored: Mon Dec 12 13:12:43 2016 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Mon Dec 12 13:12:43 2016 +0300 ---------------------------------------------------------------------- .../reverse/dbload/ExportedKeyLoaderIT.java | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/7cd1b200/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/ExportedKeyLoaderIT.java ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/ExportedKeyLoaderIT.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/ExportedKeyLoaderIT.java index 9c71159..9e74d8c 100644 --- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/ExportedKeyLoaderIT.java +++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/ExportedKeyLoaderIT.java @@ -19,11 +19,15 @@ package org.apache.cayenne.dbsync.reverse.dbload; +import java.util.Map; +import java.util.Set; + import org.apache.cayenne.map.DbAttribute; import org.apache.cayenne.map.DbEntity; import org.junit.Test; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; public class ExportedKeyLoaderIT extends BaseLoaderIT { @@ -58,9 +62,9 @@ public class ExportedKeyLoaderIT extends BaseLoaderIT { assertEquals(2, store.getExportedKeysEntrySet().size()); - ExportedKey artistIdFk = store.getExportedKeysEntrySet() - .iterator().next() - .getValue().iterator().next(); + ExportedKey artistIdFk = findArtistExportedKey(); + assertNotNull(artistIdFk); + assertEquals("ARTIST", artistIdFk.getPk().getTable()); assertEquals("ARTIST_ID", artistIdFk.getPk().getColumn()); @@ -68,4 +72,14 @@ public class ExportedKeyLoaderIT extends BaseLoaderIT { assertEquals("ARTIST_ID", artistIdFk.getFk().getColumn()); } + ExportedKey findArtistExportedKey() { + for(Map.Entry<String, Set<ExportedKey>> entry : store.getExportedKeysEntrySet()) { + if(entry.getKey().endsWith(".ARTIST_ID")) { + return entry.getValue().iterator().next(); + } + } + + return null; + } + }
