Author: reinhard
Date: Fri Mar 25 06:10:55 2005
New Revision: 159018
URL: http://svn.apache.org/viewcvs?view=rev&rev=159018
Log:
reflect API and impl changes in the junit tests too
Removed:
cocoon/whiteboard/block-deployer/test/junit/org/apache/cocoon/blockdeployer/configuration/
cocoon/whiteboard/block-deployer/test/junit/org/apache/cocoon/blockdeployer/logging/
cocoon/whiteboard/block-deployer/test/junit/org/apache/cocoon/blockdeployer/utils/xpatch/
cocoon/whiteboard/block-deployer/test/junit/org/apache/cocoon/blockdeployer/wiring/
Modified:
cocoon/whiteboard/block-deployer/test/junit/org/apache/cocoon/blockdeployer/LogEnabledTestCase.java
cocoon/whiteboard/block-deployer/test/junit/org/apache/cocoon/blockdeployer/repository/ApplicationServer22LocatorTest.java
Modified:
cocoon/whiteboard/block-deployer/test/junit/org/apache/cocoon/blockdeployer/LogEnabledTestCase.java
URL:
http://svn.apache.org/viewcvs/cocoon/whiteboard/block-deployer/test/junit/org/apache/cocoon/blockdeployer/LogEnabledTestCase.java?view=diff&r1=159017&r2=159018
==============================================================================
---
cocoon/whiteboard/block-deployer/test/junit/org/apache/cocoon/blockdeployer/LogEnabledTestCase.java
(original)
+++
cocoon/whiteboard/block-deployer/test/junit/org/apache/cocoon/blockdeployer/LogEnabledTestCase.java
Fri Mar 25 06:10:55 2005
@@ -33,12 +33,11 @@
public void setUp() {
this.loggerControl = MockControl.createNiceControl(LoggerFacade.class);
this.logger = (LoggerFacade) loggerControl.getMock();
- this.logger = new ConsoleLogger();
+ this.logger = new ConsoleLogger(LoggerFacade.LOG_DEBUG);
}
public void testDummy() {
- // Eclipse needs this, otherwise an JUnit error is thrown
-
+ // Eclipse needs this, otherwise a JUnit error is thrown
}
}
Modified:
cocoon/whiteboard/block-deployer/test/junit/org/apache/cocoon/blockdeployer/repository/ApplicationServer22LocatorTest.java
URL:
http://svn.apache.org/viewcvs/cocoon/whiteboard/block-deployer/test/junit/org/apache/cocoon/blockdeployer/repository/ApplicationServer22LocatorTest.java?view=diff&r1=159017&r2=159018
==============================================================================
---
cocoon/whiteboard/block-deployer/test/junit/org/apache/cocoon/blockdeployer/repository/ApplicationServer22LocatorTest.java
(original)
+++
cocoon/whiteboard/block-deployer/test/junit/org/apache/cocoon/blockdeployer/repository/ApplicationServer22LocatorTest.java
Fri Mar 25 06:10:55 2005
@@ -24,7 +24,6 @@
import org.apache.cocoon.blockdeployer.Constants;
import org.apache.cocoon.blockdeployer.LogEnabledTestCase;
import org.apache.cocoon.blockdeployer.block.RemoteBlock;
-import org.apache.cocoon.blockdeployer.wiring.Wiring;
import org.easymock.MockControl;
/**
@@ -42,13 +41,10 @@
}
public void testDeploy() throws Exception {
- // create a wiring
- MockControl blockControl = MockControl.createControl(Wiring.class);
- Wiring wiring = (Wiring) blockControl.getMock();
// copy examples into tmp location
setupExamples();
// first hack to run the deploy method
- ApplicationServer22Locator asl = new ApplicationServer22Locator(new
File(Constants.TMP_VALID_ASL_1), wiring, this.logger);
+ ApplicationServer22Locator asl = new ApplicationServer22Locator(new
File(Constants.TMP_VALID_ASL_1), this.logger);
RemoteBlock b[] = new RemoteBlock[1];
b[0] = createBlockMock(null);
asl.deploy(b);
@@ -65,7 +61,6 @@
// create the block descriptor information
// create the Inputstream containing block as binary
-
try {
block.getStream();
InputStream is = new FileInputStream(
