From b4ddbe38eea195f7c479f940ff1b8aa99a1e831c Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 1 Feb 2022 09:49:23 +1300
Subject: [PATCH] Yugabyte - Fix some tests for running against Yugabyte

---
 ebean-test/src/test/java/io/ebean/BaseTestCase.java           | 4 ++++
 .../test/java/org/tests/basic/type/TestInetAddressType.java   | 2 +-
 .../model/basic/cache/TestCacheViaComplexNaturalKey3.java     | 4 ++--
 .../elementcollection/TestElementCollectionBasicSet.java      | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ebean-test/src/test/java/io/ebean/BaseTestCase.java b/ebean-test/src/test/java/io/ebean/BaseTestCase.java
index 6e9ad234f..e7b591c3d 100644
--- a/ebean-test/src/test/java/io/ebean/BaseTestCase.java
+++ b/ebean-test/src/test/java/io/ebean/BaseTestCase.java
@@ -199,6 +199,10 @@ public abstract class BaseTestCase {
     return Platform.POSTGRES == platform().base();
   }
 
+  public boolean isYugabyte() {
+    return Platform.YUGABYTE == platform().base();
+  }
+
   public boolean isMySql() {
     return Platform.MYSQL == platform();
   }
diff --git a/ebean-test/src/test/java/org/tests/basic/type/TestInetAddressType.java b/ebean-test/src/test/java/org/tests/basic/type/TestInetAddressType.java
index ec226169b..fad06a837 100644
--- a/ebean-test/src/test/java/org/tests/basic/type/TestInetAddressType.java
+++ b/ebean-test/src/test/java/org/tests/basic/type/TestInetAddressType.java
@@ -27,7 +27,7 @@ public class TestInetAddressType extends TransactionalTestCase {
   @Test
   public void testIp6() throws UnknownHostException {
 
-    if (isPostgres()) {
+    if (isPostgres() || isYugabyte()) {
       insertUpdateDeleteFind("2001:db8:85a3:0:0:8a2e:370:7334", "2001:db8:85a3::8a2e:370:7334", "2001:4f8:3:ba::/64", "2001:4f8:3:ba::/64");
     } else {
       insertUpdateDeleteFind("2001:db8:85a3:0:0:8a2e:370:7334", "2001:db8:85a3:0:0:8a2e:370:7334", "192.168.100.128/25", "192.168.100.128/25");
diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
index b4bb8f788..38798bba1 100644
--- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
+++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
@@ -369,7 +369,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
 
     if (isH2()) {
       assertSql(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and concat(t0.sku,'-',t0.code) in (?,?) order by t0.sku desc; --bind(def,Array[2]={2-1000,3-1000})");
-    } else if (isPostgres() || isOracle() || isDb2()) {
+    } else if (isPostgres() || isOracle() || isDb2() || isYugabyte()) {
       assertSql(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and (t0.sku||'-'||t0.code)");
     } else if (isHana()) {
       assertSql(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and concat(t0.sku, '-'||t0.code)");
@@ -412,7 +412,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
 
     if (isH2()) {
       assertSql(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and concat(t0.sku,':',t0.code,'-foo') in (?,?) order by t0.sku desc; --bind(def,Array[2]={2:1000-foo,3:1000-foo})");
-    } else if (isPostgres() || isOracle() || isDb2()){
+    } else if (isPostgres() || isOracle() || isDb2() || isYugabyte()){
       assertSql(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and (t0.sku||':'||t0.code||'-foo')");
     } else if (isHana()){
       assertSql(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and concat(t0.sku, ':'||t0.code||'-foo')");
diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java
index fa99f45da..65359a683 100644
--- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java
+++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java
@@ -52,8 +52,8 @@ class TestElementCollectionBasicSet extends BaseTestCase {
     Set<String> phoneNumbers1 = found.get(1).getPhoneNumbers();
     phoneNumbers0.size();
 
-    assertThat(phoneNumbers0).containsExactly("021 1234", "021 4321");
-    assertThat(phoneNumbers1).containsExactly("09 1234", "09 4321", "09 9876");
+    assertThat(phoneNumbers0).containsExactlyInAnyOrder("021 1234", "021 4321");
+    assertThat(phoneNumbers1).containsExactlyInAnyOrder("09 1234", "09 4321", "09 9876");
 
     sql = LoggedSql.collect();
     assertThat(sql).hasSize(2);