From 32e4f114b4657e8cecd8a9366ba83090010071a5 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 14 May 2014 23:47:46 +1200 Subject: [PATCH] No effective change - cleanup of imports on test code --- .../inheritance/TestDuplcateKeyException.java | 9 ++++--- .../tests/inheritance/TestInheritInsert.java | 24 ++++++++----------- .../inheritance/TestInheritanceJoins.java | 3 +-- .../tests/inheritance/TestIntInherit.java | 7 +++--- .../tests/inheritance/TestSkippable.java | 7 +++--- 5 files changed, 22 insertions(+), 28 deletions(-) diff --git a/src/test/java/com/avaje/tests/inheritance/TestDuplcateKeyException.java b/src/test/java/com/avaje/tests/inheritance/TestDuplcateKeyException.java index e685c9675..4e88425d9 100644 --- a/src/test/java/com/avaje/tests/inheritance/TestDuplcateKeyException.java +++ b/src/test/java/com/avaje/tests/inheritance/TestDuplcateKeyException.java @@ -1,17 +1,16 @@ package com.avaje.tests.inheritance; -import junit.framework.Assert; -import junit.framework.TestCase; +import org.junit.Assert; + +import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.TxRunnable; import com.avaje.tests.model.basic.AttributeHolder; import com.avaje.tests.model.basic.ListAttribute; import com.avaje.tests.model.basic.ListAttributeValue; -public class TestDuplcateKeyException extends TestCase { - - +public class TestDuplcateKeyException extends BaseTestCase { /** * Test query. diff --git a/src/test/java/com/avaje/tests/inheritance/TestInheritInsert.java b/src/test/java/com/avaje/tests/inheritance/TestInheritInsert.java index 54ea54189..d856b30a6 100644 --- a/src/test/java/com/avaje/tests/inheritance/TestInheritInsert.java +++ b/src/test/java/com/avaje/tests/inheritance/TestInheritInsert.java @@ -2,9 +2,9 @@ package com.avaje.tests.inheritance; import java.util.List; -import junit.framework.Assert; -import junit.framework.TestCase; +import org.junit.Assert; +import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; import com.avaje.tests.model.basic.Car; @@ -12,7 +12,7 @@ import com.avaje.tests.model.basic.Truck; import com.avaje.tests.model.basic.Vehicle; import com.avaje.tests.model.basic.VehicleDriver; -public class TestInheritInsert extends TestCase { +public class TestInheritInsert extends BaseTestCase { public void testCasting() { @@ -23,8 +23,8 @@ public class TestInheritInsert extends TestCase { Vehicle v = Ebean.find(Vehicle.class, t.getId()); if (v instanceof Truck){ Truck t0 = (Truck)v; - Assert.assertEquals(10d, t0.getCapacity()); - Assert.assertEquals(10d, ((Truck)v).getCapacity()); + Assert.assertEquals(Double.valueOf(10d), t0.getCapacity()); + Assert.assertEquals(Double.valueOf(10d), ((Truck)v).getCapacity()); Assert.assertNotNull(t0.getId()); } else { Assert.assertTrue("v not a Truck?", false); @@ -40,7 +40,7 @@ public class TestInheritInsert extends TestCase { v = d1.getVehicle(); if (v instanceof Truck){ Double capacity = ((Truck)v).getCapacity(); - Assert.assertEquals(10d, capacity); + Assert.assertEquals(Double.valueOf(10d), capacity); Assert.assertNotNull(v.getId()); } else { Assert.assertTrue("v not a Truck?", false); @@ -50,19 +50,17 @@ public class TestInheritInsert extends TestCase { for (VehicleDriver vehicleDriver : list) { if (vehicleDriver.getVehicle() instanceof Truck){ Double capacity = ((Truck)vehicleDriver.getVehicle()).getCapacity(); - Assert.assertEquals(10d, capacity); + Assert.assertEquals(Double.valueOf(10d), capacity); } } } - public void testQuery() - { - // TODO: figure out whats wrong in the build process, then uncomment the lines again + public void testQuery() { + Car car = new Car(); car.setLicenseNumber("MARIOS_CAR_LICENSE"); Ebean.save(car); - VehicleDriver driver = new VehicleDriver(); driver.setName("Mario"); @@ -78,12 +76,10 @@ public class TestInheritInsert extends TestCase { Assert.assertNotNull(drivers.get(0)); Assert.assertEquals("Mario", drivers.get(0).getName()); - Assert.assertEquals("MARIOS_CAR_LICENSE", drivers.get(0).getVehicle() - .getLicenseNumber()); + Assert.assertEquals("MARIOS_CAR_LICENSE", drivers.get(0).getVehicle().getLicenseNumber()); Vehicle car2 = Ebean.find(Vehicle.class, car.getId()); - // FIXME~EMG - NoSuchMethodError car2.setLicenseNumber("test"); Ebean.save(car); diff --git a/src/test/java/com/avaje/tests/inheritance/TestInheritanceJoins.java b/src/test/java/com/avaje/tests/inheritance/TestInheritanceJoins.java index 5f9bb30d9..de0f36394 100644 --- a/src/test/java/com/avaje/tests/inheritance/TestInheritanceJoins.java +++ b/src/test/java/com/avaje/tests/inheritance/TestInheritanceJoins.java @@ -2,8 +2,7 @@ package com.avaje.tests.inheritance; import java.util.List; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.avaje.ebean.BaseTestCase; diff --git a/src/test/java/com/avaje/tests/inheritance/TestIntInherit.java b/src/test/java/com/avaje/tests/inheritance/TestIntInherit.java index ad5abb8ce..192d16243 100644 --- a/src/test/java/com/avaje/tests/inheritance/TestIntInherit.java +++ b/src/test/java/com/avaje/tests/inheritance/TestIntInherit.java @@ -1,13 +1,14 @@ package com.avaje.tests.inheritance; -import junit.framework.Assert; -import junit.framework.TestCase; +import org.junit.Assert; + +import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.TIntChild; import com.avaje.tests.model.basic.TIntRoot; -public class TestIntInherit extends TestCase { +public class TestIntInherit extends BaseTestCase { public void testMe() { diff --git a/src/test/java/com/avaje/tests/inheritance/TestSkippable.java b/src/test/java/com/avaje/tests/inheritance/TestSkippable.java index 36ad402dc..a3a9cbdb8 100644 --- a/src/test/java/com/avaje/tests/inheritance/TestSkippable.java +++ b/src/test/java/com/avaje/tests/inheritance/TestSkippable.java @@ -1,17 +1,16 @@ package com.avaje.tests.inheritance; -import junit.framework.Assert; -import junit.framework.TestCase; - +import org.junit.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.AttributeHolder; import com.avaje.tests.model.basic.ListAttribute; import com.avaje.tests.model.basic.ListAttributeValue; -public class TestSkippable extends TestCase { +public class TestSkippable extends BaseTestCase { private static final Logger logger = LoggerFactory.getLogger(TestSkippable.class);