Spring/spring-session-data-mongodb
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Include Time Unit for ExpiringSession maxinactiveInterval

Browse Source 
Fixes gh-82
This commit is contained in:
Rob Winch
2015-01-05 14:10:04 -06:00
parent 755754e173
commit f4b87b7ae7
10 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-session/src/test/java/org/springframework/session/MapSessionRepositoryTests.java
View File

@@ -35,7 +35,7 @@ public class MapSessionRepositoryTests {
@Test
public void getSessionExpired() {
session.setMaxInactiveInterval(1);
session.setMaxInactiveIntervalInSeconds(1);
session.setLastAccessedTime(System.currentTimeMillis() - TimeUnit.MINUTES.toMillis(5));
repository.save(session);
@@ -47,16 +47,16 @@ public class MapSessionRepositoryTests {
ExpiringSession session = repository.createSession();
assertThat(session).isInstanceOf(MapSession.class);
assertThat(session.getMaxInactiveInterval()).isEqualTo(new MapSession().getMaxInactiveInterval());
assertThat(session.getMaxInactiveIntervalInSeconds()).isEqualTo(new MapSession().getMaxInactiveIntervalInSeconds());
}
@Test
public void createSessionCustomDefaultExpiration() {
final int expectedMaxInterval = new MapSession().getMaxInactiveInterval() + 10;
final int expectedMaxInterval = new MapSession().getMaxInactiveIntervalInSeconds() + 10;
repository.setDefaultMaxInactiveInterval(expectedMaxInterval);
ExpiringSession session = repository.createSession();
assertThat(session.getMaxInactiveInterval()).isEqualTo(expectedMaxInterval);
assertThat(session.getMaxInactiveIntervalInSeconds()).isEqualTo(expectedMaxInterval);
}
}

4
spring-session/src/test/java/org/springframework/session/MapSessionTests.java
View File

@@ -83,11 +83,11 @@ public class MapSessionTests {
return 0;
}
public void setMaxInactiveInterval(int interval) {
public void setMaxInactiveIntervalInSeconds(int interval) {
}
public int getMaxInactiveInterval() {
public int getMaxInactiveIntervalInSeconds() {
return 0;
}

10
spring-session/src/test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryTests.java
View File

@@ -78,7 +78,7 @@ public class RedisOperationsSessionRepositoryTests {
@Test
public void createSessionDefaultMaxInactiveInterval() throws Exception {
ExpiringSession session = redisRepository.createSession();
assertThat(session.getMaxInactiveInterval()).isEqualTo(new MapSession().getMaxInactiveInterval());
assertThat(session.getMaxInactiveIntervalInSeconds()).isEqualTo(new MapSession().getMaxInactiveIntervalInSeconds());
}
@Test
@@ -86,7 +86,7 @@ public class RedisOperationsSessionRepositoryTests {
int interval = 1;
redisRepository.setDefaultMaxInactiveInterval(interval);
ExpiringSession session = redisRepository.createSession();
assertThat(session.getMaxInactiveInterval()).isEqualTo(interval);
assertThat(session.getMaxInactiveIntervalInSeconds()).isEqualTo(interval);
}
@Test
@@ -164,7 +164,7 @@ public class RedisOperationsSessionRepositoryTests {
Map map = map(
getSessionAttrNameKey(attrName), expected.getAttribute(attrName),
CREATION_TIME_ATTR, expected.getCreationTime(),
MAX_INACTIVE_ATTR, expected.getMaxInactiveInterval(),
MAX_INACTIVE_ATTR, expected.getMaxInactiveIntervalInSeconds(),
LAST_ACCESSED_ATTR, expected.getLastAccessedTime());
when(boundHashOperations.entries()).thenReturn(map);
when(expirationRedisOperations.boundSetOps(anyString())).thenReturn(boundSetOperations);
@@ -206,7 +206,7 @@ public class RedisOperationsSessionRepositoryTests {
Map map = map(
getSessionAttrNameKey(attrName), expected.getAttribute(attrName),
CREATION_TIME_ATTR, expected.getCreationTime(),
MAX_INACTIVE_ATTR, expected.getMaxInactiveInterval(),
MAX_INACTIVE_ATTR, expected.getMaxInactiveIntervalInSeconds(),
LAST_ACCESSED_ATTR, expected.getLastAccessedTime());
when(boundHashOperations.entries()).thenReturn(map);
@@ -216,7 +216,7 @@ public class RedisOperationsSessionRepositoryTests {
assertThat(session.getAttributeNames()).isEqualTo(expected.getAttributeNames());
assertThat(session.getAttribute(attrName)).isEqualTo(expected.getAttribute(attrName));
assertThat(session.getCreationTime()).isEqualTo(expected.getCreationTime());
assertThat(session.getMaxInactiveInterval()).isEqualTo(expected.getMaxInactiveInterval());
assertThat(session.getMaxInactiveIntervalInSeconds()).isEqualTo(expected.getMaxInactiveIntervalInSeconds());
assertThat(session.getLastAccessedTime()).isGreaterThanOrEqualTo(now);
}