Repository: cayenne Updated Branches: refs/heads/master a0b06f45f -> bcd834171
Cleanup build output Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/bcd83417 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/bcd83417 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/bcd83417 Branch: refs/heads/master Commit: bcd83417174c587bf008bc0124a6be9b09e35392 Parents: a0b06f4 Author: Nikita Timofeev <stari...@gmail.com> Authored: Thu May 17 12:44:03 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Thu May 17 12:44:03 2018 +0300 ---------------------------------------------------------------------- .../cayenne/tools/DbImporterTaskTest.java | 12 +- cayenne-gradle-plugin/build.gradle | 8 +- .../apache/cayenne/tools/BaseCayenneTask.java | 2 - .../org/apache/cayenne/tools/DbImportIT.java | 2 +- .../CayenneDataObjectSetToManyCollectionIT.java | 19 +-- .../CayenneDataObjectSetToManyListIT.java | 160 +++++++----------- .../CayenneDataObjectSetToManyMapIT.java | 93 +++++------ .../CayenneDataObjectSetToManySetIT.java | 16 +- .../apache/cayenne/ObjectIdRegressionTest.java | 19 +-- .../access/NestedDataContextWriteIT.java | 4 +- .../org/apache/cayenne/map/DataMapTest.java | 17 +- .../tools/MavenPluginClassLoaderManager.java | 1 - .../cayenne/modeler/util/CircularArrayTest.java | 162 +++++-------------- pom.xml | 2 +- 14 files changed, 172 insertions(+), 345 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/bcd83417/cayenne-ant/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java ---------------------------------------------------------------------- diff --git a/cayenne-ant/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java b/cayenne-ant/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java index 7e88a1b..4929c88 100644 --- a/cayenne-ant/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java +++ b/cayenne-ant/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java @@ -164,7 +164,6 @@ public class DbImporterTaskTest { ResultSet tables = connection.getMetaData().getTables(null, null, null, new String[]{"TABLE"}); while (tables.next()) { String schema = tables.getString("TABLE_SCHEM"); - System.out.println("DROP TABLE " + (isBlank(schema) ? "" : schema + ".") + tables.getString("TABLE_NAME")); stmt.execute("DROP TABLE " + (isBlank(schema) ? "" : schema + ".") + tables.getString("TABLE_NAME")); } @@ -172,7 +171,6 @@ public class DbImporterTaskTest { while (schemas.next()) { String schem = schemas.getString("TABLE_SCHEM"); if (schem.startsWith("SCHEMA")) { - System.out.println("DROP SCHEMA " + schem); stmt.execute("DROP SCHEMA " + schem + " RESTRICT"); } } @@ -195,10 +193,7 @@ public class DbImporterTaskTest { fail(diff.toString()); } - } catch (SAXException e) { - e.printStackTrace(); - fail(); - } catch (IOException e) { + } catch (SAXException | IOException e) { e.printStackTrace(); fail(); } @@ -214,8 +209,7 @@ public class DbImporterTaskTest { try (Connection c = DriverManager.getConnection(dbImportConfiguration.getUrl());) { // TODO: move parsing SQL files to a common utility (DBHelper?) . - // ALso see UnitDbApater.executeDDL - this should use the same - // utility + // Also see UnitDbApater.executeDDL - this should use the same utility try (Statement stmt = c.createStatement();) { for (String sql : SQLReader.statements(sqlUrl, ";")) { @@ -231,6 +225,4 @@ public class DbImporterTaskTest { } } - - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cayenne/blob/bcd83417/cayenne-gradle-plugin/build.gradle ---------------------------------------------------------------------- diff --git a/cayenne-gradle-plugin/build.gradle b/cayenne-gradle-plugin/build.gradle index 04a31d9..b75d626 100644 --- a/cayenne-gradle-plugin/build.gradle +++ b/cayenne-gradle-plugin/build.gradle @@ -27,7 +27,6 @@ version projectVersion def cayenneVersion = version apply plugin: 'java' -apply plugin: 'maven' sourceCompatibility = 1.8 @@ -76,9 +75,4 @@ task licenseFiles(type: Copy) { } processResources.dependsOn licenseFiles -processResources.dependsOn versionFile - -test { - testLogging.showStandardStreams = true - testLogging.exceptionFormat = 'full' -} \ No newline at end of file +processResources.dependsOn versionFile \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cayenne/blob/bcd83417/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/BaseCayenneTask.java ---------------------------------------------------------------------- diff --git a/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/BaseCayenneTask.java b/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/BaseCayenneTask.java index 1d11f7c..1a28570 100644 --- a/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/BaseCayenneTask.java +++ b/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/BaseCayenneTask.java @@ -23,7 +23,6 @@ import java.io.File; import org.gradle.api.DefaultTask; import org.gradle.api.InvalidUserDataException; -import org.gradle.api.Project; import org.gradle.api.tasks.Internal; /** @@ -57,7 +56,6 @@ public class BaseCayenneTask extends DefaultTask { setMap(mapFile); } - @Internal public File getDataMapFile() { if (map != null) { http://git-wip-us.apache.org/repos/asf/cayenne/blob/bcd83417/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportIT.java ---------------------------------------------------------------------- diff --git a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportIT.java b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportIT.java index 9753d8e..3933750 100644 --- a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportIT.java +++ b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportIT.java @@ -76,7 +76,7 @@ public class DbImportIT extends BaseTaskIT { assertNotNull(result.task(":cdbimport")); assertEquals(TaskOutcome.SUCCESS, result.task(":cdbimport").getOutcome()); - System.out.println(result.getOutput()); + File dataMap = new File(projectDir.getAbsolutePath() + "/datamap.map.xml"); assertTrue(dataMap.exists()); assertTrue(result.getOutput().contains("Detected changes: No changes to import.")); http://git-wip-us.apache.org/repos/asf/cayenne/blob/bcd83417/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManyCollectionIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManyCollectionIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManyCollectionIT.java index ccb4a4c..90210b0 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManyCollectionIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManyCollectionIT.java @@ -33,9 +33,7 @@ import org.junit.Test; import java.util.ArrayList; import java.util.Collection; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; @UseServerRuntime(CayenneProjects.RELATIONSHIPS_COLLECTION_TO_MANY_PROJECT) public class CayenneDataObjectSetToManyCollectionIT extends ServerCase { @@ -60,7 +58,7 @@ public class CayenneDataObjectSetToManyCollectionIT extends ServerCase { } @Test - public void testReadToMany() throws Exception { + public void testReadToMany() { CollectionToMany o1 = Cayenne.objectForPK(context, CollectionToMany.class, 1); @@ -77,22 +75,17 @@ public class CayenneDataObjectSetToManyCollectionIT extends ServerCase { } /** - * Testing if collection type is Collection, everything should work fine without an - * runtimexception - * - * @throws Exception + * Testing if collection type is Collection, everything should work fine without a runtime exception */ @Test - public void testRelationCollectionTypeCollection() throws Exception { + public void testRelationCollectionTypeCollection() { CollectionToMany o1 = Cayenne.objectForPK(context, CollectionToMany.class, 1); assertTrue(o1.readProperty(CollectionToMany.TARGETS.getName()) instanceof Collection); - boolean catchedSomething = false; try { o1.setToManyTarget(CollectionToMany.TARGETS.getName(), new ArrayList<CollectionToMany>(0), true); } catch (RuntimeException e) { - catchedSomething = true; + fail(); } - assertEquals(catchedSomething, false); - assertEquals(o1.getTargets().size(), 0); + assertEquals(0, o1.getTargets().size()); } } http://git-wip-us.apache.org/repos/asf/cayenne/blob/bcd83417/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManyListIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManyListIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManyListIT.java index 9ca609b..6d8c457 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManyListIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManyListIT.java @@ -38,9 +38,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; @UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class CayenneDataObjectSetToManyListIT extends ServerCase { @@ -66,6 +64,7 @@ public class CayenneDataObjectSetToManyListIT extends ServerCase { tPainting.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.BIGINT); + createArtistWithPaintingDataSet(); } private void createArtistWithPaintingDataSet() throws Exception { @@ -76,13 +75,9 @@ public class CayenneDataObjectSetToManyListIT extends ServerCase { } @Test - public void testReadRO1() throws Exception { - - createArtistWithPaintingDataSet(); - + public void testReadRO1() { Artist a1 = Cayenne.objectForPK(context, Artist.class, 8); - - assertEquals(a1 != null, true); + assertNotNull(a1); List<ROPainting> paints = ObjectSelect.query(ROPainting.class).where(ROPainting.TO_ARTIST.eq(a1)) .select(context); @@ -94,67 +89,43 @@ public class CayenneDataObjectSetToManyListIT extends ServerCase { } @Test - public void testSetEmptyList1() throws Exception { - createArtistWithPaintingDataSet(); + public void testSetEmptyList1() { Artist artist = Cayenne.objectForPK(context, Artist.class, 8); artist.setToManyTarget(Artist.PAINTING_ARRAY.getName(), new ArrayList<ROPainting>(0), true); List<Painting> paints = artist.getPaintingArray(); assertEquals(0, paints.size()); } - @Test - public void testSetEmptyList2() throws Exception { - createArtistWithPaintingDataSet(); + @Test(expected = IllegalArgumentException.class) + public void testSetEmptyList2() { Artist artist = Cayenne.objectForPK(context, Artist.class, 8); - boolean thrown = false; - try { - artist.setToManyTarget(Artist.PAINTING_ARRAY.getName(), null, true); - } catch (IllegalArgumentException e) { - thrown = true; - } - assertEquals("should throw a IllegalArgumentException", thrown, true); + artist.setToManyTarget(Artist.PAINTING_ARRAY.getName(), null, true); } - @Test - public void testWrongRelName() throws Exception { - createArtistWithPaintingDataSet(); - + @Test(expected = IllegalArgumentException.class) + public void testNonExistentRelName() { Artist artist = Cayenne.objectForPK(context, Artist.class, 8); - boolean thrown = false; - try { - artist.setToManyTarget("doesnotexist", new ArrayList<ROPainting>(0), true); - } catch (IllegalArgumentException e) { - thrown = true; - } - assertEquals("should throw a IllegalArgumentException, because the relName does not exist", thrown, true); - - thrown = false; - try { - artist.setToManyTarget("", new ArrayList<ROPainting>(0), true); - } catch (IllegalArgumentException e) { - thrown = true; - } - assertEquals("should throw a IllegalArgumentException, because the relName is an empty string", thrown, true); + artist.setToManyTarget("doesnotexist", new ArrayList<ROPainting>(0), true); + } - thrown = false; - try { - artist.setToManyTarget(null, new ArrayList<ROPainting>(0), true); - } catch (IllegalArgumentException e) { - thrown = true; - } - assertEquals("should throw a IllegalArgumentException, because the relName is NULL", thrown, true); + @Test(expected = IllegalArgumentException.class) + public void testEmptyRelName() { + Artist artist = Cayenne.objectForPK(context, Artist.class, 8); + artist.setToManyTarget("", new ArrayList<ROPainting>(0), true); + } + @Test(expected = IllegalArgumentException.class) + public void testNullRelName() { + Artist artist = Cayenne.objectForPK(context, Artist.class, 8); + artist.setToManyTarget(null, new ArrayList<ROPainting>(0), true); } @Test - public void testTotalDifferentPaintings() throws Exception { - createArtistWithPaintingDataSet(); - + public void testTotalDifferentPaintings() { Artist artist = Cayenne.objectForPK(context, Artist.class, 8); // copy the paintings list. Replacing paintings wont change the copy - List<Painting> oldPaints = new ArrayList<Painting>(artist.getPaintingArray()); - System.out.println("class:" + oldPaints.getClass()); + List<Painting> oldPaints = new ArrayList<>(artist.getPaintingArray()); Painting paintX = new Painting(); paintX.setPaintingTitle("pantingX"); @@ -166,24 +137,22 @@ public class CayenneDataObjectSetToManyListIT extends ServerCase { List<? extends DataObject> returnList = artist.setToManyTarget(Artist.PAINTING_ARRAY.getName(), Arrays.asList(paintX, paintY, paintZ), true); - assertEquals(returnList.size(), 3); - assertEquals(returnList.containsAll(oldPaints), true); + assertEquals(3, returnList.size()); + assertTrue(returnList.containsAll(oldPaints)); List<Painting> newPaints = artist.getPaintingArray(); - assertEquals(newPaints.size(), 3); + assertEquals(3, newPaints.size()); for (Painting oldPaint : oldPaints) { // no element of oldPaints should exist in the newPaints - assertEquals(newPaints.contains(oldPaint), false); + assertFalse(newPaints.contains(oldPaint)); } } @Test - public void testSamePaintings() throws Exception { - createArtistWithPaintingDataSet(); - + public void testSamePaintings() { Artist artist = Cayenne.objectForPK(context, Artist.class, 8); - List<Painting> oldPaints = new ArrayList<Painting>(artist.getPaintingArray()); + List<Painting> oldPaints = new ArrayList<>(artist.getPaintingArray()); Painting paint6 = Cayenne.objectForPK(context, Painting.class, 6); Painting paint7 = Cayenne.objectForPK(context, Painting.class, 7); @@ -193,26 +162,22 @@ public class CayenneDataObjectSetToManyListIT extends ServerCase { List<? extends DataObject> returnList = artist.setToManyTarget(Artist.PAINTING_ARRAY.getName(), newPaints, true); - assertEquals(returnList.size(), 0); + assertEquals(0, returnList.size()); newPaints = artist.getPaintingArray(); // testing if oldPaints and newPaints contain the same objects - assertEquals(newPaints.size(), 3); - assertEquals(oldPaints.size(), 3); - assertEquals(newPaints.containsAll(oldPaints), true); + assertEquals(3, newPaints.size()); + assertEquals(3, oldPaints.size()); + assertTrue(newPaints.containsAll(oldPaints)); } @Test - public void testOldPlusNewPaintings() throws Exception { - createArtistWithPaintingDataSet(); - + public void testOldPlusNewPaintings() { Artist artist = Cayenne.objectForPK(context, Artist.class, 8); List<Painting> oldPaints = artist.getPaintingArray(); - List<Painting> newPaints = new ArrayList<Painting>(6); - for (int i = 0; i < oldPaints.size(); i++) { - newPaints.add(oldPaints.get(i)); - } + List<Painting> newPaints = new ArrayList<>(6); + newPaints.addAll(oldPaints); Painting paintX = new Painting(); paintX.setPaintingTitle("pantingX"); @@ -232,22 +197,20 @@ public class CayenneDataObjectSetToManyListIT extends ServerCase { Painting paint7 = Cayenne.objectForPK(context, Painting.class, 7); Painting paint8 = Cayenne.objectForPK(context, Painting.class, 8); - assertEquals(newPaints2.size(), 6); - assertEquals(newPaints2.contains(paintX), true); - assertEquals(newPaints2.contains(paintY), true); - assertEquals(newPaints2.contains(paintZ), true); - assertEquals(newPaints2.contains(paint6), true); - assertEquals(newPaints2.contains(paint7), true); - assertEquals(newPaints2.contains(paint8), true); + assertEquals(6, newPaints2.size()); + assertTrue(newPaints2.contains(paintX)); + assertTrue(newPaints2.contains(paintY)); + assertTrue(newPaints2.contains(paintZ)); + assertTrue(newPaints2.contains(paint6)); + assertTrue(newPaints2.contains(paint7)); + assertTrue(newPaints2.contains(paint8)); } @Test - public void testRemoveOneOldAndAddOneNewPaintings() throws Exception { - createArtistWithPaintingDataSet(); - + public void testRemoveOneOldAndAddOneNewPaintings() { Artist artist = Cayenne.objectForPK(context, Artist.class, 8); - List<Painting> newPaints = new ArrayList<Painting>(); + List<Painting> newPaints = new ArrayList<>(); Painting paint6 = artist.getPaintingArray().get(0); Painting paint7 = artist.getPaintingArray().get(1); @@ -262,40 +225,33 @@ public class CayenneDataObjectSetToManyListIT extends ServerCase { newPaints.add(paintX); newPaints.add(paintY); - List<? extends DataObject> returnList = artist.setToManyTarget(Artist.PAINTING_ARRAY.getName(), newPaints, - true); + List<? extends DataObject> returnList = artist + .setToManyTarget(Artist.PAINTING_ARRAY.getName(), newPaints, true); - assertEquals(returnList.size(), 1); - assertEquals(returnList.get(0) == paint8, true); + assertEquals(1, returnList.size()); + assertSame(paint8, returnList.get(0)); List<Painting> newPaints2 = artist.getPaintingArray(); - assertEquals(newPaints2.size(), 4); - assertEquals(newPaints2.contains(paintX), true); - assertEquals(newPaints2.contains(paintY), true); - assertEquals(newPaints2.contains(paint6), true); - assertEquals(newPaints2.contains(paint7), true); + assertEquals(4, newPaints2.size()); + assertTrue(newPaints2.contains(paintX)); + assertTrue(newPaints2.contains(paintY)); + assertTrue(newPaints2.contains(paint6)); + assertTrue(newPaints2.contains(paint7)); } /** - * Testing if collection type is list, everything should work fine without an - * runtimexception - * - * @throws Exception + * Testing if collection type is list, everything should work fine without a RuntimeException */ @Test - public void testRelationCollectionTypeList() throws Exception { - createArtistWithPaintingDataSet(); - + public void testRelationCollectionTypeList() { Artist artist = Cayenne.objectForPK(context, Artist.class, 8); assertTrue(artist.readProperty(Artist.PAINTING_ARRAY.getName()) instanceof List); - boolean catchedSomething = false; try { artist.setToManyTarget(Artist.PAINTING_ARRAY.getName(), new ArrayList<Painting>(0), true); } catch (UnsupportedOperationException e) { - catchedSomething = true; + fail(); } - assertEquals(catchedSomething, false); - assertEquals(artist.getPaintingArray().size(), 0); + assertEquals(0, artist.getPaintingArray().size()); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cayenne/blob/bcd83417/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManyMapIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManyMapIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManyMapIT.java index 0ea80e9..65c4c91 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManyMapIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManyMapIT.java @@ -32,65 +32,60 @@ import org.junit.Test; import java.util.ArrayList; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; @UseServerRuntime(CayenneProjects.MAP_TO_MANY_PROJECT) public class CayenneDataObjectSetToManyMapIT extends ServerCase { - @Inject - protected ObjectContext context; + @Inject + protected ObjectContext context; - @Inject - protected DBHelper dbHelper; + @Inject + protected DBHelper dbHelper; - protected TableHelper tMapToMany; - protected TableHelper tMapToManyTarget; - protected TableHelper tIdMapToMany; - protected TableHelper tIdMapToManyTarget; + protected TableHelper tMapToMany; + protected TableHelper tMapToManyTarget; + protected TableHelper tIdMapToMany; + protected TableHelper tIdMapToManyTarget; - @Before - public void setUp() throws Exception { - tMapToMany = new TableHelper(dbHelper, "MAP_TO_MANY"); - tMapToMany.setColumns("ID"); + @Before + public void setUp() throws Exception { + tMapToMany = new TableHelper(dbHelper, "MAP_TO_MANY"); + tMapToMany.setColumns("ID"); - tMapToManyTarget = new TableHelper(dbHelper, "MAP_TO_MANY_TARGET"); - tMapToManyTarget.setColumns("ID", "MAP_TO_MANY_ID", "NAME"); + tMapToManyTarget = new TableHelper(dbHelper, "MAP_TO_MANY_TARGET"); + tMapToManyTarget.setColumns("ID", "MAP_TO_MANY_ID", "NAME"); - tIdMapToMany = new TableHelper(dbHelper, "ID_MAP_TO_MANY"); - tIdMapToMany.setColumns("ID"); + tIdMapToMany = new TableHelper(dbHelper, "ID_MAP_TO_MANY"); + tIdMapToMany.setColumns("ID"); - tIdMapToManyTarget = new TableHelper(dbHelper, "ID_MAP_TO_MANY_TARGET"); - tIdMapToManyTarget.setColumns("ID", "MAP_TO_MANY_ID"); - } + tIdMapToManyTarget = new TableHelper(dbHelper, "ID_MAP_TO_MANY_TARGET"); + tIdMapToManyTarget.setColumns("ID", "MAP_TO_MANY_ID"); + createTestDataSet(); + } - protected void createTestDataSet() throws Exception { - tMapToMany.insert(1); - tMapToMany.insert(2); - tMapToManyTarget.insert(1, 1, "A"); - tMapToManyTarget.insert(2, 1, "B"); - tMapToManyTarget.insert(3, 1, "C"); - tMapToManyTarget.insert(4, 2, "A"); - } - - /** - * Testing if collection type is map, everything should work fine without an runtimexception - * @throws Exception - */ - @Test - public void testRelationCollectionTypeMap() throws Exception { - createTestDataSet(); - - MapToMany o1 = Cayenne.objectForPK(context, MapToMany.class, 1); - assertTrue (o1.readProperty(MapToMany.TARGETS.getName()) instanceof Map); - boolean catchedSomething = false; - try { - o1.setToManyTarget(MapToMany.TARGETS.getName(), new ArrayList<MapToMany>(0), true); - } catch(RuntimeException e) { - catchedSomething = true; - } - assertEquals(catchedSomething,false); - assertEquals(o1.getTargets().size(),0); - } + protected void createTestDataSet() throws Exception { + tMapToMany.insert(1); + tMapToMany.insert(2); + tMapToManyTarget.insert(1, 1, "A"); + tMapToManyTarget.insert(2, 1, "B"); + tMapToManyTarget.insert(3, 1, "C"); + tMapToManyTarget.insert(4, 2, "A"); + } + + /** + * Testing if collection type is map, everything should work fine without a runtime exception + */ + @Test + public void testRelationCollectionTypeMap() { + MapToMany o1 = Cayenne.objectForPK(context, MapToMany.class, 1); + assertTrue(o1.readProperty(MapToMany.TARGETS.getName()) instanceof Map); + try { + o1.setToManyTarget(MapToMany.TARGETS.getName(), new ArrayList<MapToMany>(0), true); + } catch (RuntimeException e) { + fail(); + } + assertEquals(0, o1.getTargets().size(), 0); + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cayenne/blob/bcd83417/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManySetIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManySetIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManySetIT.java index b3ec782..f857cb0 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManySetIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectSetToManySetIT.java @@ -33,8 +33,7 @@ import org.junit.Test; import java.util.ArrayList; import java.util.Set; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; @UseServerRuntime(CayenneProjects.RELATIONSHIPS_SET_TO_MANY_PROJECT) public class CayenneDataObjectSetToManySetIT extends ServerCase { @@ -55,6 +54,8 @@ public class CayenneDataObjectSetToManySetIT extends ServerCase { tSetToManyTarget = new TableHelper(dbHelper, "SET_TO_MANY_TARGET"); tSetToManyTarget.setColumns("ID", "SET_TO_MANY_ID"); + + createTestDataSet(); } protected void createTestDataSet() throws Exception { @@ -67,24 +68,19 @@ public class CayenneDataObjectSetToManySetIT extends ServerCase { } /** - * Testing if collection type is set, everything should work fine without an - * runtimexception - * - * @throws Exception + * Testing if collection type is set, everything should work fine without a runtime exception */ @Test public void testRelationCollectionTypeMap() throws Exception { - createTestDataSet(); + SetToMany o1 = Cayenne.objectForPK(context, SetToMany.class, 1); assertTrue(o1.readProperty(SetToMany.TARGETS.getName()) instanceof Set); - boolean catchedSomething = false; try { o1.setToManyTarget(SetToMany.TARGETS.getName(), new ArrayList<MapToMany>(0), true); } catch (RuntimeException e) { - catchedSomething = true; + fail(); } - assertEquals(catchedSomething, false); assertEquals(o1.getTargets().size(), 0); } } http://git-wip-us.apache.org/repos/asf/cayenne/blob/bcd83417/cayenne-server/src/test/java/org/apache/cayenne/ObjectIdRegressionTest.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/ObjectIdRegressionTest.java b/cayenne-server/src/test/java/org/apache/cayenne/ObjectIdRegressionTest.java index e747086..38ca185 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/ObjectIdRegressionTest.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/ObjectIdRegressionTest.java @@ -28,27 +28,14 @@ import static org.junit.Assert.assertTrue; public class ObjectIdRegressionTest { - // public void testX() { - // for (int i = 0; i < 10000; i++) { - // byte[] bytes = IDUtil.pseudoUniqueByteSequence8(); - // StringBuffer buffer = new StringBuffer(16); - // for(int j = 0; j < 8; j++) { - // IDUtil.appendFormattedByte(buffer, bytes[j]); - // } - // - // System.out.println(buffer); - // } - // } - @Test public void testIdPool() throws Exception { - // testing uniqueness of a sequence of ObjectIds generated quickly one after the - // other... + // testing uniqueness of a sequence of ObjectIds generated quickly one after the other... int size = 100000; new ObjectId("Artist"); - Object[] pool = new Object[size]; + ObjectId[] pool = new ObjectId[size]; long t0 = System.currentTimeMillis(); // fill in @@ -60,7 +47,7 @@ public class ObjectIdRegressionTest { assertTrue("This machine is too fast to run such test!", t1 - t0 > 1); - Set idSet = new HashSet(); + Set<ObjectId> idSet = new HashSet<>(); for (int i = 0; i < size; i++) { assertTrue("Failed to generate unique id #" + i, idSet.add(pool[i])); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/bcd83417/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java index c7064f3..c72f325 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java @@ -496,9 +496,7 @@ public class NestedDataContextWriteIT extends ServerCase { ObjEntity ent = childContext.getEntityResolver().getObjEntity("ArtGroup"); Collection<ObjRelationship> rels = ent.getDeclaredRelationships(); - for (ObjRelationship rel : rels) { - System.out.println(rel.getName()); - } + assertEquals(3, rels.size()); assertEquals(1, childO1.getGroupArray().size()); assertEquals(1, childO2.getArtistArray().size()); http://git-wip-us.apache.org/repos/asf/cayenne/blob/bcd83417/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java index cf81326..04915d4 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java @@ -19,14 +19,12 @@ package org.apache.cayenne.map; -import org.apache.cayenne.configuration.ConfigurationNodeVisitor; -import org.apache.cayenne.configuration.DataChannelDescriptor; -import org.apache.cayenne.configuration.DataNodeDescriptor; import org.apache.cayenne.configuration.EmptyConfigurationNodeVisitor; import org.apache.cayenne.configuration.xml.XMLDataMapLoader; import org.apache.cayenne.resource.URLResource; import org.apache.cayenne.util.Util; import org.apache.cayenne.util.XMLEncoder; +import org.junit.Ignore; import org.junit.Test; import java.io.ByteArrayInputStream; @@ -38,15 +36,8 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import static org.junit.Assert.*; +import static org.mockito.Mockito.*; /** * DataMap unit tests. @@ -417,6 +408,8 @@ public class DataMapTest { } } + @Ignore("this test is broken for many reasons " + + "(URL can't be mocked, encoder doesn't provide version, loader requires XMLReader proovider)") @Test public void testQuoteSqlIdentifiersEncodeAsXML() { DataMap map = new DataMap("aaa"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/bcd83417/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenPluginClassLoaderManager.java ---------------------------------------------------------------------- diff --git a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenPluginClassLoaderManager.java b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenPluginClassLoaderManager.java index cff8961..2077b4b 100644 --- a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenPluginClassLoaderManager.java +++ b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenPluginClassLoaderManager.java @@ -60,7 +60,6 @@ public class MavenPluginClassLoaderManager implements ClassLoaderManager { private void addUrlFromFile(final File file) { try { - System.out.println("Add URI to classpath: " + file.toURI()); urls.add(file.toURI().toURL()); } catch (Exception ignored) { } http://git-wip-us.apache.org/repos/asf/cayenne/blob/bcd83417/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/CircularArrayTest.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/CircularArrayTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/CircularArrayTest.java index 3328658..3abe586 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/CircularArrayTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/CircularArrayTest.java @@ -19,20 +19,17 @@ package org.apache.cayenne.modeler.util; -import java.util.Objects; - import org.junit.Test; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; public class CircularArrayTest { @Test - public void testArray() { + public void testArraySize5() { String a = "A", b = "B", c = "C", d = "D", e = "E", f = "F", g = "G", h = "H"; - String s; - CircularArray<String> q = new CircularArray<>(5); assertAdd(q, a, "[A, null, null, null, null]"); @@ -68,134 +65,63 @@ public class CircularArrayTest { assertRemove(q, f, "[D, G, null, null, null]"); assertRemove(q, g, "[D, null, null, null, null]"); assertRemove(q, d, "[null, null, null, null, null]"); + } + + @Test + public void testArraySize3() { + String a = "A", b = "B", c = "C", d = "D", e = "E"; + CircularArray<String> q = new CircularArray<>(3); + + assertEquals(0, q.size()); + assertEquals(3, q.capacity()); - q = new CircularArray<>(3); q.add(a); - int i = q.indexOf(a); - if (i != 0) { - System.out.println("indexOf(a) should be zero instead got [" + String.valueOf(i) + "]"); - } - s = q.get(0); - if (!Objects.equals(s, a)) { - System.out.println("get(0) should be 'a' instead got [" + s + "]"); - } - i = q.size(); - if (i != 1) { - System.out.println("size() should be 1 instead got [" + String.valueOf(i) + "]"); - } + + assertEquals(0, q.indexOf(a)); + assertEquals(a, q.get(0)); + assertEquals(1, q.size()); q.add(b); - i = q.indexOf(b); - if (i != 1) { - System.out.println("indexOf(b) should be 1 instead got [" + String.valueOf(i) + "]"); - } - s = q.get(0); - if (!Objects.equals(s, a)) { - System.out.println("get(0) should be 'a' instead got [" + s + "]"); - } - s = q.get(1); - if (!Objects.equals(s, b)) { - System.out.println("get(1) should be 'b' instead got [" + s + "]"); - } - - i = q.size(); - if (i != 2) { - System.out.println("size() should be 2 instead got [" + String.valueOf(i) + "]"); - } + + assertEquals(1, q.indexOf(b)); + assertEquals(a, q.get(0)); + assertEquals(b, q.get(1)); + assertEquals(2, q.size()); q.add(c); - i = q.indexOf(c); - if (i != 2) { - System.out.println("indexOf(c) should be 2 instead got [" + String.valueOf(i) + "]"); - } - s = q.get(0); - if (!Objects.equals(s, a)) { - System.out.println("get(0) should be 'a' instead got [" + s + "]"); - } - s = q.get(1); - if (!Objects.equals(s, b)) { - System.out.println("get(1) should be 'b' instead got [" + s + "]"); - } - s = q.get(2); - if (!Objects.equals(s, c)) { - System.out.println("get(1) should be 'c' instead got [" + s + "]"); - } - i = q.size(); - if (i != 3) { - System.out.println("size() should be 3 instead got [" + String.valueOf(i) + "]"); - } + + assertEquals(2, q.indexOf(c)); + assertEquals(a, q.get(0)); + assertEquals(b, q.get(1)); + assertEquals(c, q.get(2)); + assertEquals(3, q.size()); q.add(d); - i = q.size(); - if (i != 3) { - System.out.println("size() should be 3 instead got [" + String.valueOf(i) + "]"); - } + + assertEquals(3, q.size()); q.add(e); - i = q.size(); - if (i != 3) { - System.out.println("size() should be 3 instead got [" + String.valueOf(i) + "]"); - } - - if (q.contains(a)) { - System.out.println("A should not be in the q"); - } - - i = q.indexOf(c); - if (i != 0) { - System.out.println("indexOf(c) should be zero instead got [" + String.valueOf(i) + "]"); - } - s = q.get(0); - if (!Objects.equals(s, c)) { - System.out.println("get(0) should be 'c' instead got [" + s + "]"); - } - - i = q.indexOf(d); - if (i != 1) { - System.out.println("indexOf(d) should be 1 instead got [" + String.valueOf(i) + "]"); - } - s = q.get(1); - if (!Objects.equals(s, d)) { - System.out.println("get(1) should be 'd' instead got [" + s + "]"); - } - - i = q.indexOf(e); - if (i != 2) { - System.out.println("indexOf(e) should be 2 instead got [" - + String.valueOf(i) - + "]"); - } - s = q.get(2); - if (!Objects.equals(s, e)) { - System.out.println("get(2) should be 'e' instead got [" + s + "]"); - } - q.resize(5); - i = q.capacity(); - if (i != 5) { - System.out.println("size() should be 5 after resizing to 5 instead got [" + String.valueOf(i) + "]"); - } + assertEquals(3, q.size()); + assertFalse("A should not be in the q", q.contains(a)); + assertEquals(0, q.indexOf(c)); + assertEquals(c, q.get(0)); + assertEquals(1, q.indexOf(d)); + assertEquals(d, q.get(1)); + assertEquals(2, q.indexOf(e)); + assertEquals(e, q.get(2)); // should be the same after resizing - i = q.size(); - if (i != 3) { - System.out.println("size() should be 3 instead got [" + String.valueOf(i) + "]"); - } - - i = q.indexOf(e); - if (i != 2) { - System.out.println("indexOf(e) should be 2 instead got [" + String.valueOf(i) + "]"); - } - s = q.get(2); - if (!Objects.equals(s, e)) { - System.out.println("get(2) should be 'e' instead got [" + s + "]"); - } + q.resize(5); + + assertEquals(5, q.capacity()); + assertEquals(3, q.size()); + assertEquals(2, q.indexOf(e)); + assertEquals(e, q.get(2)); q.resize(2); - i = q.capacity(); - if (i != 2) { - System.out.println("size() should be 2 after resizing to 2 instead got [" + String.valueOf(i) + "]"); - } + + assertEquals(2, q.capacity()); } @Test http://git-wip-us.apache.org/repos/asf/cayenne/blob/bcd83417/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c2dfe54..4b1a78e 100644 --- a/pom.xml +++ b/pom.xml @@ -1349,7 +1349,7 @@ <cayenneAdapter>org.apache.cayenne.dba.mysql.MySQLAdapter</cayenneAdapter> <cayenneJdbcUsername>root</cayenneJdbcUsername> <cayenneJdbcPassword /> - <cayenneJdbcUrl>jdbc:mysql://${db.host}:${db.port}/cayenne?useUnicode=true&characterEncoding=UTF-8&generateSimpleParameterMetadata=true</cayenneJdbcUrl> + <cayenneJdbcUrl>jdbc:mysql://${db.host}:${db.port}/cayenne?useUnicode=true&characterEncoding=UTF-8&generateSimpleParameterMetadata=true&useSSL=false</cayenneJdbcUrl> <cayenneJdbcDriver>com.mysql.jdbc.Driver</cayenneJdbcDriver> </systemPropertyVariables> </configuration>
