Modified: maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/GoalTest.java URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/GoalTest.java?rev=423634&r1=423633&r2=423634&view=diff ============================================================================== --- maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/GoalTest.java (original) +++ maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/GoalTest.java Wed Jul 19 15:13:40 2006 @@ -17,15 +17,16 @@ * ==================================================================== */ -import junit.framework.TestCase; - import java.util.List; -public class GoalTest extends TestCase +import junit.framework.TestCase; + +public class GoalTest + extends TestCase { private Session session; - public GoalTest(String name) + public GoalTest( String name ) { super( name ); } @@ -49,12 +50,10 @@ Goal b1 = new Goal( "b" ); Goal b2 = new Goal( "b" ); - assertEquals( a1.hashCode(), - a2.hashCode() ); - - assertEquals( b1.hashCode(), - b2.hashCode() ); - + assertEquals( a1.hashCode(), a2.hashCode() ); + + assertEquals( b1.hashCode(), b2.hashCode() ); + assertTrue( a1.hashCode() != b1.hashCode() ); } @@ -66,20 +65,18 @@ Goal b1 = new Goal( "b" ); Goal b2 = new Goal( "b" ); - assertEquals( a1, - a2 ); + assertEquals( a1, a2 ); - assertEquals( b1, - b2 ); + assertEquals( b1, b2 ); - assertTrue( ! a1.equals( b1 ) ); + assertTrue( !a1.equals( b1 ) ); } public void testHasBeenMet() { Goal g = new Goal( "a" ); - assertTrue( ! g.isSatisfied( this.session ) ); + assertTrue( !g.isSatisfied( this.session ) ); this.session.addSatisfiedGoal( g ); @@ -87,7 +84,7 @@ this.session.removeSatisfiedGoal( g ); - assertTrue( ! g.isSatisfied( this.session ) ); + assertTrue( !g.isSatisfied( this.session ) ); } public void testAddPrerequisite_NoCycle() @@ -101,24 +98,21 @@ g1.addPrecursor( g2 ); g1.addPrecursor( g3 ); - assertEquals( 2, - g1.getPrecursors().size() ); + assertEquals( 2, g1.getPrecursors().size() ); assertTrue( g1.getPrecursors().contains( g2 ) ); assertTrue( g1.getPrecursors().contains( g3 ) ); - assertEquals( 0, - g2.getPrecursors().size() ); - assertEquals( 0, - g3.getPrecursors().size() ); + assertEquals( 0, g2.getPrecursors().size() ); + assertEquals( 0, g3.getPrecursors().size() ); } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { fail( e.getLocalizedMessage() ); } } - + public void testAddPostcursor_NoCycle() { Goal g1 = new Goal( "goal-1" ); @@ -127,7 +121,7 @@ Goal g4 = new Goal( "goal-4" ); Goal g5 = new Goal( "goal-5" ); Goal g6 = new Goal( "goal-6" ); - + try { g1.addPostcursor( g2 ); @@ -135,7 +129,7 @@ g3.addPostcursor( g4 ); g4.addPostcursor( g5 ); g4.addPostcursor( g6 ); - + assertEquals( 0, g1.getPrecursors().size() ); assertEquals( 1, g1.getPostcursors().size() ); assertEquals( 1, g2.getPrecursors().size() ); @@ -148,19 +142,18 @@ assertEquals( 0, g5.getPostcursors().size() ); assertEquals( 1, g6.getPrecursors().size() ); assertEquals( 0, g6.getPostcursors().size() ); - - assertTrue( g1.getPostcursors().contains(g2) ); - assertTrue( g4.getPostcursors().contains(g5) ); - assertTrue( g4.getPostcursors().contains(g6) ); - assertTrue( g5.getPrecursors().contains(g4) ); - assertTrue( g6.getPrecursors().contains(g4) ); + + assertTrue( g1.getPostcursors().contains( g2 ) ); + assertTrue( g4.getPostcursors().contains( g5 ) ); + assertTrue( g4.getPostcursors().contains( g6 ) ); + assertTrue( g5.getPrecursors().contains( g4 ) ); + assertTrue( g6.getPrecursors().contains( g4 ) ); } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { - fail (e.getLocalizedMessage() ); + fail( e.getLocalizedMessage() ); } } - public void testAddPrecursor_LocalCycle() { @@ -177,43 +170,43 @@ fail( "Should have thrown CyclicGoalChainException" ); } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { // expected and correct } } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { fail( e.getLocalizedMessage() ); } } - + public void testPostcursor_LocalCycle() { Goal g1 = new Goal( "goal-1" ); Goal g2 = new Goal( "goal-2" ); - + try { g1.addPostcursor( g2 ); - + try { g2.addPostcursor( g1 ); - + fail( "Should have thrown CyclicGoalChainException" ); } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { // expected and correct } } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { - fail (e.getLocalizedMessage() ); + fail( e.getLocalizedMessage() ); } } - + public void testAddPrecursor_DistantFullCycle() { Goal g1 = new Goal( "goal-1" ); @@ -243,12 +236,12 @@ fail( "Should have thrown CyclicGoalChainException" ); } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { // expected and correct } } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { fail( e.getLocalizedMessage() ); } @@ -283,17 +276,17 @@ fail( "Should have thrown CyclicGoalChainException" ); } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { // expected and correct } } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { fail( e.getLocalizedMessage() ); } } - + public void testAddPrecursor_DistantPartialCycle() { Goal g1 = new Goal( "goal-1" ); @@ -323,17 +316,17 @@ fail( "Should have thrown CyclicGoalChainException" ); } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { // expected and correct } } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { fail( e.getLocalizedMessage() ); } } - + public void testAddPostcursor_DistantPartialCycle() { Goal g1 = new Goal( "goal-1" ); @@ -363,12 +356,12 @@ fail( "Should have thrown CyclicGoalChainException" ); } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { // expected and correct } } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { fail( e.getLocalizedMessage() ); } @@ -404,12 +397,12 @@ fail( "Should have thrown CyclicGoalChainException" ); } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { // expected and correct } } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { fail( e.getLocalizedMessage() ); } @@ -445,12 +438,12 @@ fail( "Should have thrown CyclicGoalChainException" ); } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { // expected and correct } } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { fail( e.getLocalizedMessage() ); } @@ -460,76 +453,69 @@ { GoalTracker tracker = new GoalTracker(); - Goal g1 = new MockGoal( "goal-1", - tracker ); - - Goal g2 = new MockGoal( "goal-2", - tracker ); - - Goal g3 = new MockGoal( "goal-3", - tracker ); + Goal g1 = new MockGoal( "goal-1", tracker ); + + Goal g2 = new MockGoal( "goal-2", tracker ); + + Goal g3 = new MockGoal( "goal-3", tracker ); try { g1.addPrecursor( g2 ); g2.addPrecursor( g3 ); - + tracker.addExpectedGoal( g3 ); tracker.addExpectedGoal( g2 ); tracker.addExpectedGoal( g1 ); g1.attain( this.session ); } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { fail( e.getLocalizedMessage() ); } - catch (UnattainableGoalException e) + catch ( UnattainableGoalException e ) { fail( e.getLocalizedMessage() ); } - catch (NoActionDefinitionException e) + catch ( NoActionDefinitionException e ) { fail( e.getLocalizedMessage() ); } tracker.verify(); } - + public void testPostAttain_Linear() { GoalTracker tracker = new GoalTracker(); - Goal g1 = new MockGoal( "goal-1", - tracker ); - - Goal g2 = new MockGoal( "goal-2", - tracker ); - - Goal g3 = new MockGoal( "goal-3", - tracker ); - + Goal g1 = new MockGoal( "goal-1", tracker ); + + Goal g2 = new MockGoal( "goal-2", tracker ); + + Goal g3 = new MockGoal( "goal-3", tracker ); try { g1.addPostcursor( g2 ); g2.addPostcursor( g3 ); - + tracker.addExpectedGoal( g1 ); tracker.addExpectedGoal( g2 ); tracker.addExpectedGoal( g3 ); g3.attain( this.session ); } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { fail( e.getLocalizedMessage() ); } - catch (UnattainableGoalException e) + catch ( UnattainableGoalException e ) { fail( e.getLocalizedMessage() ); } - catch (NoActionDefinitionException e) + catch ( NoActionDefinitionException e ) { fail( e.getLocalizedMessage() ); } @@ -541,61 +527,52 @@ { GoalTracker tracker = new GoalTracker(); - Goal g1 = new MockGoal( "goal-1", - tracker ); - - Goal g2 = new MockGoal( "goal-2", - tracker ); - - Goal g3 = new MockGoal( "goal-3", - tracker ); - + Goal g1 = new MockGoal( "goal-1", tracker ); + + Goal g2 = new MockGoal( "goal-2", tracker ); + + Goal g3 = new MockGoal( "goal-3", tracker ); try { g1.addPostcursor( g2 ); g2.addPostcursor( g3 ); - + tracker.addExpectedGoal( g1 ); tracker.addExpectedGoal( g2 ); tracker.addExpectedGoal( g3 ); g1.percolate( this.session ); } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { fail( e.getLocalizedMessage() ); } - catch (UnattainableGoalException e) + catch ( UnattainableGoalException e ) { fail( e.getLocalizedMessage() ); } - catch (NoActionDefinitionException e) + catch ( NoActionDefinitionException e ) { fail( e.getLocalizedMessage() ); } tracker.verify(); } - + public void testAttain_Tree() { GoalTracker tracker = new GoalTracker(); - MockGoal g1 = new MockGoal( "goal-1", - tracker ); + MockGoal g1 = new MockGoal( "goal-1", tracker ); + + MockGoal g2 = new MockGoal( "goal-2", tracker ); + + MockGoal g3 = new MockGoal( "goal-3", tracker ); + + MockGoal g4 = new MockGoal( "goal-4", tracker ); - MockGoal g2 = new MockGoal( "goal-2", - tracker ); - - MockGoal g3 = new MockGoal( "goal-3", - tracker ); - - MockGoal g4 = new MockGoal( "goal-4", - tracker ); - - MockGoal g5 = new MockGoal( "goal-5", - tracker ); + MockGoal g5 = new MockGoal( "goal-5", tracker ); try { @@ -603,7 +580,7 @@ g2.addPrecursor( g3 ); g2.addPrecursor( g4 ); g4.addPrecursor( g5 ); - + tracker.addExpectedGoal( g3 ); tracker.addExpectedGoal( g5 ); tracker.addExpectedGoal( g4 ); @@ -612,15 +589,15 @@ g1.attain( this.session ); } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { fail( e.getLocalizedMessage() ); } - catch (UnattainableGoalException e) + catch ( UnattainableGoalException e ) { fail( e.getLocalizedMessage() ); } - catch (NoActionDefinitionException e) + catch ( NoActionDefinitionException e ) { fail( e.getLocalizedMessage() ); } @@ -628,25 +605,19 @@ tracker.verify(); } - public void testPostPercolate_Tree() { GoalTracker tracker = new GoalTracker(); - MockGoal g1 = new MockGoal( "goal-1", - tracker ); + MockGoal g1 = new MockGoal( "goal-1", tracker ); + + MockGoal g2 = new MockGoal( "goal-2", tracker ); - MockGoal g2 = new MockGoal( "goal-2", - tracker ); - - MockGoal g3 = new MockGoal( "goal-3", - tracker ); - - MockGoal g4 = new MockGoal( "goal-4", - tracker ); - - MockGoal g5 = new MockGoal( "goal-5", - tracker ); + MockGoal g3 = new MockGoal( "goal-3", tracker ); + + MockGoal g4 = new MockGoal( "goal-4", tracker ); + + MockGoal g5 = new MockGoal( "goal-5", tracker ); try { @@ -654,7 +625,7 @@ g2.addPostcursor( g3 ); g2.addPostcursor( g4 ); g4.addPostcursor( g5 ); - + tracker.addExpectedGoal( g1 ); tracker.addExpectedGoal( g2 ); tracker.addExpectedGoal( g3 ); @@ -663,15 +634,15 @@ g1.percolate( this.session ); } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { fail( e.getLocalizedMessage() ); } - catch (UnattainableGoalException e) + catch ( UnattainableGoalException e ) { fail( e.getLocalizedMessage() ); } - catch (NoActionDefinitionException e) + catch ( NoActionDefinitionException e ) { fail( e.getLocalizedMessage() ); } @@ -679,25 +650,19 @@ tracker.verify(); } - public void testAttain_Tree_PartiallyNotRequired() { GoalTracker tracker = new GoalTracker(); - - MockGoal g1 = new MockGoal( "goal-1", - tracker ); - - MockGoal g2 = new MockGoal( "goal-2", - tracker ); - - MockGoal g3 = new MockGoal( "goal-3", - tracker ); - - MockGoal g4 = new MockGoal( "goal-4", - tracker ); - - MockGoal g5 = new MockGoal( "goal-5", - tracker ); + + MockGoal g1 = new MockGoal( "goal-1", tracker ); + + MockGoal g2 = new MockGoal( "goal-2", tracker ); + + MockGoal g3 = new MockGoal( "goal-3", tracker ); + + MockGoal g4 = new MockGoal( "goal-4", tracker ); + + MockGoal g5 = new MockGoal( "goal-5", tracker ); try { @@ -708,7 +673,7 @@ g4.requiresAction( false ); g1.requiresAction( false ); - + tracker.addExpectedGoal( g3 ); tracker.addExpectedGoal( g5 ); // tracker.addExpectedGoal( g4 ); @@ -717,15 +682,15 @@ g1.attain( this.session ); } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { fail( e.getLocalizedMessage() ); } - catch (UnattainableGoalException e) + catch ( UnattainableGoalException e ) { fail( e.getLocalizedMessage() ); } - catch (NoActionDefinitionException e) + catch ( NoActionDefinitionException e ) { fail( e.getLocalizedMessage() ); } @@ -733,25 +698,19 @@ tracker.verify(); } - public void testPercolate_Tree_PartiallyNotRequired() { GoalTracker tracker = new GoalTracker(); - - MockGoal g1 = new MockGoal( "goal-1", - tracker ); - - MockGoal g2 = new MockGoal( "goal-2", - tracker ); - - MockGoal g3 = new MockGoal( "goal-3", - tracker ); - - MockGoal g4 = new MockGoal( "goal-4", - tracker ); - - MockGoal g5 = new MockGoal( "goal-5", - tracker ); + + MockGoal g1 = new MockGoal( "goal-1", tracker ); + + MockGoal g2 = new MockGoal( "goal-2", tracker ); + + MockGoal g3 = new MockGoal( "goal-3", tracker ); + + MockGoal g4 = new MockGoal( "goal-4", tracker ); + + MockGoal g5 = new MockGoal( "goal-5", tracker ); try { @@ -762,7 +721,7 @@ g4.requiresAction( false ); g1.requiresAction( false ); - + //tracker.addExpectedGoal( g1 ); tracker.addExpectedGoal( g2 ); tracker.addExpectedGoal( g3 ); @@ -771,15 +730,15 @@ g1.percolate( this.session ); } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { fail( e.getLocalizedMessage() ); } - catch (UnattainableGoalException e) + catch ( UnattainableGoalException e ) { fail( e.getLocalizedMessage() ); } - catch (NoActionDefinitionException e) + catch ( NoActionDefinitionException e ) { fail( e.getLocalizedMessage() ); } @@ -787,34 +746,25 @@ tracker.verify(); } - public void testAttain_Tree_Overlap() { GoalTracker tracker = new GoalTracker(); - MockGoal g1_1 = new MockGoal( "goal-1-1", - tracker ); + MockGoal g1_1 = new MockGoal( "goal-1-1", tracker ); - MockGoal g1_2 = new MockGoal( "goal-1-2", - tracker ); + MockGoal g1_2 = new MockGoal( "goal-1-2", tracker ); - MockGoal g1_3 = new MockGoal( "goal-1-3", - tracker ); + MockGoal g1_3 = new MockGoal( "goal-1-3", tracker ); - MockGoal g2_1 = new MockGoal( "goal-2-1", - tracker ); + MockGoal g2_1 = new MockGoal( "goal-2-1", tracker ); - MockGoal g2_2 = new MockGoal( "goal-2-2", - tracker ); + MockGoal g2_2 = new MockGoal( "goal-2-2", tracker ); - MockGoal g2_3 = new MockGoal( "goal-2-3", - tracker ); + MockGoal g2_3 = new MockGoal( "goal-2-3", tracker ); - MockGoal gc_1 = new MockGoal( "goal-c-1", - tracker ); + MockGoal gc_1 = new MockGoal( "goal-c-1", tracker ); - MockGoal gc_2 = new MockGoal( "goal-c-2", - tracker ); + MockGoal gc_2 = new MockGoal( "goal-c-2", tracker ); try { @@ -857,48 +807,39 @@ g2_1.attain( this.session ); } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { fail( e.getLocalizedMessage() ); } - catch (UnattainableGoalException e) + catch ( UnattainableGoalException e ) { fail( e.getLocalizedMessage() ); } - catch (NoActionDefinitionException e) + catch ( NoActionDefinitionException e ) { fail( e.getLocalizedMessage() ); } } - public void testPercolate_Tree_Overlap() { GoalTracker tracker = new GoalTracker(); - MockGoal g1_1 = new MockGoal( "goal-1-1", - tracker ); + MockGoal g1_1 = new MockGoal( "goal-1-1", tracker ); - MockGoal g1_2 = new MockGoal( "goal-1-2", - tracker ); + MockGoal g1_2 = new MockGoal( "goal-1-2", tracker ); - MockGoal g1_3 = new MockGoal( "goal-1-3", - tracker ); + MockGoal g1_3 = new MockGoal( "goal-1-3", tracker ); - MockGoal g2_1 = new MockGoal( "goal-2-1", - tracker ); + MockGoal g2_1 = new MockGoal( "goal-2-1", tracker ); - MockGoal g2_2 = new MockGoal( "goal-2-2", - tracker ); + MockGoal g2_2 = new MockGoal( "goal-2-2", tracker ); - MockGoal g2_3 = new MockGoal( "goal-2-3", - tracker ); + MockGoal g2_3 = new MockGoal( "goal-2-3", tracker ); - MockGoal gc_1 = new MockGoal( "goal-c-1", - tracker ); + MockGoal gc_1 = new MockGoal( "goal-c-1", tracker ); - MockGoal gc_2 = new MockGoal( "goal-c-2", - tracker ); + MockGoal gc_2 = new MockGoal( "goal-c-2", tracker ); try { @@ -941,27 +882,25 @@ g2_1.percolate( this.session ); } - catch (CyclicGoalChainException e) + catch ( CyclicGoalChainException e ) { fail( e.getLocalizedMessage() ); } - catch (UnattainableGoalException e) + catch ( UnattainableGoalException e ) { fail( e.getLocalizedMessage() ); } - catch (NoActionDefinitionException e) + catch ( NoActionDefinitionException e ) { fail( e.getLocalizedMessage() ); } } - - + public void testRequiresAction_False() { GoalTracker tracker = new GoalTracker(); - MockGoal g = new MockGoal( "goal-1", - tracker ); + MockGoal g = new MockGoal( "goal-1", tracker ); g.requiresAction( false ); @@ -971,11 +910,11 @@ tracker.verify(); } - catch (UnattainableGoalException e) + catch ( UnattainableGoalException e ) { fail( e.getLocalizedMessage() ); } - catch (NoActionDefinitionException e) + catch ( NoActionDefinitionException e ) { fail( e.getLocalizedMessage() ); } @@ -985,8 +924,7 @@ { GoalTracker tracker = new GoalTracker(); - MockGoal g = new MockGoal( "goal-1", - tracker ); + MockGoal g = new MockGoal( "goal-1", tracker ); tracker.addExpectedGoal( g ); @@ -996,17 +934,16 @@ tracker.verify(); } - catch (UnattainableGoalException e) + catch ( UnattainableGoalException e ) { fail( e.getLocalizedMessage() ); } - catch (NoActionDefinitionException e) + catch ( NoActionDefinitionException e ) { fail( e.getLocalizedMessage() ); } } - public void testPreGoalCallback_AddRemove() { MockCallback callback = new MockCallback(); @@ -1018,21 +955,17 @@ List callbacks = g.getPreGoalCallbacks(); - assertEquals( 2, - callbacks.size() ); + assertEquals( 2, callbacks.size() ); - assertSame( callback, - callbacks.get( 0 ) ); + assertSame( callback, callbacks.get( 0 ) ); - assertSame( callback, - callbacks.get( 1 ) ); + assertSame( callback, callbacks.get( 1 ) ); g.removePreGoalCallback( callback ); callbacks = g.getPreGoalCallbacks(); - assertEquals( 0, - callbacks.size() ); + assertEquals( 0, callbacks.size() ); } public void testPostGoalCallback_AddRemove() @@ -1046,21 +979,17 @@ List callbacks = g.getPostGoalCallbacks(); - assertEquals( 2, - callbacks.size() ); + assertEquals( 2, callbacks.size() ); - assertSame( callback, - callbacks.get( 0 ) ); + assertSame( callback, callbacks.get( 0 ) ); - assertSame( callback, - callbacks.get( 1 ) ); + assertSame( callback, callbacks.get( 1 ) ); g.removePostGoalCallback( callback ); callbacks = g.getPostGoalCallbacks(); - assertEquals( 0, - callbacks.size() ); + assertEquals( 0, callbacks.size() ); } public void testPreActionCallback_AddRemove() @@ -1074,21 +1003,17 @@ List callbacks = g.getPreActionCallbacks(); - assertEquals( 2, - callbacks.size() ); + assertEquals( 2, callbacks.size() ); - assertSame( callback, - callbacks.get( 0 ) ); + assertSame( callback, callbacks.get( 0 ) ); - assertSame( callback, - callbacks.get( 1 ) ); + assertSame( callback, callbacks.get( 1 ) ); g.removePreActionCallback( callback ); callbacks = g.getPreActionCallbacks(); - assertEquals( 0, - callbacks.size() ); + assertEquals( 0, callbacks.size() ); } public void testPostActionCallback_AddRemove() @@ -1102,20 +1027,16 @@ List callbacks = g.getPostActionCallbacks(); - assertEquals( 2, - callbacks.size() ); + assertEquals( 2, callbacks.size() ); - assertSame( callback, - callbacks.get( 0 ) ); + assertSame( callback, callbacks.get( 0 ) ); - assertSame( callback, - callbacks.get( 1 ) ); + assertSame( callback, callbacks.get( 1 ) ); g.removePostActionCallback( callback ); callbacks = g.getPostActionCallbacks(); - assertEquals( 0, - callbacks.size() ); + assertEquals( 0, callbacks.size() ); } }
Modified: maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/GoalTracker.java URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/GoalTracker.java?rev=423634&r1=423633&r2=423634&view=diff ============================================================================== --- maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/GoalTracker.java (original) +++ maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/GoalTracker.java Wed Jul 19 15:13:40 2006 @@ -1,9 +1,9 @@ package org.apache.maven.werkz; -import junit.framework.Assert; - -import java.util.List; import java.util.ArrayList; +import java.util.List; + +import junit.framework.Assert; /* ==================================================================== * Copyright 2001-2005 The Apache Software Foundation. @@ -22,9 +22,11 @@ * ==================================================================== */ -public class GoalTracker extends Assert +public class GoalTracker + extends Assert { private List expectedGoals; + private List firedGoals; public GoalTracker() @@ -33,12 +35,12 @@ this.firedGoals = new ArrayList(); } - public void addExpectedGoal(Goal goal) + public void addExpectedGoal( Goal goal ) { this.expectedGoals.add( goal ); } - public void addFiredGoal(Goal goal) + public void addFiredGoal( Goal goal ) { this.firedGoals.add( goal ); } @@ -51,7 +53,6 @@ public void verify() { - assertEquals( this.expectedGoals, - this.firedGoals ); + assertEquals( this.expectedGoals, this.firedGoals ); } } Modified: maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/MockCallback.java URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/MockCallback.java?rev=423634&r1=423633&r2=423634&view=diff ============================================================================== --- maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/MockCallback.java (original) +++ maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/MockCallback.java Wed Jul 19 15:13:40 2006 @@ -21,20 +21,22 @@ implements PreGoalCallback, PostGoalCallback, PreActionCallback, PostActionCallback { - public void firePreGoal(Goal goal) + public void firePreGoal( Goal goal ) { // intentionally left blank. } - public void firePostGoal(Goal goal) + public void firePostGoal( Goal goal ) { // intentionally left blank. } - public void firePreAction(Goal goal) + + public void firePreAction( Goal goal ) { // intentionally left blank. } - public void firePostAction(Goal goal) + + public void firePostAction( Goal goal ) { // intentionally left blank. } Modified: maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/MockGoal.java URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/MockGoal.java?rev=423634&r1=423633&r2=423634&view=diff ============================================================================== --- maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/MockGoal.java (original) +++ maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/MockGoal.java Wed Jul 19 15:13:40 2006 @@ -17,28 +17,32 @@ * ==================================================================== */ -public class MockGoal extends Goal +public class MockGoal + extends Goal { private GoalTracker tracker; + private boolean requiresAction; - public MockGoal(String name, - GoalTracker tracker) + public MockGoal( String name, GoalTracker tracker ) { super( name ); this.tracker = tracker; this.requiresAction = true; - setAction( - new Action() { - public void performAction(Session session) { - getTracker().addFiredGoal( getGoal() ); - } - public boolean requiresAction() { - return outterRequiresAction(); - } - } ); + setAction( new Action() + { + public void performAction( Session session ) + { + getTracker().addFiredGoal( getGoal() ); + } + + public boolean requiresAction() + { + return outterRequiresAction(); + } + } ); } Goal getGoal() @@ -56,9 +60,9 @@ return this.requiresAction; } - public void requiresAction(boolean requiresAction) + public void requiresAction( boolean requiresAction ) { this.requiresAction = requiresAction; } - + } Modified: maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/ProjectTest.java URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/ProjectTest.java?rev=423634&r1=423633&r2=423634&view=diff ============================================================================== --- maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/ProjectTest.java (original) +++ maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/ProjectTest.java Wed Jul 19 15:13:40 2006 @@ -17,15 +17,16 @@ * ==================================================================== */ -import junit.framework.TestCase; - import java.util.Arrays; -public class ProjectTest extends TestCase +import junit.framework.TestCase; + +public class ProjectTest + extends TestCase { private Session session; - public ProjectTest(String name) + public ProjectTest( String name ) { super( name ); } @@ -48,8 +49,7 @@ project.addGoal( g ); - assertSame( g, - project.getGoal( "goal-1" ) ); + assertSame( g, project.getGoal( "goal-1" ) ); } public void testGetGoal_Bogus() @@ -65,8 +65,7 @@ WerkzProject project = new WerkzProject(); - MockGoal g = new MockGoal( "goal-1", - tracker ); + MockGoal g = new MockGoal( "goal-1", tracker ); project.addGoal( g ); @@ -74,20 +73,19 @@ try { - project.attainGoal( "goal-1", - this.session ); - + project.attainGoal( "goal-1", this.session ); + tracker.verify(); } - catch (NoSuchGoalException e) + catch ( NoSuchGoalException e ) { fail( e.getLocalizedMessage() ); } - catch (UnattainableGoalException e) + catch ( UnattainableGoalException e ) { fail( e.getLocalizedMessage() ); } - catch (NoActionDefinitionException e) + catch ( NoActionDefinitionException e ) { fail( e.getLocalizedMessage() ); } @@ -99,20 +97,19 @@ try { - project.attainGoal( "goal-1", - this.session ); + project.attainGoal( "goal-1", this.session ); fail( "Should have thrown NoSuchGoalException" ); } - catch (NoSuchGoalException e) + catch ( NoSuchGoalException e ) { // expected and correct } - catch (UnattainableGoalException e) + catch ( UnattainableGoalException e ) { fail( e.getLocalizedMessage() ); } - catch (NoActionDefinitionException e) + catch ( NoActionDefinitionException e ) { fail( e.getLocalizedMessage() ); } @@ -149,11 +146,9 @@ Goal[] chain = project.getExecutionChain( "a" ); - assertEquals( 6, - chain.length ); + assertEquals( 6, chain.length ); - assertSame( a, - chain[5] ); + assertSame( a, chain[5] ); // ---------- // a @@ -193,26 +188,19 @@ // - assertContains( a, - chain ); - assertContains( b, - chain ); - assertContains( c, - chain ); - assertContains( d, - chain ); - assertContains( e, - chain ); + assertContains( a, chain ); + assertContains( b, chain ); + assertContains( c, chain ); + assertContains( d, chain ); + assertContains( e, chain ); } - protected void assertBefore(Goal first, - Goal after, - Goal[] chain) + protected void assertBefore( Goal first, Goal after, Goal[] chain ) { int firstIndex = -1; int afterIndex = -1; - for ( int i = 0 ; i < chain.length ; ++i ) + for ( int i = 0; i < chain.length; ++i ) { if ( chain[i] == first ) { @@ -237,17 +225,16 @@ assertTrue( firstIndex < afterIndex ); } - protected void assertContains(Object obj, - Object[] array) + protected void assertContains( Object obj, Object[] array ) { - for ( int i = 0 ; i < array.length ; ++i ) + for ( int i = 0; i < array.length; ++i ) { if ( array[i].equals( obj ) ) { return; } } - + fail( obj + " not in " + Arrays.asList( array ) ); } }
