diff --git a/test/nl/astraeus/database/TestCache.java b/test/nl/astraeus/database/TestCache.java index dd0c88c..8774e73 100644 --- a/test/nl/astraeus/database/TestCache.java +++ b/test/nl/astraeus/database/TestCache.java @@ -73,9 +73,14 @@ } }); - List persons = Persister.selectAll(Person.class); + Persister.execute(new Persister.Executor() { + @Override + public void execute() { + List persons = Persister.selectAll(Person.class); - Assert.assertEquals(Cache.get().getObjectCache(Person.class).getNumberCached() ,6); + Assert.assertEquals(Cache.get().getObjectCache(Person.class).getNumberCached() ,6); + } + }); } } diff --git a/test/nl/astraeus/database/TestCache.java b/test/nl/astraeus/database/TestCache.java index dd0c88c..8774e73 100644 --- a/test/nl/astraeus/database/TestCache.java +++ b/test/nl/astraeus/database/TestCache.java @@ -73,9 +73,14 @@ } }); - List persons = Persister.selectAll(Person.class); + Persister.execute(new Persister.Executor() { + @Override + public void execute() { + List persons = Persister.selectAll(Person.class); - Assert.assertEquals(Cache.get().getObjectCache(Person.class).getNumberCached() ,6); + Assert.assertEquals(Cache.get().getObjectCache(Person.class).getNumberCached() ,6); + } + }); } } diff --git a/test/nl/astraeus/database/TestCollection.java b/test/nl/astraeus/database/TestCollection.java index 33f7486..b4d6e61 100644 --- a/test/nl/astraeus/database/TestCollection.java +++ b/test/nl/astraeus/database/TestCollection.java @@ -60,11 +60,15 @@ Persister.commit(); + Persister.begin(); + Company found = Persister.find(Company.class, company.getId()); Assert.assertNotNull(found); Assert.assertEquals(company.getInfoLines().size(), 2); + Persister.rollback(); + Persister.begin(); company.addInfo(new Info("description 3", "info 3")); @@ -73,11 +77,15 @@ Persister.commit(); + Persister.begin(); + found = Persister.find(Company.class, company.getId()); Assert.assertNotNull(found); Assert.assertEquals(company.getInfoLines().size(), 3); + Persister.rollback(); + Persister.begin(); Info infox = company.getInfoLines().remove(1); @@ -87,10 +95,14 @@ Persister.commit(); + Persister.begin(); + found = Persister.find(Company.class, company.getId()); Assert.assertNotNull(found); Assert.assertEquals(company.getInfoLines().size(), 2); + + Persister.rollback(); } } diff --git a/test/nl/astraeus/database/TestCache.java b/test/nl/astraeus/database/TestCache.java index dd0c88c..8774e73 100644 --- a/test/nl/astraeus/database/TestCache.java +++ b/test/nl/astraeus/database/TestCache.java @@ -73,9 +73,14 @@ } }); - List persons = Persister.selectAll(Person.class); + Persister.execute(new Persister.Executor() { + @Override + public void execute() { + List persons = Persister.selectAll(Person.class); - Assert.assertEquals(Cache.get().getObjectCache(Person.class).getNumberCached() ,6); + Assert.assertEquals(Cache.get().getObjectCache(Person.class).getNumberCached() ,6); + } + }); } } diff --git a/test/nl/astraeus/database/TestCollection.java b/test/nl/astraeus/database/TestCollection.java index 33f7486..b4d6e61 100644 --- a/test/nl/astraeus/database/TestCollection.java +++ b/test/nl/astraeus/database/TestCollection.java @@ -60,11 +60,15 @@ Persister.commit(); + Persister.begin(); + Company found = Persister.find(Company.class, company.getId()); Assert.assertNotNull(found); Assert.assertEquals(company.getInfoLines().size(), 2); + Persister.rollback(); + Persister.begin(); company.addInfo(new Info("description 3", "info 3")); @@ -73,11 +77,15 @@ Persister.commit(); + Persister.begin(); + found = Persister.find(Company.class, company.getId()); Assert.assertNotNull(found); Assert.assertEquals(company.getInfoLines().size(), 3); + Persister.rollback(); + Persister.begin(); Info infox = company.getInfoLines().remove(1); @@ -87,10 +95,14 @@ Persister.commit(); + Persister.begin(); + found = Persister.find(Company.class, company.getId()); Assert.assertNotNull(found); Assert.assertEquals(company.getInfoLines().size(), 2); + + Persister.rollback(); } } diff --git a/test/nl/astraeus/database/TestDelete.java b/test/nl/astraeus/database/TestDelete.java index 0c89ab1..45cf1ee 100644 --- a/test/nl/astraeus/database/TestDelete.java +++ b/test/nl/astraeus/database/TestDelete.java @@ -58,9 +58,12 @@ Persister.commit(); + Persister.begin(); List persons = Persister.selectWhere(Person.class, "age > ?", 30); + Persister.rollback(); + Persister.begin(); for (Person person : persons) { @@ -69,8 +72,12 @@ Persister.commit(); + Persister.begin(); + persons = Persister.selectAll(Person.class); + Persister.rollback(); + Assert.assertEquals(persons.size(), 2); } diff --git a/test/nl/astraeus/database/TestCache.java b/test/nl/astraeus/database/TestCache.java index dd0c88c..8774e73 100644 --- a/test/nl/astraeus/database/TestCache.java +++ b/test/nl/astraeus/database/TestCache.java @@ -73,9 +73,14 @@ } }); - List persons = Persister.selectAll(Person.class); + Persister.execute(new Persister.Executor() { + @Override + public void execute() { + List persons = Persister.selectAll(Person.class); - Assert.assertEquals(Cache.get().getObjectCache(Person.class).getNumberCached() ,6); + Assert.assertEquals(Cache.get().getObjectCache(Person.class).getNumberCached() ,6); + } + }); } } diff --git a/test/nl/astraeus/database/TestCollection.java b/test/nl/astraeus/database/TestCollection.java index 33f7486..b4d6e61 100644 --- a/test/nl/astraeus/database/TestCollection.java +++ b/test/nl/astraeus/database/TestCollection.java @@ -60,11 +60,15 @@ Persister.commit(); + Persister.begin(); + Company found = Persister.find(Company.class, company.getId()); Assert.assertNotNull(found); Assert.assertEquals(company.getInfoLines().size(), 2); + Persister.rollback(); + Persister.begin(); company.addInfo(new Info("description 3", "info 3")); @@ -73,11 +77,15 @@ Persister.commit(); + Persister.begin(); + found = Persister.find(Company.class, company.getId()); Assert.assertNotNull(found); Assert.assertEquals(company.getInfoLines().size(), 3); + Persister.rollback(); + Persister.begin(); Info infox = company.getInfoLines().remove(1); @@ -87,10 +95,14 @@ Persister.commit(); + Persister.begin(); + found = Persister.find(Company.class, company.getId()); Assert.assertNotNull(found); Assert.assertEquals(company.getInfoLines().size(), 2); + + Persister.rollback(); } } diff --git a/test/nl/astraeus/database/TestDelete.java b/test/nl/astraeus/database/TestDelete.java index 0c89ab1..45cf1ee 100644 --- a/test/nl/astraeus/database/TestDelete.java +++ b/test/nl/astraeus/database/TestDelete.java @@ -58,9 +58,12 @@ Persister.commit(); + Persister.begin(); List persons = Persister.selectWhere(Person.class, "age > ?", 30); + Persister.rollback(); + Persister.begin(); for (Person person : persons) { @@ -69,8 +72,12 @@ Persister.commit(); + Persister.begin(); + persons = Persister.selectAll(Person.class); + Persister.rollback(); + Assert.assertEquals(persons.size(), 2); } diff --git a/test/nl/astraeus/database/TestFind.java b/test/nl/astraeus/database/TestFind.java index 00c10d0..821edbe 100644 --- a/test/nl/astraeus/database/TestFind.java +++ b/test/nl/astraeus/database/TestFind.java @@ -57,8 +57,12 @@ Persister.commit(); + Persister.begin(); + Person p2 = Persister.find(Person.class, id); + Persister.rollback(); + Assert.assertNotNull(p2); Assert.assertEquals("Rien", p2.getName()); } diff --git a/test/nl/astraeus/database/TestCache.java b/test/nl/astraeus/database/TestCache.java index dd0c88c..8774e73 100644 --- a/test/nl/astraeus/database/TestCache.java +++ b/test/nl/astraeus/database/TestCache.java @@ -73,9 +73,14 @@ } }); - List persons = Persister.selectAll(Person.class); + Persister.execute(new Persister.Executor() { + @Override + public void execute() { + List persons = Persister.selectAll(Person.class); - Assert.assertEquals(Cache.get().getObjectCache(Person.class).getNumberCached() ,6); + Assert.assertEquals(Cache.get().getObjectCache(Person.class).getNumberCached() ,6); + } + }); } } diff --git a/test/nl/astraeus/database/TestCollection.java b/test/nl/astraeus/database/TestCollection.java index 33f7486..b4d6e61 100644 --- a/test/nl/astraeus/database/TestCollection.java +++ b/test/nl/astraeus/database/TestCollection.java @@ -60,11 +60,15 @@ Persister.commit(); + Persister.begin(); + Company found = Persister.find(Company.class, company.getId()); Assert.assertNotNull(found); Assert.assertEquals(company.getInfoLines().size(), 2); + Persister.rollback(); + Persister.begin(); company.addInfo(new Info("description 3", "info 3")); @@ -73,11 +77,15 @@ Persister.commit(); + Persister.begin(); + found = Persister.find(Company.class, company.getId()); Assert.assertNotNull(found); Assert.assertEquals(company.getInfoLines().size(), 3); + Persister.rollback(); + Persister.begin(); Info infox = company.getInfoLines().remove(1); @@ -87,10 +95,14 @@ Persister.commit(); + Persister.begin(); + found = Persister.find(Company.class, company.getId()); Assert.assertNotNull(found); Assert.assertEquals(company.getInfoLines().size(), 2); + + Persister.rollback(); } } diff --git a/test/nl/astraeus/database/TestDelete.java b/test/nl/astraeus/database/TestDelete.java index 0c89ab1..45cf1ee 100644 --- a/test/nl/astraeus/database/TestDelete.java +++ b/test/nl/astraeus/database/TestDelete.java @@ -58,9 +58,12 @@ Persister.commit(); + Persister.begin(); List persons = Persister.selectWhere(Person.class, "age > ?", 30); + Persister.rollback(); + Persister.begin(); for (Person person : persons) { @@ -69,8 +72,12 @@ Persister.commit(); + Persister.begin(); + persons = Persister.selectAll(Person.class); + Persister.rollback(); + Assert.assertEquals(persons.size(), 2); } diff --git a/test/nl/astraeus/database/TestFind.java b/test/nl/astraeus/database/TestFind.java index 00c10d0..821edbe 100644 --- a/test/nl/astraeus/database/TestFind.java +++ b/test/nl/astraeus/database/TestFind.java @@ -57,8 +57,12 @@ Persister.commit(); + Persister.begin(); + Person p2 = Persister.find(Person.class, id); + Persister.rollback(); + Assert.assertNotNull(p2); Assert.assertEquals("Rien", p2.getName()); } diff --git a/test/nl/astraeus/database/TestInsert.java b/test/nl/astraeus/database/TestInsert.java index dbc77d9..cafd4e8 100644 --- a/test/nl/astraeus/database/TestInsert.java +++ b/test/nl/astraeus/database/TestInsert.java @@ -59,9 +59,13 @@ } }); + Persister.begin(); + List persons = Persister.selectAll(Person.class); Assert.assertTrue(persons.size() == 4); + + Persister.rollback(); } } diff --git a/test/nl/astraeus/database/TestCache.java b/test/nl/astraeus/database/TestCache.java index dd0c88c..8774e73 100644 --- a/test/nl/astraeus/database/TestCache.java +++ b/test/nl/astraeus/database/TestCache.java @@ -73,9 +73,14 @@ } }); - List persons = Persister.selectAll(Person.class); + Persister.execute(new Persister.Executor() { + @Override + public void execute() { + List persons = Persister.selectAll(Person.class); - Assert.assertEquals(Cache.get().getObjectCache(Person.class).getNumberCached() ,6); + Assert.assertEquals(Cache.get().getObjectCache(Person.class).getNumberCached() ,6); + } + }); } } diff --git a/test/nl/astraeus/database/TestCollection.java b/test/nl/astraeus/database/TestCollection.java index 33f7486..b4d6e61 100644 --- a/test/nl/astraeus/database/TestCollection.java +++ b/test/nl/astraeus/database/TestCollection.java @@ -60,11 +60,15 @@ Persister.commit(); + Persister.begin(); + Company found = Persister.find(Company.class, company.getId()); Assert.assertNotNull(found); Assert.assertEquals(company.getInfoLines().size(), 2); + Persister.rollback(); + Persister.begin(); company.addInfo(new Info("description 3", "info 3")); @@ -73,11 +77,15 @@ Persister.commit(); + Persister.begin(); + found = Persister.find(Company.class, company.getId()); Assert.assertNotNull(found); Assert.assertEquals(company.getInfoLines().size(), 3); + Persister.rollback(); + Persister.begin(); Info infox = company.getInfoLines().remove(1); @@ -87,10 +95,14 @@ Persister.commit(); + Persister.begin(); + found = Persister.find(Company.class, company.getId()); Assert.assertNotNull(found); Assert.assertEquals(company.getInfoLines().size(), 2); + + Persister.rollback(); } } diff --git a/test/nl/astraeus/database/TestDelete.java b/test/nl/astraeus/database/TestDelete.java index 0c89ab1..45cf1ee 100644 --- a/test/nl/astraeus/database/TestDelete.java +++ b/test/nl/astraeus/database/TestDelete.java @@ -58,9 +58,12 @@ Persister.commit(); + Persister.begin(); List persons = Persister.selectWhere(Person.class, "age > ?", 30); + Persister.rollback(); + Persister.begin(); for (Person person : persons) { @@ -69,8 +72,12 @@ Persister.commit(); + Persister.begin(); + persons = Persister.selectAll(Person.class); + Persister.rollback(); + Assert.assertEquals(persons.size(), 2); } diff --git a/test/nl/astraeus/database/TestFind.java b/test/nl/astraeus/database/TestFind.java index 00c10d0..821edbe 100644 --- a/test/nl/astraeus/database/TestFind.java +++ b/test/nl/astraeus/database/TestFind.java @@ -57,8 +57,12 @@ Persister.commit(); + Persister.begin(); + Person p2 = Persister.find(Person.class, id); + Persister.rollback(); + Assert.assertNotNull(p2); Assert.assertEquals("Rien", p2.getName()); } diff --git a/test/nl/astraeus/database/TestInsert.java b/test/nl/astraeus/database/TestInsert.java index dbc77d9..cafd4e8 100644 --- a/test/nl/astraeus/database/TestInsert.java +++ b/test/nl/astraeus/database/TestInsert.java @@ -59,9 +59,13 @@ } }); + Persister.begin(); + List persons = Persister.selectAll(Person.class); Assert.assertTrue(persons.size() == 4); + + Persister.rollback(); } } diff --git a/test/nl/astraeus/database/TestReference.java b/test/nl/astraeus/database/TestReference.java index fd821d4..474c9ce 100644 --- a/test/nl/astraeus/database/TestReference.java +++ b/test/nl/astraeus/database/TestReference.java @@ -64,8 +64,12 @@ Persister.commit(); + Persister.begin(); + Person p2 = Persister.find(Person.class, person.getId()); + Persister.rollback(); + Assert.assertNotNull(p2); Assert.assertNotNull(p2.getCompany()); Assert.assertEquals(p2.getCompany().getName(), "Company name"); @@ -88,8 +92,12 @@ Persister.commit(); + Persister.begin(); + Company found = Persister.find(Company.class, company.getId()); + Persister.rollback(); + for (Info info : company.getInfoLines()) { Assert.assertNotNull(info.getDescription()); Assert.assertNotNull(info.getInfo()); diff --git a/test/nl/astraeus/database/TestCache.java b/test/nl/astraeus/database/TestCache.java index dd0c88c..8774e73 100644 --- a/test/nl/astraeus/database/TestCache.java +++ b/test/nl/astraeus/database/TestCache.java @@ -73,9 +73,14 @@ } }); - List persons = Persister.selectAll(Person.class); + Persister.execute(new Persister.Executor() { + @Override + public void execute() { + List persons = Persister.selectAll(Person.class); - Assert.assertEquals(Cache.get().getObjectCache(Person.class).getNumberCached() ,6); + Assert.assertEquals(Cache.get().getObjectCache(Person.class).getNumberCached() ,6); + } + }); } } diff --git a/test/nl/astraeus/database/TestCollection.java b/test/nl/astraeus/database/TestCollection.java index 33f7486..b4d6e61 100644 --- a/test/nl/astraeus/database/TestCollection.java +++ b/test/nl/astraeus/database/TestCollection.java @@ -60,11 +60,15 @@ Persister.commit(); + Persister.begin(); + Company found = Persister.find(Company.class, company.getId()); Assert.assertNotNull(found); Assert.assertEquals(company.getInfoLines().size(), 2); + Persister.rollback(); + Persister.begin(); company.addInfo(new Info("description 3", "info 3")); @@ -73,11 +77,15 @@ Persister.commit(); + Persister.begin(); + found = Persister.find(Company.class, company.getId()); Assert.assertNotNull(found); Assert.assertEquals(company.getInfoLines().size(), 3); + Persister.rollback(); + Persister.begin(); Info infox = company.getInfoLines().remove(1); @@ -87,10 +95,14 @@ Persister.commit(); + Persister.begin(); + found = Persister.find(Company.class, company.getId()); Assert.assertNotNull(found); Assert.assertEquals(company.getInfoLines().size(), 2); + + Persister.rollback(); } } diff --git a/test/nl/astraeus/database/TestDelete.java b/test/nl/astraeus/database/TestDelete.java index 0c89ab1..45cf1ee 100644 --- a/test/nl/astraeus/database/TestDelete.java +++ b/test/nl/astraeus/database/TestDelete.java @@ -58,9 +58,12 @@ Persister.commit(); + Persister.begin(); List persons = Persister.selectWhere(Person.class, "age > ?", 30); + Persister.rollback(); + Persister.begin(); for (Person person : persons) { @@ -69,8 +72,12 @@ Persister.commit(); + Persister.begin(); + persons = Persister.selectAll(Person.class); + Persister.rollback(); + Assert.assertEquals(persons.size(), 2); } diff --git a/test/nl/astraeus/database/TestFind.java b/test/nl/astraeus/database/TestFind.java index 00c10d0..821edbe 100644 --- a/test/nl/astraeus/database/TestFind.java +++ b/test/nl/astraeus/database/TestFind.java @@ -57,8 +57,12 @@ Persister.commit(); + Persister.begin(); + Person p2 = Persister.find(Person.class, id); + Persister.rollback(); + Assert.assertNotNull(p2); Assert.assertEquals("Rien", p2.getName()); } diff --git a/test/nl/astraeus/database/TestInsert.java b/test/nl/astraeus/database/TestInsert.java index dbc77d9..cafd4e8 100644 --- a/test/nl/astraeus/database/TestInsert.java +++ b/test/nl/astraeus/database/TestInsert.java @@ -59,9 +59,13 @@ } }); + Persister.begin(); + List persons = Persister.selectAll(Person.class); Assert.assertTrue(persons.size() == 4); + + Persister.rollback(); } } diff --git a/test/nl/astraeus/database/TestReference.java b/test/nl/astraeus/database/TestReference.java index fd821d4..474c9ce 100644 --- a/test/nl/astraeus/database/TestReference.java +++ b/test/nl/astraeus/database/TestReference.java @@ -64,8 +64,12 @@ Persister.commit(); + Persister.begin(); + Person p2 = Persister.find(Person.class, person.getId()); + Persister.rollback(); + Assert.assertNotNull(p2); Assert.assertNotNull(p2.getCompany()); Assert.assertEquals(p2.getCompany().getName(), "Company name"); @@ -88,8 +92,12 @@ Persister.commit(); + Persister.begin(); + Company found = Persister.find(Company.class, company.getId()); + Persister.rollback(); + for (Info info : company.getInfoLines()) { Assert.assertNotNull(info.getDescription()); Assert.assertNotNull(info.getInfo()); diff --git a/test/nl/astraeus/database/TestSelectAll.java b/test/nl/astraeus/database/TestSelectAll.java index aa37ae7..ae89836 100644 --- a/test/nl/astraeus/database/TestSelectAll.java +++ b/test/nl/astraeus/database/TestSelectAll.java @@ -65,12 +65,18 @@ Persister.commit(); + Persister.begin(); + List persons = Persister.selectAll(Person.class); + Persister.rollback(); + Assert.assertEquals(persons.size(), 5); Cache.get().clear(); + Persister.begin(); + long start1 = System.nanoTime(); persons = Persister.selectAll(Person.class); long stop1 = System.nanoTime(); @@ -91,6 +97,8 @@ persons = Persister.selectAll(Person.class); long stop3 = System.nanoTime(); + Persister.rollback(); + for (Person person : persons) { logger.info("3all Found: "+person.getName()); } diff --git a/test/nl/astraeus/database/TestCache.java b/test/nl/astraeus/database/TestCache.java index dd0c88c..8774e73 100644 --- a/test/nl/astraeus/database/TestCache.java +++ b/test/nl/astraeus/database/TestCache.java @@ -73,9 +73,14 @@ } }); - List persons = Persister.selectAll(Person.class); + Persister.execute(new Persister.Executor() { + @Override + public void execute() { + List persons = Persister.selectAll(Person.class); - Assert.assertEquals(Cache.get().getObjectCache(Person.class).getNumberCached() ,6); + Assert.assertEquals(Cache.get().getObjectCache(Person.class).getNumberCached() ,6); + } + }); } } diff --git a/test/nl/astraeus/database/TestCollection.java b/test/nl/astraeus/database/TestCollection.java index 33f7486..b4d6e61 100644 --- a/test/nl/astraeus/database/TestCollection.java +++ b/test/nl/astraeus/database/TestCollection.java @@ -60,11 +60,15 @@ Persister.commit(); + Persister.begin(); + Company found = Persister.find(Company.class, company.getId()); Assert.assertNotNull(found); Assert.assertEquals(company.getInfoLines().size(), 2); + Persister.rollback(); + Persister.begin(); company.addInfo(new Info("description 3", "info 3")); @@ -73,11 +77,15 @@ Persister.commit(); + Persister.begin(); + found = Persister.find(Company.class, company.getId()); Assert.assertNotNull(found); Assert.assertEquals(company.getInfoLines().size(), 3); + Persister.rollback(); + Persister.begin(); Info infox = company.getInfoLines().remove(1); @@ -87,10 +95,14 @@ Persister.commit(); + Persister.begin(); + found = Persister.find(Company.class, company.getId()); Assert.assertNotNull(found); Assert.assertEquals(company.getInfoLines().size(), 2); + + Persister.rollback(); } } diff --git a/test/nl/astraeus/database/TestDelete.java b/test/nl/astraeus/database/TestDelete.java index 0c89ab1..45cf1ee 100644 --- a/test/nl/astraeus/database/TestDelete.java +++ b/test/nl/astraeus/database/TestDelete.java @@ -58,9 +58,12 @@ Persister.commit(); + Persister.begin(); List persons = Persister.selectWhere(Person.class, "age > ?", 30); + Persister.rollback(); + Persister.begin(); for (Person person : persons) { @@ -69,8 +72,12 @@ Persister.commit(); + Persister.begin(); + persons = Persister.selectAll(Person.class); + Persister.rollback(); + Assert.assertEquals(persons.size(), 2); } diff --git a/test/nl/astraeus/database/TestFind.java b/test/nl/astraeus/database/TestFind.java index 00c10d0..821edbe 100644 --- a/test/nl/astraeus/database/TestFind.java +++ b/test/nl/astraeus/database/TestFind.java @@ -57,8 +57,12 @@ Persister.commit(); + Persister.begin(); + Person p2 = Persister.find(Person.class, id); + Persister.rollback(); + Assert.assertNotNull(p2); Assert.assertEquals("Rien", p2.getName()); } diff --git a/test/nl/astraeus/database/TestInsert.java b/test/nl/astraeus/database/TestInsert.java index dbc77d9..cafd4e8 100644 --- a/test/nl/astraeus/database/TestInsert.java +++ b/test/nl/astraeus/database/TestInsert.java @@ -59,9 +59,13 @@ } }); + Persister.begin(); + List persons = Persister.selectAll(Person.class); Assert.assertTrue(persons.size() == 4); + + Persister.rollback(); } } diff --git a/test/nl/astraeus/database/TestReference.java b/test/nl/astraeus/database/TestReference.java index fd821d4..474c9ce 100644 --- a/test/nl/astraeus/database/TestReference.java +++ b/test/nl/astraeus/database/TestReference.java @@ -64,8 +64,12 @@ Persister.commit(); + Persister.begin(); + Person p2 = Persister.find(Person.class, person.getId()); + Persister.rollback(); + Assert.assertNotNull(p2); Assert.assertNotNull(p2.getCompany()); Assert.assertEquals(p2.getCompany().getName(), "Company name"); @@ -88,8 +92,12 @@ Persister.commit(); + Persister.begin(); + Company found = Persister.find(Company.class, company.getId()); + Persister.rollback(); + for (Info info : company.getInfoLines()) { Assert.assertNotNull(info.getDescription()); Assert.assertNotNull(info.getInfo()); diff --git a/test/nl/astraeus/database/TestSelectAll.java b/test/nl/astraeus/database/TestSelectAll.java index aa37ae7..ae89836 100644 --- a/test/nl/astraeus/database/TestSelectAll.java +++ b/test/nl/astraeus/database/TestSelectAll.java @@ -65,12 +65,18 @@ Persister.commit(); + Persister.begin(); + List persons = Persister.selectAll(Person.class); + Persister.rollback(); + Assert.assertEquals(persons.size(), 5); Cache.get().clear(); + Persister.begin(); + long start1 = System.nanoTime(); persons = Persister.selectAll(Person.class); long stop1 = System.nanoTime(); @@ -91,6 +97,8 @@ persons = Persister.selectAll(Person.class); long stop3 = System.nanoTime(); + Persister.rollback(); + for (Person person : persons) { logger.info("3all Found: "+person.getName()); } diff --git a/test/nl/astraeus/database/TestSelectWhere.java b/test/nl/astraeus/database/TestSelectWhere.java index d91f5b5..aaebf6d 100644 --- a/test/nl/astraeus/database/TestSelectWhere.java +++ b/test/nl/astraeus/database/TestSelectWhere.java @@ -62,6 +62,8 @@ Persister.commit(); + Persister.begin(); + List persons = Persister.selectWhere(Person.class, "age > ?", 30); Assert.assertEquals(persons.size(), 3); @@ -69,6 +71,8 @@ persons = Persister.selectWhere(Person.class, "name like ?", "R%"); Assert.assertEquals(persons.size(), 2); + + Persister.rollback(); } } diff --git a/test/nl/astraeus/database/TestCache.java b/test/nl/astraeus/database/TestCache.java index dd0c88c..8774e73 100644 --- a/test/nl/astraeus/database/TestCache.java +++ b/test/nl/astraeus/database/TestCache.java @@ -73,9 +73,14 @@ } }); - List persons = Persister.selectAll(Person.class); + Persister.execute(new Persister.Executor() { + @Override + public void execute() { + List persons = Persister.selectAll(Person.class); - Assert.assertEquals(Cache.get().getObjectCache(Person.class).getNumberCached() ,6); + Assert.assertEquals(Cache.get().getObjectCache(Person.class).getNumberCached() ,6); + } + }); } } diff --git a/test/nl/astraeus/database/TestCollection.java b/test/nl/astraeus/database/TestCollection.java index 33f7486..b4d6e61 100644 --- a/test/nl/astraeus/database/TestCollection.java +++ b/test/nl/astraeus/database/TestCollection.java @@ -60,11 +60,15 @@ Persister.commit(); + Persister.begin(); + Company found = Persister.find(Company.class, company.getId()); Assert.assertNotNull(found); Assert.assertEquals(company.getInfoLines().size(), 2); + Persister.rollback(); + Persister.begin(); company.addInfo(new Info("description 3", "info 3")); @@ -73,11 +77,15 @@ Persister.commit(); + Persister.begin(); + found = Persister.find(Company.class, company.getId()); Assert.assertNotNull(found); Assert.assertEquals(company.getInfoLines().size(), 3); + Persister.rollback(); + Persister.begin(); Info infox = company.getInfoLines().remove(1); @@ -87,10 +95,14 @@ Persister.commit(); + Persister.begin(); + found = Persister.find(Company.class, company.getId()); Assert.assertNotNull(found); Assert.assertEquals(company.getInfoLines().size(), 2); + + Persister.rollback(); } } diff --git a/test/nl/astraeus/database/TestDelete.java b/test/nl/astraeus/database/TestDelete.java index 0c89ab1..45cf1ee 100644 --- a/test/nl/astraeus/database/TestDelete.java +++ b/test/nl/astraeus/database/TestDelete.java @@ -58,9 +58,12 @@ Persister.commit(); + Persister.begin(); List persons = Persister.selectWhere(Person.class, "age > ?", 30); + Persister.rollback(); + Persister.begin(); for (Person person : persons) { @@ -69,8 +72,12 @@ Persister.commit(); + Persister.begin(); + persons = Persister.selectAll(Person.class); + Persister.rollback(); + Assert.assertEquals(persons.size(), 2); } diff --git a/test/nl/astraeus/database/TestFind.java b/test/nl/astraeus/database/TestFind.java index 00c10d0..821edbe 100644 --- a/test/nl/astraeus/database/TestFind.java +++ b/test/nl/astraeus/database/TestFind.java @@ -57,8 +57,12 @@ Persister.commit(); + Persister.begin(); + Person p2 = Persister.find(Person.class, id); + Persister.rollback(); + Assert.assertNotNull(p2); Assert.assertEquals("Rien", p2.getName()); } diff --git a/test/nl/astraeus/database/TestInsert.java b/test/nl/astraeus/database/TestInsert.java index dbc77d9..cafd4e8 100644 --- a/test/nl/astraeus/database/TestInsert.java +++ b/test/nl/astraeus/database/TestInsert.java @@ -59,9 +59,13 @@ } }); + Persister.begin(); + List persons = Persister.selectAll(Person.class); Assert.assertTrue(persons.size() == 4); + + Persister.rollback(); } } diff --git a/test/nl/astraeus/database/TestReference.java b/test/nl/astraeus/database/TestReference.java index fd821d4..474c9ce 100644 --- a/test/nl/astraeus/database/TestReference.java +++ b/test/nl/astraeus/database/TestReference.java @@ -64,8 +64,12 @@ Persister.commit(); + Persister.begin(); + Person p2 = Persister.find(Person.class, person.getId()); + Persister.rollback(); + Assert.assertNotNull(p2); Assert.assertNotNull(p2.getCompany()); Assert.assertEquals(p2.getCompany().getName(), "Company name"); @@ -88,8 +92,12 @@ Persister.commit(); + Persister.begin(); + Company found = Persister.find(Company.class, company.getId()); + Persister.rollback(); + for (Info info : company.getInfoLines()) { Assert.assertNotNull(info.getDescription()); Assert.assertNotNull(info.getInfo()); diff --git a/test/nl/astraeus/database/TestSelectAll.java b/test/nl/astraeus/database/TestSelectAll.java index aa37ae7..ae89836 100644 --- a/test/nl/astraeus/database/TestSelectAll.java +++ b/test/nl/astraeus/database/TestSelectAll.java @@ -65,12 +65,18 @@ Persister.commit(); + Persister.begin(); + List persons = Persister.selectAll(Person.class); + Persister.rollback(); + Assert.assertEquals(persons.size(), 5); Cache.get().clear(); + Persister.begin(); + long start1 = System.nanoTime(); persons = Persister.selectAll(Person.class); long stop1 = System.nanoTime(); @@ -91,6 +97,8 @@ persons = Persister.selectAll(Person.class); long stop3 = System.nanoTime(); + Persister.rollback(); + for (Person person : persons) { logger.info("3all Found: "+person.getName()); } diff --git a/test/nl/astraeus/database/TestSelectWhere.java b/test/nl/astraeus/database/TestSelectWhere.java index d91f5b5..aaebf6d 100644 --- a/test/nl/astraeus/database/TestSelectWhere.java +++ b/test/nl/astraeus/database/TestSelectWhere.java @@ -62,6 +62,8 @@ Persister.commit(); + Persister.begin(); + List persons = Persister.selectWhere(Person.class, "age > ?", 30); Assert.assertEquals(persons.size(), 3); @@ -69,6 +71,8 @@ persons = Persister.selectWhere(Person.class, "name like ?", "R%"); Assert.assertEquals(persons.size(), 2); + + Persister.rollback(); } } diff --git a/test/nl/astraeus/database/TestUpdate.java b/test/nl/astraeus/database/TestUpdate.java index 658f995..341932d 100644 --- a/test/nl/astraeus/database/TestUpdate.java +++ b/test/nl/astraeus/database/TestUpdate.java @@ -61,6 +61,7 @@ Persister.commit(); + Persister.begin(); List persons = Persister.selectWhere(Person.class, "age > ?", 30); @@ -74,9 +75,13 @@ Persister.commit(); + Persister.begin(); + persons = Persister.selectWhere(Person.class, "age > ?", 32); Assert.assertEquals(persons.size(), 2); + + Persister.rollback(); } }