From 2b7c204072af389d1a07b514db1850b4bc6e25fd Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Wed, 24 Aug 2016 21:32:10 +1200 Subject: [PATCH] No effective change - adjust tests for deleting OneToOne - Tire to Wheel --- .../basic/one2one/TestOneToOneWheelTire.java | 5 +- .../com/avaje/tests/basic/one2one/Wheel.java | 58 ++++++++++--------- 2 files changed, 33 insertions(+), 30 deletions(-) diff --git a/src/test/java/com/avaje/tests/basic/one2one/TestOneToOneWheelTire.java b/src/test/java/com/avaje/tests/basic/one2one/TestOneToOneWheelTire.java index f7a8a260f..cc1126601 100644 --- a/src/test/java/com/avaje/tests/basic/one2one/TestOneToOneWheelTire.java +++ b/src/test/java/com/avaje/tests/basic/one2one/TestOneToOneWheelTire.java @@ -1,9 +1,8 @@ package com.avaje.tests.basic.one2one; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; +import org.junit.Test; public class TestOneToOneWheelTire extends BaseTestCase { @@ -16,6 +15,8 @@ public class TestOneToOneWheelTire extends BaseTestCase { w.setTire(t); Ebean.save(t); + + Ebean.delete(t); } } diff --git a/src/test/java/com/avaje/tests/basic/one2one/Wheel.java b/src/test/java/com/avaje/tests/basic/one2one/Wheel.java index a22f72ded..00d5ceb77 100644 --- a/src/test/java/com/avaje/tests/basic/one2one/Wheel.java +++ b/src/test/java/com/avaje/tests/basic/one2one/Wheel.java @@ -12,39 +12,41 @@ import javax.persistence.Version; @Entity @Table(name = "wheel") public class Wheel { - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE) - private Long id; - @Version - private int version; - @OneToOne(mappedBy = "wheel", cascade = CascadeType.ALL) - private Tire tire; + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) + private Long id; - public Long getId() { - return id; - } + @Version + private int version; - public Wheel() { - super(); - } + @OneToOne(mappedBy = "wheel", cascade = CascadeType.PERSIST) + private Tire tire; - public void setId(Long id) { - this.id = id; - } + public Long getId() { + return id; + } - public int getVersion() { - return version; - } + public Wheel() { + super(); + } - public void setVersion(int version) { - this.version = version; - } + public void setId(Long id) { + this.id = id; + } - public Tire getTire() { - return tire; - } + public int getVersion() { + return version; + } - public void setTire(Tire tire) { - this.tire = tire; - } + public void setVersion(int version) { + this.version = version; + } + + public Tire getTire() { + return tire; + } + + public void setTire(Tire tire) { + this.tire = tire; + } } \ No newline at end of file