Author: gscokart
Date: Wed May 30 12:49:43 2007
New Revision: 542922
URL: http://svn.apache.org/viewvc?view=rev&rev=542922
Log:
remove references to the message mock
Modified:
incubator/ivy/core/trunk/test/java/org/apache/ivy/core/sort/SortTest.java
Modified:
incubator/ivy/core/trunk/test/java/org/apache/ivy/core/sort/SortTest.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/sort/SortTest.java?view=diff&rev=542922&r1=542921&r2=542922
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/sort/SortTest.java
(original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/sort/SortTest.java
Wed May 30 12:49:43 2007
@@ -35,7 +35,6 @@
import org.apache.ivy.core.module.id.ModuleRevisionId;
import org.apache.ivy.plugins.circular.CircularDependencyHelper;
import org.apache.ivy.plugins.circular.CircularDependencyStrategy;
-import org.apache.ivy.util.Message;
public class SortTest extends TestCase {
@@ -57,14 +56,9 @@
ivy = new Ivy();
ivy.configureDefault();
- Message.setImpl(null);
}
- protected void tearDown() throws Exception {
- Message.sumupProblems();//purge the warning and error messages
- Message.setImpl(null);
- }
public void testSort() throws Exception {
addDependency(md2,"md1" , "rev1");
@@ -115,7 +109,7 @@
DefaultModuleDescriptor[][] possibleOrder = new
DefaultModuleDescriptor[][] {
{md1, md3, md2, md4},
{md1, md2, md3, md4}//,
- //{md3, md1, md2, md4} //It should be better to not have this
solution. The loop should apear has one contigous element.
+ //{md3, md1, md2, md4} //we don't have this solution. The
loops apear has one contigous element.
};
Collection permutations = getAllLists(md1, md3, md2, md4);
for (Iterator it = permutations.iterator(); it.hasNext();) {
@@ -134,9 +128,6 @@
addDependency(md3,"md2" , "rev2");
addDependency(md4,"md3" , "rev3");
- //MockMessageImpl mockMessageImpl = new MockMessageImpl();
- //Message.setImpl(mockMessageImpl);
-
//Would be much easier with a tool like jmock
class CircularDependencyReporterMock implements
CircularDependencyStrategy {
private int nbOfCall = 0;
@@ -163,7 +154,6 @@
ivy.sortModuleDescriptors(toSort);
circularDepReportMock.validate();
- //mockMessageImpl.assertLogWarningContains("circular dependency
detected during sort: [ org | md3 | rev3 ]->[ org | md2 | rev2 ]->[ org | md3 |
rev3 ]");
}
/**