Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Minor] RuntimeMock now has a parameterless startContainer()-method 

the root path passed when mocking is started when startContainer() is
called. the existing startContainer(File)-method is marked deprecated
This commit is contained in:
Robert von Burg 2014-02-02 20:34:10 +01:00
parent e667ca9001
commit be67876faf
3 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/li/strolch/testbase/runtime/OrderModelTestRunner.java
View File

@ -109,7 +109,7 @@ public class OrderModelTestRunner {
updatedOrder = tx.getOrderMap().getBy(tx, TYPE, ID); updatedOrder = tx.getOrderMap().getBy(tx, TYPE, ID);
} }
assertNotNull("Should read Order with id " + ID, updatedOrder); assertNotNull("Should read Order with id " + ID, updatedOrder);
if (runtimeMock.getContainer().getDataStoreMode() != DataStoreMode.CACHED) if (this.runtimeMock.getContainer().getDataStoreMode() != DataStoreMode.CACHED)
assertFalse("Objects can't be the same reference after re-reading!", readOrder == updatedOrder); assertFalse("Objects can't be the same reference after re-reading!", readOrder == updatedOrder);
Parameter<String> updatedParam = readOrder.getParameter(BAG_ID, PARAM_STRING_ID); Parameter<String> updatedParam = readOrder.getParameter(BAG_ID, PARAM_STRING_ID);
assertEquals(newStringValue, updatedParam.getValue()); assertEquals(newStringValue, updatedParam.getValue());

2
src/main/java/li/strolch/testbase/runtime/ResourceModelTestRunner.java
View File

@ -109,7 +109,7 @@ public class ResourceModelTestRunner {
updatedResource = tx.getResourceMap().getBy(tx, TYPE, ID); updatedResource = tx.getResourceMap().getBy(tx, TYPE, ID);
} }
assertNotNull("Should read Resource with id " + ID, updatedResource); //$NON-NLS-1$ assertNotNull("Should read Resource with id " + ID, updatedResource); //$NON-NLS-1$
if (runtimeMock.getContainer().getDataStoreMode() != DataStoreMode.CACHED) if (this.runtimeMock.getContainer().getDataStoreMode() != DataStoreMode.CACHED)
assertFalse("Objects can't be the same reference after re-reading!", readResource == updatedResource); //$NON-NLS-1$ assertFalse("Objects can't be the same reference after re-reading!", readResource == updatedResource); //$NON-NLS-1$
Parameter<String> updatedParam = readResource.getParameter(BAG_ID, PARAM_STRING_ID); Parameter<String> updatedParam = readResource.getParameter(BAG_ID, PARAM_STRING_ID);
assertEquals(newStringValue, updatedParam.getValue()); assertEquals(newStringValue, updatedParam.getValue());

45
src/main/java/li/strolch/testbase/runtime/RuntimeMock.java
View File

