Author: olamy
Date: Thu Dec 15 20:47:21 2011
New Revision: 1214953
URL: http://svn.apache.org/viewvc?rev=1214953&view=rev
Log:
restore @Test annotation which was not here
Modified:
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java
Modified:
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java?rev=1214953&r1=1214952&r2=1214953&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java
(original)
+++
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java
Thu Dec 15 20:47:21 2011
@@ -106,6 +106,7 @@ public class Maven2RepositoryMergerTest
verify( metadataRepository ).getArtifacts( TEST_REPO_ID );
}
+ @Test
public void testMergeWithOutConflictArtifacts()
throws Exception
{
