From c8cb554755a02c23efa7ee7f6dfa9f4f08dbd129 Mon Sep 17 00:00:00 2001 From: kstyrc Date: Thu, 2 Apr 2015 23:30:26 +0200 Subject: [PATCH] Adjusted test for version prefix --- src/main/java/redis/embedded/RedisExecProvider.java | 12 ++++++------ src/test/java/redis/embedded/RedisServerTest.java | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/redis/embedded/RedisExecProvider.java b/src/main/java/redis/embedded/RedisExecProvider.java index 65d1e7ff..581e40a1 100644 --- a/src/main/java/redis/embedded/RedisExecProvider.java +++ b/src/main/java/redis/embedded/RedisExecProvider.java @@ -24,14 +24,14 @@ private RedisExecProvider() { } private void initExecutables() { - executables.put(OsArchitecture.WINDOWS_x86, "redis-server.exe"); - executables.put(OsArchitecture.WINDOWS_x86_64, "redis-server-64.exe"); + executables.put(OsArchitecture.WINDOWS_x86, "redis-server-2.8.19.exe"); + executables.put(OsArchitecture.WINDOWS_x86_64, "redis-server-2.8.19.exe"); - executables.put(OsArchitecture.UNIX_x86, "redis-server"); - executables.put(OsArchitecture.UNIX_x86_64, "redis-server"); + executables.put(OsArchitecture.UNIX_x86, "redis-server-2.8.19"); + executables.put(OsArchitecture.UNIX_x86_64, "redis-server-2.8.19"); - executables.put(OsArchitecture.MAC_OS_X_x86, "redis-server.app"); - executables.put(OsArchitecture.MAC_OS_X_x86_64, "redis-server.app"); + executables.put(OsArchitecture.MAC_OS_X_x86, "redis-server-2.8.19.app"); + executables.put(OsArchitecture.MAC_OS_X_x86_64, "redis-server-2.8.19.app"); } public RedisExecProvider override(OS os, String executable) { diff --git a/src/test/java/redis/embedded/RedisServerTest.java b/src/test/java/redis/embedded/RedisServerTest.java index 48904bfb..2f04952e 100644 --- a/src/test/java/redis/embedded/RedisServerTest.java +++ b/src/test/java/redis/embedded/RedisServerTest.java @@ -93,10 +93,10 @@ public void shouldIndicateInactiveAfterStop() throws Exception { @Test public void shouldOverrideDefaultExecutable() throws Exception { RedisExecProvider customProvider = RedisExecProvider.defaultProvider() - .override(OS.UNIX, Resources.getResource("redis-server").getFile()) - .override(OS.WINDOWS, Architecture.x86, Resources.getResource("redis-server.exe").getFile()) - .override(OS.WINDOWS, Architecture.x86_64, Resources.getResource("redis-server-64.exe").getFile()) - .override(OS.MAC_OS_X, Resources.getResource("redis-server").getFile()); + .override(OS.UNIX, Resources.getResource("redis-server-2.8.19").getFile()) + .override(OS.WINDOWS, Architecture.x86, Resources.getResource("redis-server-2.8.19.exe").getFile()) + .override(OS.WINDOWS, Architecture.x86_64, Resources.getResource("redis-server-2.8.19.exe").getFile()) + .override(OS.MAC_OS_X, Resources.getResource("redis-server-2.8.19").getFile()); redisServer = new RedisServerBuilder() .redisExecProvider(customProvider)