Author: oching
Date: Mon Jun 7 08:20:58 2010
New Revision: 952137
URL: http://svn.apache.org/viewvc?rev=952137&view=rev
Log:
fixed formatting
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java?rev=952137&r1=952136&r2=952137&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java
Mon Jun 7 08:20:58 2010
@@ -404,7 +404,7 @@ public class ShowArtifactActionTest
public void testAddAndDeleteMetadataProperty()
{
ProjectVersionMetadata versionMetadata = createProjectModel(
TEST_VERSION );
-
+
metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID,
TEST_ARTIFACT_ID, versionMetadata );
setActionParameters();
@@ -416,38 +416,38 @@ public class ShowArtifactActionTest
assertActionSuccess( action, result );
assertActionParameters( action );
-
+
Map<String, String> genericMetadata = action.getGenericMetadata();
assertNotNull( genericMetadata.get(
TEST_GENERIC_METADATA_PROPERTY_NAME ) );
assertEquals( genericMetadata.get( TEST_GENERIC_METADATA_PROPERTY_NAME
), TEST_GENERIC_METADATA_PROPERTY_VALUE );
-
+
assertNotNull( genericMetadata.get( "foo" ) );
assertEquals( "bar", genericMetadata.get( "foo" ) );
-
+
assertEquals( TEST_REPO, action.getRepositoryId() );
assertNotNull( action.getModel() );
assertNull( action.getDependees() );
assertNull( action.getDependencies() );
assertNull( action.getMailingLists() );
- assertTrue( action.getArtifacts().isEmpty() );
-
+ assertTrue( action.getArtifacts().isEmpty() );
+
// test delete property
setActionParameters();
action.setDeleteItem( "foo" );
-
+
result = action.deleteMetadataEntry();
-
+
assertEquals( Action.SUCCESS, result );
assertActionParameters( action );
assertTrue( !action.getActionMessages().isEmpty() );
assertTrue( action.getActionMessages().contains( "Property
successfully deleted." ) );
-
+
genericMetadata = action.getGenericMetadata();
assertNotNull( genericMetadata.get(
TEST_GENERIC_METADATA_PROPERTY_NAME ) );
assertEquals( genericMetadata.get( TEST_GENERIC_METADATA_PROPERTY_NAME
), TEST_GENERIC_METADATA_PROPERTY_VALUE );
-
+
assertNull( genericMetadata.get( "foo" ) );
-
+
assertEquals( TEST_REPO, action.getRepositoryId() );
assertNotNull( action.getModel() );
assertNull( action.getDependees() );
@@ -455,7 +455,7 @@ public class ShowArtifactActionTest
assertNull( action.getMailingLists() );
assertTrue( action.getArtifacts().isEmpty() );
}
-
+
private void assertArtifacts( List<ArtifactMetadata> expectedArtifacts,
Map<String,
List<ShowArtifactAction.ArtifactDownloadInfo>> artifactMap )
{
Modified:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java?rev=952137&r1=952136&r2=952137&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
(original)
+++
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
Mon Jun 7 08:20:58 2010
@@ -170,27 +170,27 @@ public abstract class AbstractMetadataRe
{
ProjectVersionMetadata metadata = new ProjectVersionMetadata();
metadata.setId( TEST_PROJECT_VERSION );
-
- Map<String, String> additionalProps = new HashMap<String,String>();
+
+ Map<String, String> additionalProps = new HashMap<String, String>();
additionalProps.put( "deleteKey", "deleteValue" );
-
+
MetadataFacet facet = new TestMetadataFacet( TEST_FACET_ID, "baz",
additionalProps );
metadata.addFacet( facet );
repository.updateProjectVersion( TEST_REPO_ID, TEST_NAMESPACE,
TEST_PROJECT, metadata );
metadata = repository.getProjectVersion( TEST_REPO_ID, TEST_NAMESPACE,
TEST_PROJECT, TEST_PROJECT_VERSION );
assertEquals( Collections.singleton( TEST_FACET_ID ),
metadata.getFacetIds() );
-
+
TestMetadataFacet testFacet = (TestMetadataFacet) metadata.getFacet(
TEST_FACET_ID );
Map<String, String> facetProperties = testFacet.toProperties();
-
+
assertEquals( "deleteValue", facetProperties.get( "deleteKey" ) );
-
+
facetProperties.remove( "deleteKey" );
-
- TestMetadataFacet newTestFacet = new TestMetadataFacet( TEST_FACET_ID,
testFacet.getValue(), facetProperties );
+
+ TestMetadataFacet newTestFacet = new TestMetadataFacet( TEST_FACET_ID,
testFacet.getValue(), facetProperties );
metadata.addFacet( newTestFacet );
-
+
repository.updateProjectVersion( TEST_REPO_ID, TEST_NAMESPACE,
TEST_PROJECT, metadata );
metadata = repository.getProjectVersion( TEST_REPO_ID, TEST_NAMESPACE,
TEST_PROJECT, TEST_PROJECT_VERSION );