From 402f10c84133ca2cfbfc612255551b7c88791e32 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 13 Nov 2013 06:33:14 +0000 Subject: code cleanup comment git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1541400 13f79535-47bb-0310-9956-ffa450edef68 --- .../scanner/RepositoryContentConsumersTest.java | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'archiva-modules/archiva-base/archiva-repository-scanner/src') diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java index 7d23630d1..b246a2a7b 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java @@ -249,10 +249,6 @@ public class RepositoryContentConsumersTest RepositoryContentConsumers consumers = lookupRepositoryConsumers( ); KnownRepositoryContentConsumer selectedKnownConsumer = knownControl.createMock( KnownRepositoryContentConsumer.class ); - //KnownRepositoryContentConsumer unselectedKnownConsumer = - // (KnownRepositoryContentConsumer) MockControl.createNiceControl( - // KnownRepositoryContentConsumer.class ).getMock( ); - KnownRepositoryContentConsumer unselectedKnownConsumer = createNiceControl().createMock( KnownRepositoryContentConsumer.class ); @@ -265,10 +261,6 @@ public class RepositoryContentConsumersTest InvalidRepositoryContentConsumer selectedInvalidConsumer = invalidControl.createMock( InvalidRepositoryContentConsumer.class ); - //InvalidRepositoryContentConsumer unselectedInvalidConsumer = - // (InvalidRepositoryContentConsumer) MockControl.createControl( - // InvalidRepositoryContentConsumer.class ).getMock( ); - InvalidRepositoryContentConsumer unselectedInvalidConsumer = createControl().createMock( InvalidRepositoryContentConsumer.class ); consumers.setApplicationContext( @@ -286,11 +278,9 @@ public class RepositoryContentConsumersTest expect( selectedKnownConsumer.getIncludes( ) ).andReturn( Collections.singletonList( "**/*.txt" ) ); selectedKnownConsumer.processFile( _OS( "path/to/test-file.txt" ), false ); - // knownConsumer.completeScan(); knownControl.replay( ); selectedInvalidConsumer.beginScan( repo, startTime, false ); - // invalidConsumer.completeScan(); invalidControl.replay( ); @@ -298,30 +288,22 @@ public class RepositoryContentConsumersTest knownControl.verify( ); invalidControl.verify( ); - //verify( in ); knownControl.reset( ); invalidControl.reset( ); - File notIncludedTestFile = new File( "target/test-repo/path/to/test-file.xml" ); selectedKnownConsumer.beginScan( repo, startTime, false ); - //selectedKnownConsumer.getExcludes( ); - //knownControl.setReturnValue( Collections.EMPTY_LIST ); expect( selectedKnownConsumer.getExcludes() ).andReturn( Collections.emptyList() ); - //selectedKnownConsumer.getIncludes( ); - //knownControl.setReturnValue( Collections.singletonList( "**/*.txt" ) ); expect( selectedKnownConsumer.getIncludes( ) ).andReturn( Collections.singletonList( "**/*.txt" ) ); - // knownConsumer.completeScan(); knownControl.replay( ); selectedInvalidConsumer.beginScan( repo, startTime, false ); selectedInvalidConsumer.processFile( _OS( "path/to/test-file.xml" ), false ); expect( selectedInvalidConsumer.getId() ).andReturn( "invalid" ); - // invalidConsumer.completeScan(); invalidControl.replay( ); consumers.executeConsumers( repo, notIncludedTestFile, true ); @@ -336,13 +318,11 @@ public class RepositoryContentConsumersTest selectedKnownConsumer.beginScan( repo, startTime, false ); expect( selectedKnownConsumer.getExcludes() ).andReturn( Collections.singletonList( "**/test-file.txt" ) ); - // knownConsumer.completeScan(); knownControl.replay( ); selectedInvalidConsumer.beginScan( repo, startTime, false ); selectedInvalidConsumer.processFile( _OS( "path/to/test-file.txt" ), false ); expect( selectedInvalidConsumer.getId() ).andReturn( "invalid" ); - // invalidConsumer.completeScan(); invalidControl.replay( ); consumers.executeConsumers( repo, excludedTestFile, true ); -- cgit v1.2.3