@ -27,6 +27,7 @@ import li.strolch.runtime.privilege.StrolchPrivilegeHandler;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import ch.eitchnet.utils.dbc.DBC;
import ch.eitchnet.utils.helper.FileHelper; import ch.eitchnet.utils.helper.FileHelper;
public final class RuntimeMock { public final class RuntimeMock {
@ -36,6 +37,8 @@ public final class RuntimeMock {
private ComponentContainer container; private ComponentContainer container;
private StrolchAgent agent; private StrolchAgent agent;
private File rootPath;
private File rootSrc;
public ComponentContainer getContainer() { public ComponentContainer getContainer() {
return this.container; return this.container;
@ -57,15 +60,18 @@ public final class RuntimeMock {
return this.container.getRealm(realm); return this.container.getRealm(realm);
} }
public void mockRuntime(File rootPathF, File rootSrc) { public void mockRuntime(File rootPath, File rootSrc) {
if (!rootPathF.getParentFile().getName().equals(TARGET)) { this.rootPath = rootPath;
this.rootSrc = rootSrc;
if (!this.rootPath.getParentFile().getName().equals(TARGET)) {
String msg = "Mocking path must be in a maven target: {0}"; //$NON-NLS-1$ String msg = "Mocking path must be in a maven target: {0}"; //$NON-NLS-1$
msg = MessageFormat.format(msg, rootPathF.getAbsolutePath()); msg = MessageFormat.format(msg, this.rootPath.getAbsolutePath());
throw new RuntimeException(msg); throw new RuntimeException(msg);
} }
File configSrc = new File(rootSrc, RuntimeConfiguration.PATH_CONFIG); File configSrc = new File(this.rootSrc, RuntimeConfiguration.PATH_CONFIG);
if (!configSrc.isDirectory() || !configSrc.canRead()) { if (!configSrc.isDirectory() || !configSrc.canRead()) {
String msg = "Could not find config source in: {0}"; //$NON-NLS-1$ String msg = "Could not find config source in: {0}"; //$NON-NLS-1$
@ -73,36 +79,45 @@ public final class RuntimeMock {
throw new RuntimeException(msg); throw new RuntimeException(msg);
} }
if (rootPathF.exists()) { if (this.rootPath.exists()) {
logger.info("Deleting all files in " + rootPathF.getAbsolutePath()); //$NON-NLS-1$ logger.info("Deleting all files in " + this.rootPath.getAbsolutePath()); //$NON-NLS-1$
if (!FileHelper.deleteFile(rootPathF, true)) { if (!FileHelper.deleteFile(this.rootPath, true)) {
String msg = "Failed to delete {0}"; //$NON-NLS-1$ String msg = "Failed to delete {0}"; //$NON-NLS-1$
msg = MessageFormat.format(msg, rootPathF.getAbsolutePath()); msg = MessageFormat.format(msg, this.rootPath.getAbsolutePath());
throw new RuntimeException(msg); throw new RuntimeException(msg);
} }
} }
if (!rootPathF.mkdirs()) { if (!this.rootPath.mkdirs()) {
String msg = "Failed to create {0}"; //$NON-NLS-1$ String msg = "Failed to create {0}"; //$NON-NLS-1$
msg = MessageFormat.format(msg, rootPathF.getAbsolutePath()); msg = MessageFormat.format(msg, this.rootPath.getAbsolutePath());
throw new RuntimeException(msg); throw new RuntimeException(msg);
} }
logger.info(MessageFormat.format("Mocking runtime from {0} to {1}", rootSrc.getAbsolutePath(), //$NON-NLS-1$ logger.info(MessageFormat.format("Mocking runtime from {0} to {1}", this.rootSrc.getAbsolutePath(), //$NON-NLS-1$
rootPathF.getAbsolutePath())); this.rootPath.getAbsolutePath()));
if (!FileHelper.copy(rootSrc.listFiles(), rootPathF, false)) { if (!FileHelper.copy(this.rootSrc.listFiles(), this.rootPath, false)) {
String msg = "Failed to copy source files from {0} to {1}"; //$NON-NLS-1$ String msg = "Failed to copy source files from {0} to {1}"; //$NON-NLS-1$
msg = MessageFormat.format(msg, rootSrc.getAbsolutePath(), rootPathF.getAbsolutePath()); msg = MessageFormat.format(msg, this.rootSrc.getAbsolutePath(), this.rootPath.getAbsolutePath());
throw new RuntimeException(msg); throw new RuntimeException(msg);
} }
} }
/**
* @deprecated use parameterless {@link #startContainer()}
*/
@Deprecated
public void startContainer(File rootPathF) { public void startContainer(File rootPathF) {
DBC.PRE.assertEquals("Starting a different runtime than was mocked!", this.rootPath, rootPathF); //$NON-NLS-1$
startContainer();
}
public void startContainer() {
try { try {
StrolchAgent agent = new StrolchAgent(); StrolchAgent agent = new StrolchAgent();
agent.setup(rootPathF); agent.setup(this.rootPath);
agent.initialize(); agent.initialize();
agent.start(); agent.start();