[MRM-1761] add unit test

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1549543 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-12-09 11:21:16 +00:00
parent 449de093e2
commit cc94843a8d
2 changed files with 27 additions and 19 deletions

View File

@ -52,7 +52,13 @@
import org.slf4j.LoggerFactory;
import org.springframework.web.context.ContextLoaderListener;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner;
import org.junit.runner.RunWith;
@ -66,7 +72,7 @@ public abstract class AbstractDownloadTest
protected Logger log = LoggerFactory.getLogger( getClass() );
static String previousAppServerBase;
protected static String previousAppServerBase;
public String authorizationHeader = getAdminAuthzHeader();
@ -283,4 +289,23 @@ protected FakeCreateAdminService getFakeCreateAdminService()
FakeCreateAdminService.class );
}
protected List<String> getZipEntriesNames( ZipFile zipFile )
{
try
{
List<String> entriesNames = new ArrayList<String>();
Enumeration<? extends ZipEntry> entries = zipFile.entries();
while ( entries.hasMoreElements() )
{
entriesNames.add( entries.nextElement().getName() );
}
return entriesNames;
}
catch ( Throwable e )
{
log.info( "fail to get zipEntries {}", e.getMessage(), e );
}
return Collections.emptyList();
}
}

View File

@ -183,24 +183,7 @@ public void downloadWithRemoteRedirect()
file.deleteOnExit();
}
private List<String> getZipEntriesNames( ZipFile zipFile )
{
try
{
List<String> entriesNames = new ArrayList<String>();
Enumeration<? extends ZipEntry> entries = zipFile.entries();
while ( entries.hasMoreElements() )
{
entriesNames.add( entries.nextElement().getName() );
}
return entriesNames;
}
catch ( Throwable e )
{
log.info( "fail to get zipEntries {}", e.getMessage(), e );
}
return Collections.emptyList();
}
public static class RedirectServlet