diff options
| author | Brett Porter <brett@apache.org> | 2010-02-16 05:34:01 +0000 |
|---|---|---|
| committer | Brett Porter <brett@apache.org> | 2010-02-16 05:34:01 +0000 |
| commit | 0db94985225bc67f7d80f5708b10e58d7e17efbb (patch) | |
| tree | e0501fefd8a7da6dba3ee8bc73579fa735235aef /archiva-modules/plugins | |
| parent | 199a251293983f72aaa6b828a1303a719555a97d (diff) | |
| download | archiva-0db94985225bc67f7d80f5708b10e58d7e17efbb.tar.gz archiva-0db94985225bc67f7d80f5708b10e58d7e17efbb.zip | |
avoid timing issues with audit logs
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@910400 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/plugins')
| -rw-r--r-- | archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java b/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java index 2bb3399a8..28c62456a 100644 --- a/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java +++ b/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java @@ -138,16 +138,16 @@ public class AuditManagerTest return createTestEvent( TEST_REPO_ID, name ); } - private static AuditEvent createTestEvent( String repositoryId, String name ) + private static AuditEvent createTestEvent( String repositoryId, String t ) throws ParseException { AuditEvent event = new AuditEvent(); - event.setTimestamp( TIMESTAMP_FORMAT.parse( name ) ); + event.setTimestamp( TIMESTAMP_FORMAT.parse( AUDIT_EVENT_BASE + t ) ); 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() ) ); + event.setResource( TEST_RESOURCE_BASE + "/" + t ); return event; } @@ -197,10 +197,11 @@ public class AuditManagerTest 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 t = MILLIS_FORMAT.format( i ); + String name = AUDIT_EVENT_BASE + t + "/" + t; String repositoryId = i % 2 == 0 ? TEST_REPO_ID : TEST_REPO_ID_2; eventNames.get( repositoryId ).add( name ); - events.add( createTestEvent( repositoryId, name ) ); + events.add( createTestEvent( repositoryId, t ) ); } metadataRepositoryControl.expectAndReturn( |