You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2016/12/14 19:12:49 UTC
[13/16] cayenne git commit: CAY-2169 - fix test failure on Java 7
CAY-2169
- fix test failure on Java 7
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/487a410e
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/487a410e
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/487a410e
Branch: refs/heads/master
Commit: 487a410ed178904c74a4daf4b865a743d3fe5c7d
Parents: 725e6ae
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Dec 12 17:57:38 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Dec 12 17:57:38 2016 +0300
----------------------------------------------------------------------
.../cayenne/dbsync/merge/DataMapMergerTest.java | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/487a410e/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/DataMapMergerTest.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/DataMapMergerTest.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/DataMapMergerTest.java
index 7bcb1c2..5196fa9 100644
--- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/DataMapMergerTest.java
+++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/DataMapMergerTest.java
@@ -32,6 +32,7 @@ import static org.apache.cayenne.dbsync.merge.builders.ObjectMother.dataMap;
import static org.apache.cayenne.dbsync.merge.builders.ObjectMother.dbAttr;
import static org.apache.cayenne.dbsync.merge.builders.ObjectMother.dbEntity;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class DataMapMergerTest {
@@ -175,18 +176,30 @@ public class DataMapMergerTest {
List<MergerToken> tokens = dbMerger().createMergeTokens(existing, db);
assertEquals(4, tokens.size());
+ for(MergerToken token : tokens) {
+ assertTrue(token instanceof SetColumnTypeToDb);
+ }
+ MergerToken attr02Token = findChangeTypeToken(tokens, "attr02");
+ assertNotNull(attr02Token);
assertEquals(
factory()
.createSetColumnTypeToDb(fromModel, fromDb.getAttribute("attr02"), fromModel.getAttribute("attr02"))
.getTokenValue(),
- tokens.get(1)
+ attr02Token
.getTokenValue()
);
+
+ }
+
+ private MergerToken findChangeTypeToken(List<MergerToken> tokens, String attributeName) {
for(MergerToken token : tokens) {
- assertTrue(token instanceof SetColumnTypeToDb);
+ if(token.getTokenValue().contains("." + attributeName)) {
+ return token;
+ }
}
+ return null;
}
@Test