From e8524c5b1af98f692dc8f6a34cc82461d3b42122 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 23 Sep 2021 17:07:35 +1200
Subject: [PATCH] Fix tests only - fix tests for SqlServer

---
 .../java/org/etest/ForTestsBeforeAfterTest.java    |  8 +++++---
 .../src/test/java/org/etest/ForTestsTest.java      |  6 +++++-
 .../java/org/tests/basic/TestQueryForUpdate.java   | 14 ++++++++++----
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/ebean-test/src/test/java/org/etest/ForTestsBeforeAfterTest.java b/ebean-test/src/test/java/org/etest/ForTestsBeforeAfterTest.java
index 70ad19ead..5c1bd7e60 100644
--- a/ebean-test/src/test/java/org/etest/ForTestsBeforeAfterTest.java
+++ b/ebean-test/src/test/java/org/etest/ForTestsBeforeAfterTest.java
@@ -1,6 +1,9 @@
 package org.etest;
 
+import io.ebean.BaseTestCase;
 import io.ebean.DB;
+import io.ebean.annotation.IgnorePlatform;
+import io.ebean.annotation.Platform;
 import io.ebean.annotation.Transactional;
 import io.ebean.test.ForTests;
 import org.junit.jupiter.api.AfterEach;
@@ -10,7 +13,7 @@ import org.junit.jupiter.api.Test;
 import static org.assertj.core.api.Assertions.assertThat;
 
 
-public class ForTestsBeforeAfterTest {
+public class ForTestsBeforeAfterTest extends BaseTestCase {
 
   private ForTests.RollbackAll rollbackAll;
 
@@ -25,10 +28,9 @@ public class ForTestsBeforeAfterTest {
     assertThat(getCount()).isEqualTo(0);
   }
 
-
+  @IgnorePlatform(Platform.SQLSERVER)
   @Test
   public void createRollbackAll() {
-
     doInsert();
     assertThat(getCount()).isEqualTo(1);
   }
diff --git a/ebean-test/src/test/java/org/etest/ForTestsTest.java b/ebean-test/src/test/java/org/etest/ForTestsTest.java
index b2b0804cb..19f57c9a6 100644
--- a/ebean-test/src/test/java/org/etest/ForTestsTest.java
+++ b/ebean-test/src/test/java/org/etest/ForTestsTest.java
@@ -1,14 +1,17 @@
 package org.etest;
 
+import io.ebean.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Transaction;
+import io.ebean.annotation.IgnorePlatform;
+import io.ebean.annotation.Platform;
 import io.ebean.annotation.Transactional;
 import io.ebean.test.ForTests;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ForTestsTest {
+public class ForTestsTest extends BaseTestCase {
 
   @Test
   public void noTransactional_expect_noTransactionEnterExitCalled() {
@@ -33,6 +36,7 @@ public class ForTestsTest {
     assertThat(transaction).isNull();
   }
 
+  @IgnorePlatform(Platform.SQLSERVER)
   @Test
   public void rollbackTransactions() {
 
diff --git a/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java
index ebe409895..28768109c 100644
--- a/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java
+++ b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java
@@ -66,8 +66,11 @@ public class TestQueryForUpdate extends BaseTestCase {
       List<String> sql = LoggedSql.stop();
       assertThat(sql).hasSize(2);
       assertThat(sql.get(0)).contains("from o_order");
-      assertThat(sql.get(1)).contains("from o_customer t0 where t0.id = ? for update");
-
+      if (isSqlServer()) {
+        assertThat(sql.get(1)).contains("from o_customer t0 with (updlock) where t0.id = ?");
+      } else {
+        assertThat(sql.get(1)).contains("from o_customer t0 where t0.id = ? for update");
+      }
       transaction.commit();
     }
   }
@@ -98,8 +101,11 @@ public class TestQueryForUpdate extends BaseTestCase {
       List<String> sql = LoggedSql.stop();
       assertThat(sql).hasSize(2);
       assertThat(sql.get(0)).contains("from o_order");
-      assertThat(sql.get(1)).contains("from o_customer t0 where t0.id = ? for update");
-
+      if (isSqlServer()) {
+        assertThat(sql.get(1)).contains("from o_customer t0 with (updlock,nowait) where t0.id = ?");
+      } else {
+        assertThat(sql.get(1)).contains("from o_customer t0 where t0.id = ? for update");
+      }
       transaction.commit();
     }
   }