Mercurial > hg > thermostat-ng > agent
changeset 1736:767301642c26
WebAppTest should not use actual configuration
Reviewed-by: jerboaa
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2015-May/013765.html
author | Omair Majid <omajid@redhat.com> |
---|---|
date | Tue, 26 May 2015 09:55:40 -0400 |
parents | 4a5706c9f0cb |
children | b239f24bbecd |
files | integration-tests/itest-run/src/test/java/com/redhat/thermostat/itest/WebAppTest.java |
diffstat | 1 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/integration-tests/itest-run/src/test/java/com/redhat/thermostat/itest/WebAppTest.java Fri May 22 12:25:48 2015 +0200 +++ b/integration-tests/itest-run/src/test/java/com/redhat/thermostat/itest/WebAppTest.java Tue May 26 09:55:40 2015 -0400 @@ -41,6 +41,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; import java.io.ByteArrayInputStream; import java.io.File; @@ -77,8 +79,8 @@ import com.redhat.thermostat.common.ApplicationInfo; import com.redhat.thermostat.host.cpu.common.CpuStatDAO; import com.redhat.thermostat.host.cpu.common.model.CpuStat; +import com.redhat.thermostat.shared.config.CommonPaths; import com.redhat.thermostat.shared.config.SSLConfiguration; -import com.redhat.thermostat.shared.config.internal.CommonPathsImpl; import com.redhat.thermostat.shared.config.internal.SSLConfigurationImpl; import com.redhat.thermostat.storage.core.Add; import com.redhat.thermostat.storage.core.BackingStorage; @@ -521,7 +523,10 @@ } }; - SSLConfiguration sslConf = new SSLConfigurationImpl(new CommonPathsImpl()); + CommonPaths paths = mock(CommonPaths.class); + when(paths.getSystemConfigurationDirectory()).thenReturn(new File(getConfigurationDir())); + when(paths.getUserConfigurationDirectory()).thenReturn(new File(getUserThermostatHome(), "etc")); + SSLConfiguration sslConf = new SSLConfigurationImpl(paths); Storage storage = new WebStorage(url, creds, sslConf); if (listener != null) { storage.getConnection().addListener(listener);