Author: brett
Date: Tue Feb 16 08:15:29 2010
New Revision: 910421
URL: http://svn.apache.org/viewvc?rev=910421&view=rev
Log:
centralise the name <-> timestamp construction to make it easier to change the
pattern
Modified:
archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java
Modified:
archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java?rev=910421&r1=910420&r2=910421&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java
(original)
+++
archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java
Tue Feb 16 08:15:29 2010
@@ -103,7 +103,7 @@
List<String> eventNames = new ArrayList<String>( numEvents );
for ( int i = 0; i < numEvents; i++ )
{
- eventNames.add( AUDIT_EVENT_BASE + MILLIS_FORMAT.format( i ) );
+ eventNames.add( createEventName( TIMESTAMP_FORMAT.parse(
AUDIT_EVENT_BASE + MILLIS_FORMAT.format( i ) ) ) );
}
metadataRepositoryControl.expectAndReturn(
@@ -125,32 +125,13 @@
for ( AuditEvent event : events )
{
String num = MILLIS_FORMAT.format( expectedTimestampCounter );
- assertEvent( event, AUDIT_EVENT_BASE + num, TEST_RESOURCE_BASE +
"/" + num );
+ assertTestEvent( event, AUDIT_EVENT_BASE + num,
getDefaultTestResourceName( num ) );
expectedTimestampCounter--;
}
metadataRepositoryControl.verify();
}
- private static AuditEvent createTestEvent( String name )
- throws ParseException
- {
- return createTestEvent( TEST_REPO_ID, name );
- }
-
- private static AuditEvent createTestEvent( String repositoryId, String
name )
- throws ParseException
- {
- AuditEvent event = new AuditEvent();
- event.setTimestamp( TIMESTAMP_FORMAT.parse( name ) );
- event.setAction( AuditEvent.UPLOAD_FILE );
- event.setRemoteIP( TEST_IP_ADDRESS );
- event.setRepositoryId( repositoryId );
- event.setUserId( TEST_USER );
- event.setResource( TEST_RESOURCE_BASE + "/" + name.substring(
AUDIT_EVENT_BASE.length() ) );
- return event;
- }
-
public void testGetMostRecentEventsLessThan10()
throws ParseException
{
@@ -158,7 +139,7 @@
List<String> eventNames = new ArrayList<String>( numEvents );
for ( int i = 0; i < numEvents; i++ )
{
- eventNames.add( AUDIT_EVENT_BASE + MILLIS_FORMAT.format( i ) );
+ eventNames.add( createEventName( TIMESTAMP_FORMAT.parse(
AUDIT_EVENT_BASE + MILLIS_FORMAT.format( i ) ) ) );
}
metadataRepositoryControl.expectAndReturn(
@@ -180,7 +161,7 @@
for ( AuditEvent event : events )
{
String num = MILLIS_FORMAT.format( expectedTimestampCounter );
- assertEvent( event, AUDIT_EVENT_BASE + num, TEST_RESOURCE_BASE +
"/" + num );
+ assertTestEvent( event, AUDIT_EVENT_BASE + num,
getDefaultTestResourceName( num ) );
expectedTimestampCounter--;
}
@@ -197,7 +178,7 @@
eventNames.put( TEST_REPO_ID_2, new ArrayList<String>() );
for ( int i = 0; i < numEvents; i++ )
{
- String name = AUDIT_EVENT_BASE + MILLIS_FORMAT.format( i );
+ String name = createEventName( TIMESTAMP_FORMAT.parse(
AUDIT_EVENT_BASE + MILLIS_FORMAT.format( i ) ) );
String repositoryId = i % 2 == 0 ? TEST_REPO_ID : TEST_REPO_ID_2;
eventNames.get( repositoryId ).add( name );
events.add( createTestEvent( repositoryId, name ) );
@@ -224,29 +205,14 @@
for ( AuditEvent event : events )
{
String num = MILLIS_FORMAT.format( expectedTimestampCounter );
- assertEvent( event, AUDIT_EVENT_BASE + num, TEST_RESOURCE_BASE +
"/" + num,
- expectedTimestampCounter % 2 == 0 ? TEST_REPO_ID :
TEST_REPO_ID_2 );
+ String expectedRepoId = expectedTimestampCounter % 2 == 0 ?
TEST_REPO_ID : TEST_REPO_ID_2;
+ assertTestEvent( event, expectedRepoId, AUDIT_EVENT_BASE + num,
getDefaultTestResourceName( num ) );
expectedTimestampCounter--;
}
metadataRepositoryControl.verify();
}
- private static void assertEvent( AuditEvent event, String name, String
resource )
- {
- assertEvent( event, name, resource, TEST_REPO_ID );
- }
-
- private static void assertEvent( AuditEvent event, String name, String
resource, String repositoryId )
- {
- assertEquals( name, TIMESTAMP_FORMAT.format( event.getTimestamp() ) );
- assertEquals( AuditEvent.UPLOAD_FILE, event.getAction() );
- assertEquals( TEST_IP_ADDRESS, event.getRemoteIP() );
- assertEquals( repositoryId, event.getRepositoryId() );
- assertEquals( TEST_USER, event.getUserId() );
- assertEquals( resource, event.getResource() );
- }
-
public void testGetMostRecentEventsWhenEmpty()
{
metadataRepositoryControl.expectAndReturn(
@@ -261,7 +227,7 @@
public void testAddAuditEvent()
throws ParseException
{
- String name = TIMESTAMP_FORMAT.format( new Date() );
+ String name = createEventName( new Date() );
AuditEvent event = createTestEvent( name );
metadataRepository.addMetadataFacet( TEST_REPO_ID, event );
@@ -276,7 +242,7 @@
public void testAddAuditEventNoRepositoryId()
throws ParseException
{
- String name = TIMESTAMP_FORMAT.format( new Date() );
+ String name = createEventName( new Date() );
AuditEvent event = createTestEvent( null, name );
// should just be ignored
@@ -304,11 +270,11 @@
{
Date current = new Date();
- String name1 = TIMESTAMP_FORMAT.format( new Date( current.getTime() -
12345 ) );
+ String name1 = createEventName( new Date( current.getTime() - 12345 )
);
Date expectedTimestamp = new Date( current.getTime() - 3000 );
- String name2 = TIMESTAMP_FORMAT.format( expectedTimestamp );
+ String name2 = createEventName( expectedTimestamp );
AuditEvent expectedEvent = createTestEvent( name2 );
- String name3 = TIMESTAMP_FORMAT.format( new Date( current.getTime() -
1000 ) );
+ String name3 = createEventName( new Date( current.getTime() - 1000 ) );
metadataRepositoryControl.expectAndReturn(
metadataRepository.getMetadataFacets( TEST_REPO_ID,
AuditEvent.FACET_ID ),
@@ -325,7 +291,7 @@
new
Date( current.getTime() - 2000 ) );
assertEquals( 1, events.size() );
- assertEvent( events.get( 0 ), name2, expectedEvent.getResource() );
+ assertTestEvent( events.get( 0 ), TIMESTAMP_FORMAT.format(
expectedTimestamp ), expectedEvent.getResource() );
metadataRepositoryControl.verify();
}
@@ -335,11 +301,12 @@
{
Date current = new Date();
- String name1 = TIMESTAMP_FORMAT.format( new Date( current.getTime() -
12345 ) );
+ String name1 = createEventName( new Date( current.getTime() - 12345 )
);
Date expectedTimestamp = new Date( current.getTime() - 3000 );
- String name2 = TIMESTAMP_FORMAT.format( expectedTimestamp );
+ String name2 = createEventName( expectedTimestamp );
AuditEvent expectedEvent2 = createTestEvent( name2 );
- String name3 = TIMESTAMP_FORMAT.format( new Date( current.getTime() -
1000 ) );
+ Date ts3 = new Date( current.getTime() - 1000 );
+ String name3 = createEventName( ts3 );
AuditEvent expectedEvent3 = createTestEvent( name3 );
metadataRepositoryControl.expectAndReturn(
@@ -357,8 +324,8 @@
new
Date( current.getTime() - 4000 ), current );
assertEquals( 2, events.size() );
- assertEvent( events.get( 0 ), name3, expectedEvent3.getResource() );
- assertEvent( events.get( 1 ), name2, expectedEvent2.getResource() );
+ assertTestEvent( events.get( 0 ), TIMESTAMP_FORMAT.format( ts3 ),
expectedEvent3.getResource() );
+ assertTestEvent( events.get( 1 ), TIMESTAMP_FORMAT.format(
expectedTimestamp ), expectedEvent2.getResource() );
metadataRepositoryControl.verify();
}
@@ -368,12 +335,13 @@
{
Date current = new Date();
- String name1 = TIMESTAMP_FORMAT.format( new Date( current.getTime() -
12345 ) );
+ Date ts1 = new Date( current.getTime() - 12345 );
+ String name1 = createEventName( ts1 );
AuditEvent expectedEvent1 = createTestEvent( name1 );
Date expectedTimestamp = new Date( current.getTime() - 3000 );
- String name2 = TIMESTAMP_FORMAT.format( expectedTimestamp );
+ String name2 = createEventName( expectedTimestamp );
AuditEvent expectedEvent2 = createTestEvent( name2 );
- String name3 = TIMESTAMP_FORMAT.format( new Date( current.getTime() -
1000 ) );
+ String name3 = createEventName( new Date( current.getTime() - 1000 ) );
metadataRepositoryControl.expectAndReturn(
metadataRepository.getMetadataFacets( TEST_REPO_ID,
AuditEvent.FACET_ID ),
@@ -391,8 +359,8 @@
new
Date( current.getTime() - 2000 ) );
assertEquals( 2, events.size() );
- assertEvent( events.get( 0 ), name2, expectedEvent2.getResource() );
- assertEvent( events.get( 1 ), name1, expectedEvent1.getResource() );
+ assertTestEvent( events.get( 0 ), TIMESTAMP_FORMAT.format(
expectedTimestamp ), expectedEvent2.getResource() );
+ assertTestEvent( events.get( 1 ), TIMESTAMP_FORMAT.format( ts1 ),
expectedEvent1.getResource() );
metadataRepositoryControl.verify();
}
@@ -402,12 +370,14 @@
{
Date current = new Date();
- String name1 = TIMESTAMP_FORMAT.format( new Date( current.getTime() -
12345 ) );
+ Date ts1 = new Date( current.getTime() - 12345 );
+ String name1 = createEventName( ts1 );
AuditEvent expectedEvent1 = createTestEvent( name1 );
Date expectedTimestamp = new Date( current.getTime() - 3000 );
- String name2 = TIMESTAMP_FORMAT.format( expectedTimestamp );
+ String name2 = createEventName( expectedTimestamp );
AuditEvent expectedEvent2 = createTestEvent( name2 );
- String name3 = TIMESTAMP_FORMAT.format( new Date( current.getTime() -
1000 ) );
+ Date ts3 = new Date( current.getTime() - 1000 );
+ String name3 = createEventName( ts3 );
AuditEvent expectedEvent3 = createTestEvent( name3 );
metadataRepositoryControl.expectAndReturn(
@@ -427,9 +397,9 @@
new
Date( current.getTime() - 20000 ), current );
assertEquals( 3, events.size() );
- assertEvent( events.get( 0 ), name3, expectedEvent3.getResource() );
- assertEvent( events.get( 1 ), name2, expectedEvent2.getResource() );
- assertEvent( events.get( 2 ), name1, expectedEvent1.getResource() );
+ assertTestEvent( events.get( 0 ), TIMESTAMP_FORMAT.format( ts3 ),
expectedEvent3.getResource() );
+ assertTestEvent( events.get( 1 ), TIMESTAMP_FORMAT.format(
expectedTimestamp ), expectedEvent2.getResource() );
+ assertTestEvent( events.get( 2 ), TIMESTAMP_FORMAT.format( ts1 ),
expectedEvent1.getResource() );
metadataRepositoryControl.verify();
}
@@ -439,13 +409,15 @@
{
Date current = new Date();
- String name1 = TIMESTAMP_FORMAT.format( new Date( current.getTime() -
12345 ) );
+ Date ts1 = new Date( current.getTime() - 12345 );
+ String name1 = createEventName( ts1 );
AuditEvent expectedEvent1 = createTestEvent( name1 );
Date expectedTimestamp = new Date( current.getTime() - 3000 );
- String name2 = TIMESTAMP_FORMAT.format( expectedTimestamp );
+ String name2 = createEventName( expectedTimestamp );
AuditEvent expectedEvent2 = createTestEvent( name2 );
expectedEvent2.setResource( "different-resource" );
- String name3 = TIMESTAMP_FORMAT.format( new Date( current.getTime() -
1000 ) );
+ Date ts3 = new Date( current.getTime() - 1000 );
+ String name3 = createEventName( ts3 );
AuditEvent expectedEvent3 = createTestEvent( name3 );
metadataRepositoryControl.expectAndReturn(
@@ -466,8 +438,8 @@
new Date( current.getTime() -
20000 ), current );
assertEquals( 2, events.size() );
- assertEvent( events.get( 0 ), name3, expectedEvent3.getResource() );
- assertEvent( events.get( 1 ), name1, expectedEvent1.getResource() );
+ assertTestEvent( events.get( 0 ), TIMESTAMP_FORMAT.format( ts3 ),
expectedEvent3.getResource() );
+ assertTestEvent( events.get( 1 ), TIMESTAMP_FORMAT.format( ts1 ),
expectedEvent1.getResource() );
metadataRepositoryControl.verify();
}
@@ -477,13 +449,13 @@
{
Date current = new Date();
- String name1 = TIMESTAMP_FORMAT.format( new Date( current.getTime() -
12345 ) );
+ String name1 = createEventName( new Date( current.getTime() - 12345 )
);
AuditEvent expectedEvent1 = createTestEvent( name1 );
Date expectedTimestamp = new Date( current.getTime() - 3000 );
- String name2 = TIMESTAMP_FORMAT.format( expectedTimestamp );
+ String name2 = createEventName( expectedTimestamp );
AuditEvent expectedEvent2 = createTestEvent( name2 );
expectedEvent2.setResource( "different-resource" );
- String name3 = TIMESTAMP_FORMAT.format( new Date( current.getTime() -
1000 ) );
+ String name3 = createEventName( new Date( current.getTime() - 1000 ) );
AuditEvent expectedEvent3 = createTestEvent( name3 );
metadataRepositoryControl.expectAndReturn(
@@ -512,12 +484,14 @@
{
Date current = new Date();
- String name1 = TIMESTAMP_FORMAT.format( new Date( current.getTime() -
12345 ) );
+ Date ts1 = new Date( current.getTime() - 12345 );
+ String name1 = createEventName( ts1 );
AuditEvent expectedEvent1 = createTestEvent( TEST_REPO_ID, name1 );
Date expectedTimestamp = new Date( current.getTime() - 3000 );
- String name2 = TIMESTAMP_FORMAT.format( expectedTimestamp );
+ String name2 = createEventName( expectedTimestamp );
AuditEvent expectedEvent2 = createTestEvent( TEST_REPO_ID_2, name2 );
- String name3 = TIMESTAMP_FORMAT.format( new Date( current.getTime() -
1000 ) );
+ Date ts3 = new Date( current.getTime() - 1000 );
+ String name3 = createEventName( ts3 );
AuditEvent expectedEvent3 = createTestEvent( TEST_REPO_ID, name3 );
metadataRepositoryControl.expectAndReturn(
@@ -538,9 +512,10 @@
new
Date( current.getTime() - 20000 ), current );
assertEquals( 3, events.size() );
- assertEvent( events.get( 0 ), name3, expectedEvent3.getResource() );
- assertEvent( events.get( 1 ), name2, expectedEvent2.getResource(),
TEST_REPO_ID_2 );
- assertEvent( events.get( 2 ), name1, expectedEvent1.getResource() );
+ assertTestEvent( events.get( 0 ), TEST_REPO_ID,
TIMESTAMP_FORMAT.format( ts3 ), expectedEvent3.getResource() );
+ assertTestEvent( events.get( 1 ), TEST_REPO_ID_2,
TIMESTAMP_FORMAT.format( expectedTimestamp ),
+ expectedEvent2.getResource() );
+ assertTestEvent( events.get( 2 ), TEST_REPO_ID,
TIMESTAMP_FORMAT.format( ts1 ), expectedEvent1.getResource() );
metadataRepositoryControl.verify();
}
@@ -550,10 +525,10 @@
{
Date current = new Date();
- String name1 = TIMESTAMP_FORMAT.format( new Date( current.getTime() -
12345 ) );
+ String name1 = createEventName( new Date( current.getTime() - 12345 )
);
Date expectedTimestamp = new Date( current.getTime() - 3000 );
- String name2 = TIMESTAMP_FORMAT.format( expectedTimestamp );
- String name3 = TIMESTAMP_FORMAT.format( new Date( current.getTime() -
1000 ) );
+ String name2 = createEventName( expectedTimestamp );
+ String name3 = createEventName( new Date( current.getTime() - 1000 ) );
metadataRepositoryControl.expectAndReturn(
metadataRepository.getMetadataFacets( TEST_REPO_ID,
AuditEvent.FACET_ID ),
@@ -569,4 +544,56 @@
metadataRepositoryControl.verify();
}
+
+ private static String getDefaultTestResourceName( String num )
+ {
+ return TEST_RESOURCE_BASE + "/" + num + ".xml";
+ }
+
+ private static String createEventName( Date timestamp )
+ {
+ AuditEvent event = new AuditEvent();
+ event.setTimestamp( timestamp );
+ return event.getName();
+ }
+
+ private static AuditEvent createTestEvent( String name )
+ throws ParseException
+ {
+ return createTestEvent( TEST_REPO_ID, name );
+ }
+
+ private static AuditEvent createTestEvent( String repoId, String name )
+ throws ParseException
+ {
+ return createEvent( repoId, name, getDefaultTestResourceName(
name.substring( name.length() - 3 ) ) );
+ }
+
+ private static AuditEvent createEvent( String repositoryId, String
timestamp, String resource )
+ throws ParseException
+ {
+ AuditEvent event = new AuditEvent();
+ event.setTimestamp( TIMESTAMP_FORMAT.parse( timestamp ) );
+ event.setAction( AuditEvent.UPLOAD_FILE );
+ event.setRemoteIP( TEST_IP_ADDRESS );
+ event.setRepositoryId( repositoryId );
+ event.setUserId( TEST_USER );
+ event.setResource( resource );
+ return event;
+ }
+
+ private static void assertTestEvent( AuditEvent event, String timestamp,
String resource )
+ {
+ assertTestEvent( event, TEST_REPO_ID, timestamp, resource );
+ }
+
+ private static void assertTestEvent( AuditEvent event, String
repositoryId, String timestamp, String resource )
+ {
+ assertEquals( timestamp, TIMESTAMP_FORMAT.format( event.getTimestamp()
) );
+ assertEquals( AuditEvent.UPLOAD_FILE, event.getAction() );
+ assertEquals( TEST_IP_ADDRESS, event.getRemoteIP() );
+ assertEquals( repositoryId, event.getRepositoryId() );
+ assertEquals( TEST_USER, event.getUserId() );
+ assertEquals( resource, event.getResource() );
+ }
}
\ No newline at end of file
