From a291e686682a8db0e1e8f26a79f927201d09acfa Mon Sep 17 00:00:00 2001 From: Eric Wittmann Date: Fri, 6 Nov 2015 15:16:45 -0500 Subject: [PATCH] fixed a bug with the admin user having no joined-on date set --- .../io/apiman/gateway/engine/policies/CachingPolicyTest.java | 4 ++-- .../apiman/manager/api/rest/impl/CurrentUserResourceImpl.java | 1 - .../io/apiman/manager/test/server/DefaultTestDataSeeder.java | 3 +++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gateway/engine/policies/src/test/java/io/apiman/gateway/engine/policies/CachingPolicyTest.java b/gateway/engine/policies/src/test/java/io/apiman/gateway/engine/policies/CachingPolicyTest.java index 391e346054..b7eb4ff894 100644 --- a/gateway/engine/policies/src/test/java/io/apiman/gateway/engine/policies/CachingPolicyTest.java +++ b/gateway/engine/policies/src/test/java/io/apiman/gateway/engine/policies/CachingPolicyTest.java @@ -64,8 +64,8 @@ public void testUploadLimit() throws Throwable { Assert.assertNotNull(counterValue3); Assert.assertEquals(counterValue, counterValue3); - // Now wait for 2s and make sure the cache entry expired - Thread.sleep(2000); + // Now wait for 3s and make sure the cache entry expired + Thread.sleep(3000); response = send(request); echo = response.entity(EchoResponse.class); Assert.assertNotNull(echo); diff --git a/manager/api/rest-impl/src/main/java/io/apiman/manager/api/rest/impl/CurrentUserResourceImpl.java b/manager/api/rest-impl/src/main/java/io/apiman/manager/api/rest/impl/CurrentUserResourceImpl.java index f9de1fc889..f96ef150fb 100644 --- a/manager/api/rest-impl/src/main/java/io/apiman/manager/api/rest/impl/CurrentUserResourceImpl.java +++ b/manager/api/rest-impl/src/main/java/io/apiman/manager/api/rest/impl/CurrentUserResourceImpl.java @@ -97,7 +97,6 @@ public CurrentUserBean getInfo() { user.setJoinedOn(new Date()); storage.beginTx(); try { - user.setJoinedOn(new Date()); storage.createUser(user); storage.commitTx(); } catch (StorageException e1) { diff --git a/manager/test/api/src/main/java/io/apiman/manager/test/server/DefaultTestDataSeeder.java b/manager/test/api/src/main/java/io/apiman/manager/test/server/DefaultTestDataSeeder.java index f460312270..4c3ce1b18c 100644 --- a/manager/test/api/src/main/java/io/apiman/manager/test/server/DefaultTestDataSeeder.java +++ b/manager/test/api/src/main/java/io/apiman/manager/test/server/DefaultTestDataSeeder.java @@ -19,6 +19,8 @@ import io.apiman.manager.api.core.IStorage; import io.apiman.manager.api.core.exceptions.StorageException; +import java.util.Date; + /** * Default seeder used by tests. * @@ -37,6 +39,7 @@ public void seed(IStorage storage) throws StorageException { userBean.setUsername(userInfo[0]); userBean.setFullName(userInfo[2]); userBean.setEmail(userInfo[3]); + userBean.setJoinedOn(new Date()); if ("true".equals(System.getProperty("apiman.test.admin-user-only", "false")) && !userBean.getUsername().equals("admin")) { continue; }