From 97faa8d1b46b5ee9b8fc976b8ab027e938a70bdf Mon Sep 17 00:00:00 2001 From: Tom George Date: Tue, 7 Jul 2020 18:05:54 -0500 Subject: [PATCH] Fix name Signed-off-by: Tom George --- .../MultiUserWorkspaceActivityManagerTest.java | 4 ++-- .../activity/InmemoryWorkspaceActivityDao.java | 2 +- .../api/workspace/activity/WorkspaceActivity.java | 5 ----- .../activity/WorkspaceActivityCheckerTest.java | 1 - .../activity/WorkspaceActivityManagerTest.java | 14 -------------- .../activity/spi/tck/WorkspaceActivityDaoTest.java | 1 - 6 files changed, 3 insertions(+), 24 deletions(-) diff --git a/multiuser/api/che-multiuser-api-workspace-activity/src/test/java/org/eclipse/che/multiuser/api/workspace/activity/MultiUserWorkspaceActivityManagerTest.java b/multiuser/api/che-multiuser-api-workspace-activity/src/test/java/org/eclipse/che/multiuser/api/workspace/activity/MultiUserWorkspaceActivityManagerTest.java index 1b39b95586..af1e08006d 100644 --- a/multiuser/api/che-multiuser-api-workspace-activity/src/test/java/org/eclipse/che/multiuser/api/workspace/activity/MultiUserWorkspaceActivityManagerTest.java +++ b/multiuser/api/che-multiuser-api-workspace-activity/src/test/java/org/eclipse/che/multiuser/api/workspace/activity/MultiUserWorkspaceActivityManagerTest.java @@ -35,7 +35,7 @@ import org.testng.annotations.Test; public class MultiUserWorkspaceActivityManagerTest { private static final long DEFAULT_TIMEOUT = 60_000L; // 1 minute private static final long USER_LIMIT_TIMEOUT = 120_000L; // 2 minutes - private static final long DEFAULT_HARD_EXPIRATION_TIMEOUT = 60000 * 60 * 3; // 3 hours + private static final long DEFAULT_RUN_TIMEOUT = 0; // No default run timeout @Mock private AccountManager accountManager; @Mock private ResourceManager resourceManager; @@ -60,7 +60,7 @@ public class MultiUserWorkspaceActivityManagerTest { accountManager, resourceManager, DEFAULT_TIMEOUT, - DEFAULT_HARD_EXPIRATION_TIMEOUT); + DEFAULT_RUN_TIMEOUT); when(account.getId()).thenReturn("account123"); when(accountManager.getByName(anyString())).thenReturn(account); diff --git a/wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/InmemoryWorkspaceActivityDao.java b/wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/InmemoryWorkspaceActivityDao.java index bf5fca19bd..af8e6c8fa2 100644 --- a/wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/InmemoryWorkspaceActivityDao.java +++ b/wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/InmemoryWorkspaceActivityDao.java @@ -50,7 +50,7 @@ public class InmemoryWorkspaceActivityDao implements WorkspaceActivityDao { .filter( a -> (a.getExpiration() != null && a.getExpiration() < timestamp) - || (runTimeout > 0 && a.getLastRunning() - a.getLastStarting() > runTimeout)) + || (runTimeout > 0 && timestamp - a.getLastRunning() > runTimeout)) .map(WorkspaceActivity::getWorkspaceId) .collect(toList()); } diff --git a/wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/WorkspaceActivity.java b/wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/WorkspaceActivity.java index a9240bb94e..278b69566f 100644 --- a/wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/WorkspaceActivity.java +++ b/wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/WorkspaceActivity.java @@ -169,10 +169,6 @@ public class WorkspaceActivity { this.expiration = expiration; } - public Long getRunTimeout() { - return this.lastRunning - this.lastStarting; - } - public WorkspaceStatus getStatus() { return status; } @@ -189,7 +185,6 @@ public class WorkspaceActivity { if (o == null || getClass() != o.getClass()) { return false; } - WorkspaceActivity activity = (WorkspaceActivity) o; return Objects.equals(workspaceId, activity.workspaceId) && Objects.equals(created, activity.created) diff --git a/wsmaster/che-core-api-workspace-activity/src/test/java/org/eclipse/che/api/workspace/activity/WorkspaceActivityCheckerTest.java b/wsmaster/che-core-api-workspace-activity/src/test/java/org/eclipse/che/api/workspace/activity/WorkspaceActivityCheckerTest.java index a5d51a1fe1..5163df2d44 100644 --- a/wsmaster/che-core-api-workspace-activity/src/test/java/org/eclipse/che/api/workspace/activity/WorkspaceActivityCheckerTest.java +++ b/wsmaster/che-core-api-workspace-activity/src/test/java/org/eclipse/che/api/workspace/activity/WorkspaceActivityCheckerTest.java @@ -56,7 +56,6 @@ import org.testng.annotations.Test; public class WorkspaceActivityCheckerTest { private static final long DEFAULT_TIMEOUT = 60_000L; // 1 minute private static final long DEFAULT_RUN_TIMEOUT = 0; // No default run timeout - private static final long ACTIVE_RUN_TIMEOUT = 60000 * 60 * 3; // 3 hours private ManualClock clock; private WorkspaceActivityChecker checker; diff --git a/wsmaster/che-core-api-workspace-activity/src/test/java/org/eclipse/che/api/workspace/activity/WorkspaceActivityManagerTest.java b/wsmaster/che-core-api-workspace-activity/src/test/java/org/eclipse/che/api/workspace/activity/WorkspaceActivityManagerTest.java index f9b8461177..6a1055be63 100644 --- a/wsmaster/che-core-api-workspace-activity/src/test/java/org/eclipse/che/api/workspace/activity/WorkspaceActivityManagerTest.java +++ b/wsmaster/che-core-api-workspace-activity/src/test/java/org/eclipse/che/api/workspace/activity/WorkspaceActivityManagerTest.java @@ -50,7 +50,6 @@ public class WorkspaceActivityManagerTest { private static final long DEFAULT_TIMEOUT = 60_000L; // 1 minute private static final long DEFAULT_RUN_TIMEOUT = 0; // No run timeout - private static final long ACTIVE_RUN_TIMEOUT = 60000 * 60 * 3; // 3 hours @Mock private WorkspaceManager workspaceManager; @@ -108,19 +107,6 @@ public class WorkspaceActivityManagerTest { assertEquals(wsIdCaptor.getValue(), wsId); } - @Test - public void shouldRemoveRunTimeoutWhenWorkspaceStopped() throws Exception { - final String wsId = "testWsId"; - final EventSubscriber subscriber = subscribeAndGetStatusEventSubscriber(); - - subscriber.onEvent( - DtoFactory.newDto(WorkspaceStatusEvent.class) - .withStatus(WorkspaceStatus.STOPPED) - .withWorkspaceId(wsId)); - ArgumentCaptor wsIdCaptor = ArgumentCaptor.forClass(String.class); - verify(workspaceActivityDao, times(1)).removeExpiration(wsIdCaptor.capture()); - } - @Test public void shouldCeaseToTrackTheWorkspaceActivityAfterStopping() throws Exception { final String wsId = "testWsId"; diff --git a/wsmaster/che-core-api-workspace-activity/src/test/java/org/eclipse/che/api/workspace/activity/spi/tck/WorkspaceActivityDaoTest.java b/wsmaster/che-core-api-workspace-activity/src/test/java/org/eclipse/che/api/workspace/activity/spi/tck/WorkspaceActivityDaoTest.java index 4b7b47c7f9..d282d5ddaa 100644 --- a/wsmaster/che-core-api-workspace-activity/src/test/java/org/eclipse/che/api/workspace/activity/spi/tck/WorkspaceActivityDaoTest.java +++ b/wsmaster/che-core-api-workspace-activity/src/test/java/org/eclipse/che/api/workspace/activity/spi/tck/WorkspaceActivityDaoTest.java @@ -96,7 +96,6 @@ public class WorkspaceActivityDaoTest { a.setExpiration(base * 1_000_000); activities[i] = a; - System.out.println("activity is " + a); } accountTckRepository.createAll(asList(accounts));