github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#406 - Remove diff "non flat mode" ... so diff going forward only supports flat mode

Browse Source
This commit is contained in:
Robin Bygrave
2015-09-03 14:29:03 +12:00
parent 54172aec6c
commit 088fcfb296
7 changed files with 42 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpSimple.java
+8 -11
View File
@@ -20,8 +20,6 @@ import com.avaje.tests.model.basic.Order.Status;
public class TestDiffHelpSimple extends BaseTestCase {
DiffHelp diffHelp = new DiffHelp(false);
long firstTime = System.currentTimeMillis()-10000;
long secondTime = System.currentTimeMillis();
@@ -59,7 +57,7 @@ public class TestDiffHelpSimple extends BaseTestCase {
order2.setShipDate(new Date(secondTime));
order2.setOrderDate(new Date(secondTime));
Map<String, ValuePair> diff = diffHelp.diff(order1, order2, orderDesc);
Map<String, ValuePair> diff = DiffHelp.diff(order1, order2, orderDesc);
Assert.assertEquals(5, diff.size());
@@ -68,7 +66,7 @@ public class TestDiffHelpSimple extends BaseTestCase {
Assert.assertTrue(keySet.contains("status"));
Assert.assertTrue(keySet.contains("shipDate"));
Assert.assertTrue(keySet.contains("orderDate"));
Assert.assertTrue(keySet.contains("customer"));
Assert.assertTrue(keySet.contains("customer.id"));
}
@Test
@@ -85,8 +83,7 @@ public class TestDiffHelpSimple extends BaseTestCase {
order2.setShipDate(new Date(secondTime));
order2.setOrderDate(new Date(secondTime));
DiffHelp diffHelp = new DiffHelp(true);
Map<String, ValuePair> diff = diffHelp.diff(order1, order2, orderDesc);
Map<String, ValuePair> diff = DiffHelp.diff(order1, order2, orderDesc);
Assert.assertEquals(5, diff.size());
@@ -107,7 +104,7 @@ public class TestDiffHelpSimple extends BaseTestCase {
Order order2 = createBaseOrder(server);
order2.setId(14);
Map<String, ValuePair> diff = diffHelp.diff(order1, order2, orderDesc);
Map<String, ValuePair> diff = DiffHelp.diff(order1, order2, orderDesc);
Assert.assertEquals(0, diff.size());
}
@@ -122,13 +119,13 @@ public class TestDiffHelpSimple extends BaseTestCase {
order2.setStatus(Status.COMPLETE);
order2.setShipDate(null);
Map<String, ValuePair> diff = diffHelp.diff(order1, order2, orderDesc);
Map<String, ValuePair> diff = DiffHelp.diff(order1, order2, orderDesc);
Assert.assertEquals(3, diff.size());
Set<String> keySet = diff.keySet();
Assert.assertTrue(keySet.contains("status"));
Assert.assertTrue(keySet.contains("customer"));
Assert.assertTrue(keySet.contains("customer.id"));
Assert.assertTrue(keySet.contains("shipDate"));
ValuePair shipDatePair = diff.get("shipDate");
@@ -147,7 +144,7 @@ public class TestDiffHelpSimple extends BaseTestCase {
Order order2 = createBaseOrder(server);
order2.setShipDate(new Date(secondTime));
Map<String, ValuePair> diff = diffHelp.diff(order1, order2, orderDesc);
Map<String, ValuePair> diff = DiffHelp.diff(order1, order2, orderDesc);
Assert.assertEquals(1, diff.size());
Set<String> keySet = diff.keySet();
@@ -168,7 +165,7 @@ public class TestDiffHelpSimple extends BaseTestCase {
Order order2 = createBaseOrder(server);
order2.setShipDate(null);
Map<String, ValuePair> diff = diffHelp.diff(order1, order2, orderDesc);
Map<String, ValuePair> diff = DiffHelp.diff(order1, order2, orderDesc);
Assert.assertEquals(0, diff.size());
}
src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java
+12 -18
View File
@@ -16,9 +16,8 @@ import com.avaje.tests.model.embedded.Eembeddable;
public class TestDiffHelpWithEmbedded extends BaseTestCase {
DiffHelp diffHelp = new DiffHelp(false);
EbeanServer server;
BeanDescriptor<EMain> emainDesc;
public TestDiffHelpWithEmbedded() {
@@ -35,7 +34,7 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase {
emain2.getEmbeddable().setDescription("baz");
Map<String, ValuePair> diff = diffHelp.diff(emain1, emain2, emainDesc);
Map<String, ValuePair> diff = DiffHelp.diff(emain1, emain2, emainDesc);
Assert.assertEquals(1, diff.size());
ValuePair valuePair = diff.get("embeddable.description");
@@ -58,7 +57,7 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase {
emain2.setEmbeddable(embeddable);
Map<String, ValuePair> diff = diffHelp.diff(emain1, emain2, emainDesc);
Map<String, ValuePair> diff = DiffHelp.diff(emain1, emain2, emainDesc);
Assert.assertEquals(1, diff.size());
ValuePair valuePair = diff.get("embeddable.description");
@@ -74,9 +73,7 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase {
EMain emain2 = createEMain();
emain2.getEmbeddable().setDescription("baz");
DiffHelp diffHelp = new DiffHelp(true);
Map<String, ValuePair> diff = diffHelp.diff(emain1, emain2, emainDesc);
Map<String, ValuePair> diff = DiffHelp.diff(emain1, emain2, emainDesc);
Assert.assertEquals(1, diff.size());
ValuePair valuePair = diff.get("embeddable.description");
@@ -92,14 +89,13 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase {
emain1.setEmbeddable(null);
EMain emain2 = createEMain();
Map<String, ValuePair> diff = diffHelp.diff(emain1, emain2, emainDesc);
Map<String, ValuePair> diff = DiffHelp.diff(emain1, emain2, emainDesc);
Assert.assertEquals(1, diff.size());
ValuePair valuePair = diff.get("embeddable");
ValuePair valuePair = diff.get("embeddable.description");
Assert.assertNotNull(valuePair);
Assert.assertNull(valuePair.getNewValue());
Assert.assertTrue(valuePair.getOldValue() instanceof Eembeddable);
Assert.assertEquals("bar",((Eembeddable)valuePair.getOldValue()).getDescription());
Assert.assertEquals("bar", valuePair.getOldValue());
}
@Test
@@ -109,14 +105,13 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase {
EMain emain2 = createEMain();
emain2.setEmbeddable(null);
Map<String, ValuePair> diff = diffHelp.diff(emain1, emain2, emainDesc);
Map<String, ValuePair> diff = DiffHelp.diff(emain1, emain2, emainDesc);
Assert.assertEquals(1, diff.size());
ValuePair valuePair = diff.get("embeddable");
ValuePair valuePair = diff.get("embeddable.description");
Assert.assertNotNull(valuePair);
Assert.assertNull(valuePair.getOldValue());
Assert.assertTrue(valuePair.getNewValue() instanceof Eembeddable);
Assert.assertEquals("bar",((Eembeddable)valuePair.getNewValue()).getDescription());
Assert.assertEquals("bar", valuePair.getNewValue());
}
@Test
@@ -126,8 +121,7 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase {
EMain emain2 = createEMain();
emain2.setEmbeddable(null);
DiffHelp diffHelp = new DiffHelp(true);
Map<String, ValuePair> diff = diffHelp.diff(emain1, emain2, emainDesc);
Map<String, ValuePair> diff = DiffHelp.diff(emain1, emain2, emainDesc);
Assert.assertEquals(1, diff.size());
ValuePair valuePair = diff.get("embeddable.description");
@@ -144,7 +138,7 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase {
EMain emain2 = createEMain();
emain2.setEmbeddable(null);
Map<String, ValuePair> diff = diffHelp.diff(emain1, emain2, emainDesc);
Map<String, ValuePair> diff = DiffHelp.diff(emain1, emain2, emainDesc);
Assert.assertEquals(0, diff.size());
}