Fix merge problem
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/54266618 Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/54266618 Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/54266618 Branch: refs/heads/4.6.x Commit: 54266618bab0c01959c334f90472958298cd3a1d Parents: 4e820fc Author: Dennis Du Krøger <[email protected]> Authored: Thu Aug 24 23:17:15 2017 +0200 Committer: Dennis Du Krøger <[email protected]> Committed: Thu Aug 24 23:17:15 2017 +0200 ---------------------------------------------------------------------- .../org/apache/metamodel/jdbc/integrationtests/OracleTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/54266618/jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/OracleTest.java ---------------------------------------------------------------------- diff --git a/jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/OracleTest.java b/jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/OracleTest.java index dff476f..871d556 100644 --- a/jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/OracleTest.java +++ b/jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/OracleTest.java @@ -251,8 +251,7 @@ public class OracleTest extends AbstractJdbIntegrationTest { Relationship foundRelationship = null; for (Relationship relationship : employeeTable.getRelationships(departmentsTable)) { if (relationship.toString() - .equals("Relationship[primaryTable=EMPLOYEES,primaryColumns=[EMPLOYEE_ID],foreignTable=DEPARTMENTS,foreignColumns=[MANAGER_ID]]") - { + .equals("Relationship[primaryTable=EMPLOYEES,primaryColumns=[EMPLOYEE_ID],foreignTable=DEPARTMENTS,foreignColumns=[MANAGER_ID]]")) { foundRelationship = relationship; } } assertNotNull(foundRelationship);
