mirror of https://github.com/apache/archiva.git
missed to add files
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1309831 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
a6fc548e97
commit
0979e47376
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src
main/java/org/apache/archiva/rest/services/utils
test/java/org/apache/archiva/rest/services
|
@ -0,0 +1,38 @@
|
|||
package org.apache.archiva.rest.services.utils;
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
import org.apache.archiva.rest.api.model.ArtifactContentEntry;
|
||||
|
||||
import java.util.Comparator;
|
||||
|
||||
/**
|
||||
* @author Olivier Lamy
|
||||
*/
|
||||
public class ArtifactContentEntryComparator
|
||||
implements Comparator<ArtifactContentEntry>
|
||||
{
|
||||
public static final ArtifactContentEntryComparator INSTANCE = new ArtifactContentEntryComparator();
|
||||
|
||||
public int compare( ArtifactContentEntry artifactContentEntry, ArtifactContentEntry artifactContentEntry1 )
|
||||
{
|
||||
// include depth too in comparaison ?
|
||||
return artifactContentEntry.getName().compareTo( artifactContentEntry1.getName() );
|
||||
}
|
||||
}
|
|
@ -0,0 +1,89 @@
|
|||
package org.apache.archiva.rest.services;
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
import junit.framework.TestCase;
|
||||
import org.apache.archiva.rest.api.model.ArtifactContentEntry;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.runners.JUnit4;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.List;
|
||||
|
||||
import static org.fest.assertions.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* @author Olivier Lamy
|
||||
*/
|
||||
@RunWith( JUnit4.class )
|
||||
public class ArtifactContentEntriesTests
|
||||
extends TestCase
|
||||
{
|
||||
|
||||
protected Logger log = LoggerFactory.getLogger( getClass() );
|
||||
|
||||
|
||||
DefaultBrowseService browseService = new DefaultBrowseService();
|
||||
|
||||
|
||||
public String getBasedir()
|
||||
{
|
||||
return System.getProperty( "basedir" );
|
||||
}
|
||||
|
||||
@Test
|
||||
public void readArtifactContentEntriesSecondDepthOnlyOneDirectory()
|
||||
throws Exception
|
||||
{
|
||||
|
||||
File file = new File( getBasedir(),
|
||||
"src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" );
|
||||
|
||||
List<ArtifactContentEntry> artifactContentEntries = browseService.readFileEntries( file, "org" );
|
||||
|
||||
log.info( "artifactContentEntries: {}", artifactContentEntries );
|
||||
|
||||
assertThat( artifactContentEntries ).isNotNull().isNotEmpty().hasSize( 1 ).contains(
|
||||
new ArtifactContentEntry( "org/apache", false, 2 ) );
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void readArtifactContentEntriesOnlyFiles()
|
||||
throws Exception
|
||||
{
|
||||
|
||||
File file = new File( getBasedir(),
|
||||
"src/test/repo-with-osgi/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" );
|
||||
|
||||
List<ArtifactContentEntry> artifactContentEntries =
|
||||
browseService.readFileEntries( file, "org/apache/commons/logging/impl/" );
|
||||
|
||||
log.info( "artifactContentEntries: {}", artifactContentEntries );
|
||||
|
||||
assertThat( artifactContentEntries ).isNotNull().isNotEmpty().hasSize( 16 ).contains(
|
||||
new ArtifactContentEntry( "org/apache/commons/logging/impl/AvalonLogger.class", true, 5 ) );
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
Loading…
Reference in New Issue