From 862822c19078a8dbc71cabc33c9bb89b5dc05744 Mon Sep 17 00:00:00 2001 From: Alex Bogdanovski Date: Sat, 22 Oct 2016 12:03:56 +0300 Subject: [PATCH] updated tests to match DAOTest in core --- LICENSE | 210 +++++++++++++++++- .../com/erudika/para/persistence/DAOTest.java | 84 ++++--- .../para/persistence/MongoDBDAOIT.java | 16 +- 3 files changed, 268 insertions(+), 42 deletions(-) diff --git a/LICENSE b/LICENSE index 33efec4..17d273f 100755 --- a/LICENSE +++ b/LICENSE @@ -1,13 +1,203 @@ -Copyright 2016 Erudika LLC, http://erudika.com -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ - http://www.apache.org/licenses/LICENSE-2.0 + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2016 Erudika LLC, http://erudika.com + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + \ No newline at end of file diff --git a/src/test/java/com/erudika/para/persistence/DAOTest.java b/src/test/java/com/erudika/para/persistence/DAOTest.java index 6f1d3e2..91a7dba 100644 --- a/src/test/java/com/erudika/para/persistence/DAOTest.java +++ b/src/test/java/com/erudika/para/persistence/DAOTest.java @@ -29,7 +29,6 @@ import java.util.Arrays; import java.util.Map; -import org.junit.After; import static org.junit.Assert.*; import org.junit.Before; import org.junit.Ignore; @@ -43,40 +42,46 @@ @Ignore public abstract class DAOTest { - protected static DAO dao; + private final DAO dao; protected static String appid1 = "testapp1"; protected static String appid2 = "testapp2"; protected static String appid3 = "testapp3"; - private User u; - private Tag t; + public DAOTest(DAO dao) { + this.dao = dao; + } - @Before - public void setUp() { - CoreUtils.getInstance().setDao(dao); - CoreUtils.getInstance().setSearch(mock(Search.class)); - u = new User(MongoDBUtils.generateNewId()); + public DAO dao() { + return this.dao; + } + + private static User u() { + User u = new User(Utils.getNewId()); u.setName("Name"); u.setGroups(User.Groups.USERS.toString()); - u.setEmail("asd@asd.com"); + u.setEmail(u.getId() + "@email.com"); u.setIdentifier(u.getEmail()); u.setPassword("123456"); + return u; + } - t = new Tag(MongoDBUtils.generateNewId()); + private static Tag t() { + Tag t = new Tag("test-" + Utils.getNewId()); t.setCount(3); - - dao.create(u); - dao.create(t); + return t; } - @After - public void tearDown() { - dao.delete(u); - dao.delete(t); + @Before + public void setUp() { + CoreUtils.getInstance().setDao(dao); + CoreUtils.getInstance().setSearch(mock(Search.class)); } @Test public void testCreate() { + User u = u(); + Tag t = t(); + assertNull(dao.create(null)); assertEquals(u.getId(), dao.create(u)); assertNotNull(u.getTimestamp()); @@ -106,7 +111,7 @@ public void testCreate() { App app = new App("testappid"); app.setName("testappid"); app.setSharingIndex(false); - app.create(); + assertNotNull(app.create()); App app2 = new App("testappid"); assertTrue(app2.exists()); @@ -115,10 +120,16 @@ public void testCreate() { tag.create(); Tag tag2 = new Tag("testtagid"); assertTrue(tag2.exists()); + + dao.delete(u); + dao.delete(t); } @Test public void testRead() { + User u = u(); + dao.create(u); + assertNull(dao.read(null)); assertNull(dao.read("1")); assertNotNull(dao.read(u.getId())); @@ -129,10 +140,15 @@ public void testRead() { sp.setName("test custom id"); dao.create(sp); assertNotNull(dao.read("email@test.com")); + + dao.delete(u); } @Test public void testUpdate() { + User u = u(); + dao.create(u); + u.setName("Test Name"); assertEquals(Utils.type(User.class), u.getType()); dao.update(u); @@ -148,10 +164,12 @@ public void testUpdate() { assertNull(app.getSecret()); assertNull(((App) dao.read(app.getId())).getSecret()); app.delete(); - app.create(); + assertNotNull(app.create()); assertNotNull(app.getSecret()); String secret = app.getSecret(); - assertNotNull(((App) dao.read(app.getId())).getSecret()); + App appRead = dao.read(app.getId()); + assertNotNull(appRead); + assertNotNull(appRead.getSecret()); assertNotNull(secret); app.resetSecret(); dao.update(app); @@ -159,10 +177,25 @@ public void testUpdate() { App app2 = dao.read(app.getId()); assertNotNull(app2); assertEquals(secret, app2.getSecret()); + + App app3 = new App(app2.getId()); + app3.setName("New App partial update"); + app3.update(); + assertEquals(secret, ((App) dao.read(app2.getId())).getSecret()); + + dao.delete(app); + dao.delete(u); } @Test public void testDelete() { + User u = u(); + Tag t = t(); + dao.create(u); + dao.create(t); + assertNotNull(dao.read(u.getId())); + assertNotNull(dao.read(t.getId())); + dao.delete(u); dao.delete(t); assertNull(dao.read(u.getId())); @@ -254,13 +287,14 @@ public void testCreateAllReadAllUpdateAllDeleteAll() { assertNull(dao.read(t2.getId())); assertNull(dao.read(t3.getId())); + // try update locked fields + String parentId = Utils.getNewId(); Sysprop t4 = new Sysprop(MongoDBUtils.generateNewId()); - t4.setParentid(u.getId()); + t4.setParentid(parentId); dao.create(t4); assertNotNull(t4.getParentid()); - //try update locked fields - t4.setParentid(t.getId()); + t4.setParentid("cant_change_it"); t4.setType("type4"); dao.update(t4); assertNotNull(t4.getId()); @@ -269,7 +303,7 @@ public void testCreateAllReadAllUpdateAllDeleteAll() { assertEquals(Utils.type(Sysprop.class), tr4.getType()); assertEquals(t4.getId(), tr4.getId()); assertNotNull(tr4.getParentid()); - assertEquals(u.getId(), tr4.getParentid()); + assertEquals(parentId, tr4.getParentid()); } @Test diff --git a/src/test/java/com/erudika/para/persistence/MongoDBDAOIT.java b/src/test/java/com/erudika/para/persistence/MongoDBDAOIT.java index 4e90bc5..0275eb0 100644 --- a/src/test/java/com/erudika/para/persistence/MongoDBDAOIT.java +++ b/src/test/java/com/erudika/para/persistence/MongoDBDAOIT.java @@ -17,7 +17,6 @@ */ package com.erudika.para.persistence; -import com.erudika.para.utils.Config; import org.junit.AfterClass; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -30,15 +29,18 @@ */ public class MongoDBDAOIT extends DAOTest { - private static final String APP_NAME = "para-test"; + private static final String ROOT_APP_NAME = "para-test"; + + public MongoDBDAOIT() { + super(new MongoDBDAO()); + } @BeforeClass public static void setUpClass() throws InterruptedException { System.setProperty("para.mongodb.port", "37017"); - System.setProperty("para.app_name", APP_NAME); - System.setProperty("para.cluster_name", APP_NAME); - dao = new MongoDBDAO(); - MongoDBUtils.createTable(Config.APP_NAME_NS); + System.setProperty("para.app_name", ROOT_APP_NAME); + System.setProperty("para.cluster_name", ROOT_APP_NAME); + MongoDBUtils.createTable(ROOT_APP_NAME); MongoDBUtils.createTable(appid1); MongoDBUtils.createTable(appid2); MongoDBUtils.createTable(appid3); @@ -46,7 +48,7 @@ public static void setUpClass() throws InterruptedException { @AfterClass public static void tearDownClass() { - MongoDBUtils.deleteTable(Config.APP_NAME_NS); + MongoDBUtils.deleteTable(ROOT_APP_NAME); MongoDBUtils.deleteTable(appid1); MongoDBUtils.deleteTable(appid2); MongoDBUtils.deleteTable(appid3);