From 5609bc6d02eb9c50627096005ff2c044adbac01a Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Sun, 2 Aug 2015 13:07:48 +1200 Subject: [PATCH] No effective change - add extra tests --- .../ebean/EbeanServer_deleteAllByIdTest.java | 75 +++++++++++++++++++ .../ebean/EbeanServer_deleteByIdTest.java | 56 ++++++++++++++ .../avaje/ebean/EbeanServer_deleteTest.java | 55 ++++++++++++++ 3 files changed, 186 insertions(+) create mode 100644 src/test/java/com/avaje/ebean/EbeanServer_deleteAllByIdTest.java create mode 100644 src/test/java/com/avaje/ebean/EbeanServer_deleteByIdTest.java create mode 100644 src/test/java/com/avaje/ebean/EbeanServer_deleteTest.java diff --git a/src/test/java/com/avaje/ebean/EbeanServer_deleteAllByIdTest.java b/src/test/java/com/avaje/ebean/EbeanServer_deleteAllByIdTest.java new file mode 100644 index 000000000..694b02fc0 --- /dev/null +++ b/src/test/java/com/avaje/ebean/EbeanServer_deleteAllByIdTest.java @@ -0,0 +1,75 @@ +package com.avaje.ebean; + +import com.avaje.tests.model.basic.EBasicVer; +import org.avaje.ebeantest.LoggedSqlCollector; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + + +public class EbeanServer_deleteAllByIdTest { + + @Test + public void deleteAllById() { + + List someBeans = beans(3); + + Ebean.saveAll(someBeans); + List ids = new ArrayList(); + for (EBasicVer someBean : someBeans) { + ids.add(someBean.getId()); + } + + // act + LoggedSqlCollector.start(); + Ebean.deleteAll(EBasicVer.class, ids); + + List loggedSql = LoggedSqlCollector.stop(); + assertThat(loggedSql).hasSize(1); + assertThat(loggedSql.get(0)).contains("delete from e_basicver where id in (?,?,?)"); + + } + + @Test + public void deleteAllById_withTransaction() { + + List someBeans = beans(3); + + Ebean.saveAll(someBeans); + List ids = new ArrayList(); + for (EBasicVer someBean : someBeans) { + ids.add(someBean.getId()); + } + + EbeanServer server = Ebean.getDefaultServer(); + // act + LoggedSqlCollector.start(); + Transaction txn = server.beginTransaction(); + try { + server.deleteAll(EBasicVer.class, ids, txn); + txn.commit(); + } finally { + txn.end(); + } + List loggedSql = LoggedSqlCollector.stop(); + assertThat(loggedSql).hasSize(1); + assertThat(loggedSql.get(0)).contains("delete from e_basicver where id in (?,?,?)"); + } + + private List beans(int count) { + List beans = new ArrayList(); + for (int i = 0; i < count; i++) { + beans.add(bean("foo" + i)); + } + return beans; + } + + private EBasicVer bean(String name) { + EBasicVer bean = new EBasicVer(); + bean.setName(name); + return bean; + } +} \ No newline at end of file diff --git a/src/test/java/com/avaje/ebean/EbeanServer_deleteByIdTest.java b/src/test/java/com/avaje/ebean/EbeanServer_deleteByIdTest.java new file mode 100644 index 000000000..0cf019b2e --- /dev/null +++ b/src/test/java/com/avaje/ebean/EbeanServer_deleteByIdTest.java @@ -0,0 +1,56 @@ +package com.avaje.ebean; + +import com.avaje.tests.model.basic.EBasicVer; +import org.avaje.ebeantest.LoggedSqlCollector; +import org.junit.Test; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + + +public class EbeanServer_deleteByIdTest { + + @Test + public void deleteAllById() { + + EBasicVer someBean = bean("foo1"); + + Ebean.save(someBean); + + // act + LoggedSqlCollector.start(); + Ebean.delete(EBasicVer.class, someBean.getId()); + + List loggedSql = LoggedSqlCollector.stop(); + assertThat(loggedSql).hasSize(1); + assertThat(loggedSql.get(0)).contains("delete from e_basicver where id = ?"); + } + + @Test + public void deleteAllById_withTransaction() { + + EBasicVer someBean = bean("foo1"); + Ebean.save(someBean); + + EbeanServer server = Ebean.getDefaultServer(); + // act + LoggedSqlCollector.start(); + Transaction txn = server.beginTransaction(); + try { + server.delete(EBasicVer.class, someBean.getId(), txn); + txn.commit(); + } finally { + txn.end(); + } + List loggedSql = LoggedSqlCollector.stop(); + assertThat(loggedSql).hasSize(1); + assertThat(loggedSql.get(0)).contains("delete from e_basicver where id = ?"); + } + + private EBasicVer bean(String name) { + EBasicVer bean = new EBasicVer(); + bean.setName(name); + return bean; + } +} \ No newline at end of file diff --git a/src/test/java/com/avaje/ebean/EbeanServer_deleteTest.java b/src/test/java/com/avaje/ebean/EbeanServer_deleteTest.java new file mode 100644 index 000000000..82d377dc6 --- /dev/null +++ b/src/test/java/com/avaje/ebean/EbeanServer_deleteTest.java @@ -0,0 +1,55 @@ +package com.avaje.ebean; + +import com.avaje.tests.model.basic.EBasicVer; +import org.avaje.ebeantest.LoggedSqlCollector; +import org.junit.Test; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + + +public class EbeanServer_deleteTest { + + @Test + public void delete() { + + EBasicVer someBean = bean("foo1"); + Ebean.save(someBean); + + // act + LoggedSqlCollector.start(); + Ebean.delete(someBean); + + List loggedSql = LoggedSqlCollector.stop(); + assertThat(loggedSql).hasSize(1); + assertThat(loggedSql.get(0)).contains("delete from e_basicver where id=? and "); + } + + @Test + public void delete_withTransaction() { + + EBasicVer someBean = bean("foo1"); + Ebean.save(someBean); + + EbeanServer server = Ebean.getDefaultServer(); + // act + LoggedSqlCollector.start(); + Transaction txn = server.beginTransaction(); + try { + server.delete(someBean, txn); + txn.commit(); + } finally { + txn.end(); + } + List loggedSql = LoggedSqlCollector.stop(); + assertThat(loggedSql).hasSize(1); + assertThat(loggedSql.get(0)).contains("delete from e_basicver where id=? and "); + } + + private EBasicVer bean(String name) { + EBasicVer bean = new EBasicVer(); + bean.setName(name); + return bean; + } +} \ No newline at end of file