Repository: karaf Updated Branches: refs/heads/master fd7439664 -> b57bceae1
Cleanup jdbc tests Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c79e2ba2 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c79e2ba2 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c79e2ba2 Branch: refs/heads/master Commit: c79e2ba2b30349f220d2d2affb1d1aed410042fb Parents: fd74396 Author: Christian Schneider <ch...@die-schneider.net> Authored: Wed Aug 16 15:53:10 2017 +0200 Committer: Christian Schneider <ch...@die-schneider.net> Committed: Wed Aug 16 15:53:10 2017 +0200 ---------------------------------------------------------------------- .../karaf/jaas/modules/jdbc/JDBCUtils.java | 4 +- .../jaas/modules/jdbc/JdbcLoginModuleTest.java | 116 ++++++++----------- 2 files changed, 52 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/c79e2ba2/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCUtils.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCUtils.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCUtils.java index 4e1cda8..5be25b0 100644 --- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCUtils.java +++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCUtils.java @@ -75,9 +75,9 @@ public final class JDBCUtils { if (tokens.length > 1) { filter = tokens[1]; } - ServiceReference[] references = bc.getServiceReferences(clazz, filter); + ServiceReference<?>[] references = bc.getServiceReferences(clazz, filter); if (references != null) { - ServiceReference ref = references[0]; + ServiceReference<?> ref = references[0]; Object ds = bc.getService(ref); bc.ungetService(ref); return ds; http://git-wip-us.apache.org/repos/asf/karaf/blob/c79e2ba2/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/jdbc/JdbcLoginModuleTest.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/jdbc/JdbcLoginModuleTest.java b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/jdbc/JdbcLoginModuleTest.java index cd960ed..66eebb6 100644 --- a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/jdbc/JdbcLoginModuleTest.java +++ b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/jdbc/JdbcLoginModuleTest.java @@ -24,7 +24,7 @@ import java.util.Map; import javax.security.auth.Subject; import javax.sql.DataSource; -import org.apache.derby.jdbc.EmbeddedDataSource40; +import org.apache.derby.jdbc.EmbeddedDataSource; import org.apache.karaf.jaas.boot.principal.GroupPrincipal; import org.apache.karaf.jaas.boot.principal.RolePrincipal; import org.apache.karaf.jaas.boot.principal.UserPrincipal; @@ -42,54 +42,42 @@ import static org.junit.Assert.assertTrue; public class JdbcLoginModuleTest { - private EmbeddedDataSource40 dataSource; + private EmbeddedDataSource dataSource; private Map<String, Object> options; + @SuppressWarnings("unchecked") @Before public void setUp() throws Exception { System.setProperty("derby.stream.error.file", "target/derby.log"); // Create datasource - dataSource = new EmbeddedDataSource40(); + dataSource = new EmbeddedDataSource(); dataSource.setDatabaseName("memory:db"); dataSource.setCreateDatabase("create"); // Delete tables try (Connection connection = dataSource.getConnection()) { connection.setAutoCommit(true); - try { - try (Statement statement = connection.createStatement()) { + try (Statement statement = connection.createStatement()) { statement.execute("drop table USERS"); - } } catch (SQLException e) { // Ignore } - try { - try (Statement statement = connection.createStatement()) { - statement.execute("drop table ROLES"); - } + try (Statement statement = connection.createStatement()) { + statement.execute("drop table ROLES"); } catch (SQLException e) { // Ignore } - connection.commit(); - } - - // Create tables - try (Connection connection = dataSource.getConnection()) { try (Statement statement = connection.createStatement()) { statement.execute("create table USERS (USERNAME VARCHAR(32) PRIMARY KEY, PASSWORD VARCHAR(32))"); - } - try (Statement statement = connection.createStatement()) { statement.execute("create table ROLES (USERNAME VARCHAR(32), ROLE VARCHAR(1024))"); } connection.commit(); } - // Mocks BundleContext context = EasyMock.createMock(BundleContext.class); - ServiceReference reference = EasyMock.createMock(ServiceReference.class); + ServiceReference<DataSource> reference = EasyMock.createMock(ServiceReference.class); - // Create options options = new HashMap<>(); options.put(JDBCUtils.DATASOURCE, "osgi:" + DataSource.class.getName()); options.put(BundleContext.class.getName(), context); @@ -145,72 +133,68 @@ public class JdbcLoginModuleTest { @Test public void testEngine() throws Exception { - JDBCBackingEngine engine = new JDBCBackingEngine(dataSource); + UserPrincipal user = new UserPrincipal("abc"); + GroupPrincipal group1 = new GroupPrincipal("group1"); + RolePrincipal role1 = new RolePrincipal("role1"); + RolePrincipal role2 = new RolePrincipal("role2"); + RolePrincipal role3 = new RolePrincipal("role3"); + JDBCBackingEngine engine = new JDBCBackingEngine(dataSource); assertTrue(engine.listUsers().isEmpty()); engine.addUser("abc", "xyz"); - - assertTrue(engine.listUsers().contains(new UserPrincipal("abc"))); - assertTrue(engine.listRoles(new UserPrincipal("abc")).isEmpty()); - assertTrue(engine.listRoles(new GroupPrincipal("group1")).isEmpty()); - assertTrue(engine.listGroups(new UserPrincipal("abc")).isEmpty()); + assertTrue(engine.listUsers().contains(user)); + assertTrue(engine.listRoles(user).isEmpty()); + assertTrue(engine.listRoles(group1).isEmpty()); + assertTrue(engine.listGroups(user).isEmpty()); engine.addRole("abc", "role1"); - - assertTrue(engine.listUsers().contains(new UserPrincipal("abc"))); - assertTrue(engine.listRoles(new UserPrincipal("abc")).contains(new RolePrincipal("role1"))); - assertTrue(engine.listRoles(new GroupPrincipal("group1")).isEmpty()); - assertTrue(engine.listGroups(new UserPrincipal("abc")).isEmpty()); + assertTrue(engine.listUsers().contains(user)); + assertTrue(engine.listRoles(user).contains(role1)); + assertTrue(engine.listRoles(group1).isEmpty()); + assertTrue(engine.listGroups(user).isEmpty()); engine.addGroupRole("group1", "role2"); - - assertTrue(engine.listUsers().contains(new UserPrincipal("abc"))); - assertTrue(engine.listRoles(new UserPrincipal("abc")).contains(new RolePrincipal("role1"))); - assertTrue(engine.listRoles(new GroupPrincipal("group1")).contains(new RolePrincipal("role2"))); - assertTrue(engine.listGroups(new UserPrincipal("abc")).isEmpty()); + assertTrue(engine.listUsers().contains(user)); + assertTrue(engine.listRoles(user).contains(role1)); + assertTrue(engine.listRoles(group1).contains(role2)); + assertTrue(engine.listGroups(user).isEmpty()); engine.addGroup("abc", "group1"); - - assertTrue(engine.listUsers().contains(new UserPrincipal("abc"))); - assertTrue(engine.listRoles(new UserPrincipal("abc")).contains(new RolePrincipal("role1"))); - assertTrue(engine.listRoles(new UserPrincipal("abc")).contains(new RolePrincipal("role2"))); - assertTrue(engine.listRoles(new GroupPrincipal("group1")).contains(new RolePrincipal("role2"))); - assertTrue(engine.listGroups(new UserPrincipal("abc")).contains(new GroupPrincipal("group1"))); + assertTrue(engine.listUsers().contains(user)); + assertTrue(engine.listRoles(user).contains(role1)); + assertTrue(engine.listRoles(user).contains(role2)); + assertTrue(engine.listRoles(group1).contains(role2)); + assertTrue(engine.listGroups(user).contains(group1)); engine.deleteRole("abc", "role1"); - - assertTrue(engine.listUsers().contains(new UserPrincipal("abc"))); - assertTrue(engine.listRoles(new UserPrincipal("abc")).contains(new RolePrincipal("role2"))); - assertTrue(engine.listRoles(new GroupPrincipal("group1")).contains(new RolePrincipal("role2"))); - assertTrue(engine.listGroups(new UserPrincipal("abc")).contains(new GroupPrincipal("group1"))); + assertTrue(engine.listUsers().contains(user)); + assertTrue(engine.listRoles(user).contains(role2)); + assertTrue(engine.listRoles(group1).contains(role2)); + assertTrue(engine.listGroups(user).contains(group1)); engine.deleteGroupRole("group1", "role2"); - - assertTrue(engine.listUsers().contains(new UserPrincipal("abc"))); - assertTrue(engine.listRoles(new UserPrincipal("abc")).isEmpty()); - assertTrue(engine.listRoles(new GroupPrincipal("group1")).isEmpty()); - assertTrue(engine.listGroups(new UserPrincipal("abc")).contains(new GroupPrincipal("group1"))); + assertTrue(engine.listUsers().contains(user)); + assertTrue(engine.listRoles(user).isEmpty()); + assertTrue(engine.listRoles(group1).isEmpty()); + assertTrue(engine.listGroups(user).contains(group1)); engine.addGroupRole("group1", "role3"); - - assertTrue(engine.listUsers().contains(new UserPrincipal("abc"))); - assertTrue(engine.listRoles(new UserPrincipal("abc")).contains(new RolePrincipal("role3"))); - assertTrue(engine.listRoles(new GroupPrincipal("group1")).contains(new RolePrincipal("role3"))); - assertTrue(engine.listGroups(new UserPrincipal("abc")).contains(new GroupPrincipal("group1"))); + assertTrue(engine.listUsers().contains(user)); + assertTrue(engine.listRoles(user).contains(role3)); + assertTrue(engine.listRoles(group1).contains(role3)); + assertTrue(engine.listGroups(user).contains(group1)); engine.deleteGroup("abc", "group1"); - - assertTrue(engine.listUsers().contains(new UserPrincipal("abc"))); - assertTrue(engine.listRoles(new UserPrincipal("abc")).isEmpty()); - assertTrue(engine.listRoles(new GroupPrincipal("group1")).isEmpty()); - assertTrue(engine.listGroups(new UserPrincipal("abc")).isEmpty()); + assertTrue(engine.listUsers().contains(user)); + assertTrue(engine.listRoles(user).isEmpty()); + assertTrue(engine.listRoles(group1).isEmpty()); + assertTrue(engine.listGroups(user).isEmpty()); engine.deleteUser("abc"); - assertTrue(engine.listUsers().isEmpty()); - assertTrue(engine.listRoles(new UserPrincipal("abc")).isEmpty()); - assertTrue(engine.listRoles(new GroupPrincipal("group1")).isEmpty()); - assertTrue(engine.listGroups(new UserPrincipal("abc")).isEmpty()); + assertTrue(engine.listRoles(user).isEmpty()); + assertTrue(engine.listRoles(group1).isEmpty()); + assertTrue(engine.listGroups(user).isEmpty()); } }