From b40d44895531536f76785ea84f516bfbfd4cbbb7 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 23 Jul 2021 12:01:36 +1200
Subject: [PATCH] #2272 No effective change, tidy test TestM2MModifyTest only

Noting that this test fails with the fix for 2272 as M2M intersection deletes are currently executed after inserts. We need a fix to SaveManyBeans to change that so that deletes to intersection table execute after inserts.
---
 .../java/org/tests/m2m/TestM2MModifyTest.java | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MModifyTest.java b/ebean-core/src/test/java/org/tests/m2m/TestM2MModifyTest.java
index 1f12f85c8..3a50fa547 100644
--- a/ebean-core/src/test/java/org/tests/m2m/TestM2MModifyTest.java
+++ b/ebean-core/src/test/java/org/tests/m2m/TestM2MModifyTest.java
@@ -1,14 +1,15 @@
 package org.tests.m2m;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
+import org.junit.Test;
 import org.tests.model.basic.MRole;
 import org.tests.model.basic.MUser;
-import org.junit.Assert;
-import org.junit.Test;
 
 import java.util.List;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class TestM2MModifyTest extends BaseTestCase {
 
   @Test
@@ -19,8 +20,8 @@ public class TestM2MModifyTest extends BaseTestCase {
     MRole r1 = new MRole("r1");
 
     // Save r1 and r2
-    Ebean.save(r0);
-    Ebean.save(r1);
+    DB.save(r0);
+    DB.save(r1);
 
     // Create a new user
     MUser u0 = new MUser("usr0");
@@ -28,32 +29,27 @@ public class TestM2MModifyTest extends BaseTestCase {
     u0.addRole(r1);
 
     // Save the user
-    Ebean.save(u0);
+    DB.save(u0);
 
     List<MRole> roles = u0.getRoles();
 
-    Assert.assertTrue(roles.size() == 2);
+    assertThat(roles).hasSize(2);
 
-    u0 = Ebean.find(MUser.class, u0.getUserid());
+    u0 = DB.find(MUser.class, u0.getUserid());
 
     roles = u0.getRoles();
-    int nrRoles = roles.size();
-
-    Assert.assertTrue(nrRoles == 2);
+    assertThat(roles).hasSize(2);
 
     roles.clear();
     roles.add(r0);
     roles.add(r1);
     roles.remove(r1);
 
-    Ebean.save(u0);
+    DB.save(u0);
 
-    u0 = Ebean.find(MUser.class, u0.getUserid());
+    u0 = DB.find(MUser.class, u0.getUserid());
 
     roles = u0.getRoles();
-
-    nrRoles = roles.size();
-
-    Assert.assertTrue(nrRoles == 1);
+    assertThat(roles).hasSize(1);
   }
 }