cvs commit: maven/src/test/java/org/apache/maven/project ProjectInheritanceTest.java

2003-12-30 Thread brett 
brett   2003/12/30 17:38:09

  Modified:src/test/java/org/apache/maven/project Tag: MAVEN-1_0-BRANCH
ProjectInheritanceTest.java
  Log:
  fix inheritence tests, add resource inheritence tests
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.40.4.3  +23 -6 
maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java
  
  Index: ProjectInheritanceTest.java
  ===
  RCS file: 
/home/cvs/maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java,v
  retrieving revision 1.40.4.2
  retrieving revision 1.40.4.3
  diff -u -r1.40.4.2 -r1.40.4.3
  --- ProjectInheritanceTest.java   10 Dec 2003 04:47:11 -  1.40.4.2
  +++ ProjectInheritanceTest.java   31 Dec 2003 01:38:09 -  1.40.4.3
  @@ -55,6 +55,9 @@
*/
   
   import java.io.File;
  +import java.util.Arrays;
  +import java.util.Collections;
  +import java.util.Iterator;
   import java.util.List;
   
   import junit.framework.Test;
  @@ -97,7 +100,7 @@
   public void testProjectMapping() throws Exception
   {
   Project p = MavenUtils.getProject( new File( TEST_DOCUMENT ) );
  -
  +
   // Make sure the groupId is inherited correctly.
   assertEquals( maven, p.getGroupId() );
   
  @@ -171,15 +174,29 @@
   assertEquals( maven:child, p.getId() );
   
   // Test organization inheritance. These should pass, but don't
  -if ( false )  {
  -  assertNotNull( p.getOrganization() );
  -  assertEquals( Apache Software Foundation, p.getOrganization().getName() 
);
  -  assertEquals( http://jakarta.apache.org/;, p.getOrganization().getUrl() 
);
  -}
  +assertNotNull( p.getOrganization() );
  +assertEquals( Apache Software Foundation, p.getOrganization().getName() );
  +assertEquals( http://www.apache.org/;, p.getOrganization().getUrl() );
   
   // Test siteAddress / siteDirectory
   assertEquals( theSiteAddress, p.getSiteAddress());
   assertEquals( theSiteDirectory, p.getSiteDirectory());
  +
  +boolean found = false;
  +List resources = p.getBuild().getResources();
  +for ( Iterator i = resources.iterator(); i.hasNext(); )
  +{
  +Resource r = ( Resource ) i.next();
  +File dir = new File( p.getFile().getParent(), src + FS + messages 
).getCanonicalFile();
  +if ( r.getDirectory().equals( dir.getPath() ) )
  +{
  +assertEquals( check target path, org/apache/maven/messages, 
r.getTargetPath() );
  +assertEquals( check includes, Arrays.asList( new String[] { 
messages*.properties } ), r.getIncludes() );
  +assertEquals( check excludes, Collections.EMPTY_LIST, 
r.getExcludes() );
  +found = true;
  +}
  +}
  +assertTrue( Check found resources for src/messages, found );
   }
   
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: maven/src/test/java/org/apache/maven/project ProjectInheritanceTest.java

2003-12-13 Thread brett 
brett   2003/12/13 16:07:42

  Modified:src/test/java/org/apache/maven/project
ProjectInheritanceTest.java
  Log:
  Match project.xml
  
  Revision  ChangesPath
  1.41  +1 -1  
maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java
  
  Index: ProjectInheritanceTest.java
  ===
  RCS file: 
/home/cvs/maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- ProjectInheritanceTest.java   26 Sep 2003 15:47:24 -  1.40
  +++ ProjectInheritanceTest.java   14 Dec 2003 00:07:42 -  1.41
  @@ -103,7 +103,7 @@
   assertEquals( Super Extendo, p.getName() );
   assertEquals( maven:super-extendo, p.getId() );
   assertEquals( Apache Software Foundation, p.getOrganization().getName() );
  -assertEquals( http://jakarta.apache.org/;, p.getOrganization().getUrl() );
  +assertEquals( http://www.apache.org/;, p.getOrganization().getUrl() );
   
   //Test siteAddress / siteDirectory
   assertEquals( theSiteAddress, p.getSiteAddress());
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: maven/src/test/java/org/apache/maven/project ProjectInheritanceTest.java

2003-12-09 Thread dion 
dion2003/12/09 20:47:11

  Modified:src/test/java/org/apache/maven/project Tag: MAVEN-1_0-BRANCH
ProjectInheritanceTest.java
  Log:
  Project URL has changed to www.apache.org
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.40.4.2  +2 -1  
maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java
  
  Index: ProjectInheritanceTest.java
  ===
  RCS file: 
/home/cvs/maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java,v
  retrieving revision 1.40.4.1
  retrieving revision 1.40.4.2
  diff -u -r1.40.4.1 -r1.40.4.2
  --- ProjectInheritanceTest.java   26 Nov 2003 11:45:17 -  1.40.4.1
  +++ ProjectInheritanceTest.java   10 Dec 2003 04:47:11 -  1.40.4.2
  @@ -104,7 +104,7 @@
   assertEquals( Super Extendo, p.getName() );
   assertEquals( maven:super-extendo, p.getId() );
   assertEquals( Apache Software Foundation, p.getOrganization().getName() );
  -assertEquals( http://jakarta.apache.org/;, p.getOrganization().getUrl() );
  +assertEquals( http://www.apache.org/;, p.getOrganization().getUrl() );
   
   //Test siteAddress / siteDirectory
   assertEquals( theSiteAddress, p.getSiteAddress());
  @@ -134,6 +134,7 @@
   String iuSrc = p.getBuild().getIntegrationUnitTestSourceDirectory();
   assertTrue( Should be empty in maven's project descriptor: [ + iuSrc + 
],
   StringUtils.isEmpty( iuSrc ) );
  +
   // Unit Test patterns
   List unitTestIncludes = p.getBuild().getUnitTest().getIncludes();
   List unitTestExcludes = p.getBuild().getUnitTest().getExcludes();
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: maven/src/test/java/org/apache/maven/project ProjectInheritanceTest.java

2003-10-30 Thread brett 
brett   2003/10/30 03:46:31

  Modified:src/java/org/apache/maven Tag: MAVEN_RC2_UNSTABLE
AntProjectBuilder.java MavenSession.java
MavenUtils.java
   src/java/org/apache/maven/cli Tag: MAVEN_RC2_UNSTABLE
App.java
   src/java/org/apache/maven/jelly Tag: MAVEN_RC2_UNSTABLE
JellyUtils.java
   src/java/org/apache/maven/jelly/tags/jeez Tag:
MAVEN_RC2_UNSTABLE MavenJeezTagLibrary.java
   src/java/org/apache/maven/jelly/tags/maven Tag:
MAVEN_RC2_UNSTABLE AddPathTag.java MavenTag.java
ReactorTag.java WerkzDependencyResolver.java
   src/java/org/apache/maven/plugin Tag: MAVEN_RC2_UNSTABLE
PluginCacheManager.java PluginManager.java
   src/java/org/apache/maven/project Tag: MAVEN_RC2_UNSTABLE
Build.java Project.java Resource.java UnitTest.java
   src/test/java/org/apache/maven Tag: MAVEN_RC2_UNSTABLE
MavenUtilsTest.java
   src/test/java/org/apache/maven/plugin Tag:
MAVEN_RC2_UNSTABLE PluginCacheManagerTest.java
PluginManagerTest.java
   src/test/java/org/apache/maven/project Tag:
MAVEN_RC2_UNSTABLE ProjectInheritanceTest.java
  Added:   src/java/org/apache/maven/jelly/tags/werkz Tag:
MAVEN_RC2_UNSTABLE MavenGoalTag.java
   src/java/org/apache/maven/plugin Tag: MAVEN_RC2_UNSTABLE
GoalToJellyScriptHousingMapper.java
JellyPlugin.java JellyScriptHousing.java
PluginScriptParser.java
  Removed: src/java/org/apache/maven/jelly/tags/werkz Tag:
MAVEN_RC2_UNSTABLE LazyAttainGoalTag.java
  Log:
  PR: MAVEN-760
  PluginManager changes, and the flow on effects.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.6.2.1   +15 -9 maven/src/java/org/apache/maven/AntProjectBuilder.java
  
  
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/AntProjectBuilder.java.diff?r1=1.6r2=1.6.2.1
  
  
  1.18.2.1  +14 -99maven/src/java/org/apache/maven/MavenSession.java
  
  
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/MavenSession.java.diff?r1=1.18r2=1.18.2.1
  
  
  1.107.2.1 +99 -156   maven/src/java/org/apache/maven/MavenUtils.java
  
  
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/MavenUtils.java.diff?r1=1.107r2=1.107.2.1
  
  
  No   revision
  No   revision
  1.37.2.1  +2 -3  maven/src/java/org/apache/maven/cli/App.java
  
  
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/cli/App.java.diff?r1=1.37r2=1.37.2.1
  
  
  No   revision
  No   revision
  1.16.2.1  +3 -4  maven/src/java/org/apache/maven/jelly/JellyUtils.java
  
  
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/jelly/JellyUtils.java.diff?r1=1.16r2=1.16.2.1
  
  
  No   revision
  No   revision
  1.7.2.1   +6 -10 
maven/src/java/org/apache/maven/jelly/tags/jeez/MavenJeezTagLibrary.java
  
  
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/jelly/tags/jeez/MavenJeezTagLibrary.java.diff?r1=1.7r2=1.7.2.1
  
  
  No   revision
  No   revision
  1.13.2.1  +5 -4  maven/src/java/org/apache/maven/jelly/tags/maven/AddPathTag.java
  
  
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/jelly/tags/maven/AddPathTag.java.diff?r1=1.13r2=1.13.2.1
  
  
  1.11.2.1  +6 -5  maven/src/java/org/apache/maven/jelly/tags/maven/MavenTag.java
  
  
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/jelly/tags/maven/MavenTag.java.diff?r1=1.11r2=1.11.2.1
  
  
  1.36.2.1  +45 -88maven/src/java/org/apache/maven/jelly/tags/maven/ReactorTag.java
  
  
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/jelly/tags/maven/ReactorTag.java.diff?r1=1.36r2=1.36.2.1
  
  
  1.7.2.1   +2 -2  
maven/src/java/org/apache/maven/jelly/tags/maven/WerkzDependencyResolver.java
  
  
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/jelly/tags/maven/WerkzDependencyResolver.java.diff?r1=1.7r2=1.7.2.1
  
  
  No   revision
  No   revision
  1.2.2.1   +77 -110   
maven/src/java/org/apache/maven/jelly/tags/werkz/Attic/MavenGoalTag.java
  
  
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/jelly/tags/werkz/Attic/MavenGoalTag.java.diff?r1=1.2r2=1.2.2.1
  
  
  No   revision
  No   revision
  1.16.2.1  +167 -326  maven/src/java/org/apache/maven/plugin/PluginCacheManager.java

cvs commit: maven/src/test/java/org/apache/maven/project ProjectInheritanceTest.java

2003-09-11 Thread brett 
brett   2003/09/11 22:49:52

  Modified:src/test/java/org/apache/maven/project
ProjectInheritanceTest.java
  Log:
  CanonicalPath continues to wreak havoc on assertEquals
  
  Revision  ChangesPath
  1.39  +1 -3  
maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java
  
  Index: ProjectInheritanceTest.java
  ===
  RCS file: 
/home/cvs/maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- ProjectInheritanceTest.java   2 Sep 2003 12:55:12 -   1.38
  +++ ProjectInheritanceTest.java   12 Sep 2003 05:49:52 -  1.39
  @@ -121,10 +121,8 @@
   assertEquals( 1.4,
 ( (Dependency) p.getDependencies().get( 1 ) ).getVersion() );
   
  -baseDir = p.getContext().findVariable(basedir).toString();
  +baseDir = new 
File(p.getContext().findVariable(basedir).toString()).getCanonicalPath();
   // Test Source Directories
  -System.out.println(baseDir + FS + src + FS + java);
  -System.out.println(p.getBuild().getSourceDirectory());
   assertEquals( baseDir + FS + src + FS + java, 
p.getBuild().getSourceDirectory() );
   // Unit Test Source Directories
   assertEquals( baseDir + FS + src + FS + test + FS + java, 
p.getBuild().getUnitTestSourceDirectory() );
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: maven/src/test/java/org/apache/maven/project ProjectInheritanceTest.java

2003-08-29 Thread bwalding 
bwalding2003/08/28 16:32:05

  Modified:src/test/java/org/apache/maven/project
ProjectInheritanceTest.java
  Log:
  Remove redundant cast
  
  Revision  ChangesPath
  1.37  +1 -1  
maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java
  
  Index: ProjectInheritanceTest.java
  ===
  RCS file: 
/home/cvs/maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- ProjectInheritanceTest.java   19 Aug 2003 04:45:37 -  1.36
  +++ ProjectInheritanceTest.java   28 Aug 2003 23:32:05 -  1.37
  @@ -154,7 +154,7 @@
   assertEquals( MAVEN_1_0_B1, v0.getTag() );
   
   // Test the version map
  -Version v4 = (Version) p.getVersionById( b4 );
  +Version v4 = p.getVersionById( b4 );
   assertEquals( b4, v4.getId() );
   assertEquals( 1.0-b4, v4.getName() );
   assertEquals( MAVEN_1_0_B4, v4.getTag() );
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: maven/src/test/java/org/apache/maven/project ProjectInheritanceTest.java

2003-08-14 Thread dion 
dion2003/08/07 09:54:25

  Modified:src/test/java/org/apache/maven Tag: MAVEN_RC1_STABLE
MavenUtilsTest.java
   src/test/extend Tag: MAVEN_RC1_STABLE project-child.xml
   src/test/java/org/apache/maven/project Tag: MAVEN_RC1_STABLE
ProjectInheritanceTest.java
  Added:   src/test/java/org/apache/maven/util Tag: MAVEN_RC1_STABLE
MavenToolTest.java DVSLFormatterTest.java
DVSLPathToolTest.java StringToolTest.java
  Log:
  Update from back ported fixes
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.9.2.1   +5 -5  maven/src/test/java/org/apache/maven/MavenUtilsTest.java
  
  Index: MavenUtilsTest.java
  ===
  RCS file: /home/cvs/maven/src/test/java/org/apache/maven/MavenUtilsTest.java,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- MavenUtilsTest.java   13 Apr 2003 00:56:02 -  1.9
  +++ MavenUtilsTest.java   7 Aug 2003 16:54:25 -   1.9.2.1
  @@ -54,15 +54,15 @@
* http://www.apache.org/.
*/
   
  +import java.util.HashMap;
  +import java.util.Locale;
  +import java.util.Map;
  +import java.util.Properties;
  +
   import junit.framework.Test;
   import junit.framework.TestCase;
   import junit.framework.TestSuite;
   import org.apache.maven.jelly.MavenJellyContext;
  -
  -import java.util.HashMap;
  -import java.util.Map;
  -import java.util.Locale;
  -import java.util.Properties;
   
   public class MavenUtilsTest
   extends TestCase
  
  
  
  No   revision
  
  
  No   revision
  
  
  1.5.2.1   +1 -1  maven/src/test/extend/project-child.xml
  
  Index: project-child.xml
  ===
  RCS file: /home/cvs/maven/src/test/extend/project-child.xml,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- project-child.xml 25 Jul 2003 14:47:50 -  1.5
  +++ project-child.xml 7 Aug 2003 16:54:25 -   1.5.2.1
  @@ -17,7 +17,7 @@
 /dependencies
   
 build
  -  
  +
   unitTest
 includes
   include**/*Test*.java/include
  
  
  
  No   revision
  
  
  No   revision
  
  
  1.1.4.1   +2 -2  maven/src/test/java/org/apache/maven/util/MavenToolTest.java
  
  Index: MavenToolTest.java
  ===
  RCS file: /home/cvs/maven/src/test/java/org/apache/maven/util/MavenToolTest.java,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -r1.1 -r1.1.4.1
  --- MavenToolTest.java30 Jul 2003 00:50:37 -  1.1
  +++ MavenToolTest.java7 Aug 2003 16:54:25 -   1.1.4.1
  @@ -70,7 +70,7 @@
   {
   /** fragment to be resolved */
   private static final String NEEDLE =
  -org/apache/maven/MavenTool.java;
  +org/apache/maven/util/MavenTool.java;
   /** where to search for the fragment */
   private static final String[] HAYSTACK =
   {
  
  
  
  1.1.4.1   +0 -0  maven/src/test/java/org/apache/maven/util/DVSLFormatterTest.java
  
  Index: DVSLFormatterTest.java
  ===
  RCS file: 
/home/cvs/maven/src/test/java/org/apache/maven/util/DVSLFormatterTest.java,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -r1.1 -r1.1.4.1
  
  
  
  1.1.4.1   +2 -2  maven/src/test/java/org/apache/maven/util/DVSLPathToolTest.java
  
  Index: DVSLPathToolTest.java
  ===
  RCS file: /home/cvs/maven/src/test/java/org/apache/maven/util/DVSLPathToolTest.java,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -r1.1 -r1.1.4.1
  
  
  
  1.1.4.1   +0 -0  maven/src/test/java/org/apache/maven/util/StringToolTest.java
  
  Index: StringToolTest.java
  ===
  RCS file: /home/cvs/maven/src/test/java/org/apache/maven/util/StringToolTest.java,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -r1.1 -r1.1.4.1
  
  
  
  No   revision
  
  
  No   revision
  
  
  1.34.2.1  +1 -1  
maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java
  
  Index: ProjectInheritanceTest.java
  ===
  RCS file: 
/home/cvs/maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java,v
  retrieving revision 1.34
  retrieving revision 1.34.2.1
  diff -u -r1.34 -r1.34.2.1
  --- ProjectInheritanceTest.java   25 Jul 2003 14:56:16 -  1.34
  +++ ProjectInheritanceTest.java   7 Aug 2003 16:54:25 -   1.34.2.1
  @@ -121,7 +121,7

RE: cvs commit: maven/src/test/java/org/apache/maven/project ProjectInheritanceTest.java

2003-06-25 Thread Vincent Massol 


 -Original Message-
 From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
 Sent: 25 June 2003 03:02
 To: Maven Developers List
 Subject: Re: cvs commit: maven/src/test/java/org/apache/maven/project
 ProjectInheritanceTest.java
 
 I believe this is now fixed, and if someone can tell me how to stop
JUnit
 truncating messages like that..

Do you mean:

[snip]

  expected:.. but was:...test/extend/src/...

[snip]

?

I don't think you can turn that off. What it shows are the *differences*
between what is expected and what you pass to it. Previously it was
showing both full strings and you had to do the diff manually.

-Vincent


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: cvs commit: maven/src/test/java/org/apache/maven/project ProjectInheritanceTest.java

2003-06-24 Thread Incze Lajos 
On Tue, Jun 24, 2003 at 10:14:05PM +, [EMAIL PROTECTED] wrote:
 jvanzyl 2003/06/24 15:14:05
 
   Modified:src/test/java/org/apache/maven/project
 ProjectInheritanceTest.java
   Log:
   o Need to use basedir.

That's ok for this test case. But there are other points
where (as we don't have a strict convention) the
programmer works according to the one (src/java) or the
other (${basedir}/src/java) convention in her/his mind.

E.g. if you use this style, the checkstyle report will go
wrong, as it's stylesheet allways preprends with ${basedir}
what it finds in the sourceDirectory tag.

incze

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: maven/src/test/java/org/apache/maven/project ProjectInheritanceTest.java

2003-06-24 Thread jvanzyl 
jvanzyl 2003/06/24 16:58:25

  Modified:src/test/java/org/apache/maven/project
ProjectInheritanceTest.java
  Log:
  o Sorry 'bout that. Head down in refactoring.
  
  Revision  ChangesPath
  1.31  +4 -4  
maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java
  
  Index: ProjectInheritanceTest.java
  ===
  RCS file: 
/home/cvs/maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- ProjectInheritanceTest.java   24 Jun 2003 22:14:05 -  1.30
  +++ ProjectInheritanceTest.java   24 Jun 2003 23:58:25 -  1.31
  @@ -69,7 +69,7 @@
   private String TEST_DOCUMENT = null;
   private String TEST_DOCUMENT2 = null;
   private String basedir;
  -private String PS = System.getProperty( path.separator );
  +private String FS = System.getProperty( file.separator );
   
   public ProjectInheritanceTest( String testName )
   {
  @@ -121,15 +121,15 @@
 ( (Dependency) p.getDependencies().get( 1 ) ).getVersion() );
   
   // Test Source Directories
  -assertEquals( basedir + PS + src/java, p.getBuild().getSourceDirectory() 
);
  +assertEquals( basedir + FS + src/java, p.getBuild().getSourceDirectory() 
);
   // Unit Test Source Directories
  -assertEquals( basedir + PS + src/test/java, 
p.getBuild().getUnitTestSourceDirectory() );
  +assertEquals( basedir + FS + src/test/java, 
p.getBuild().getUnitTestSourceDirectory() );
   
   // Test Aspect Source Directories
   //assertEquals(src/aspect, p.getBuild().getAspectSourceDirectory());
   
   // Test Test Source Directories ;-)
  -assertEquals( basedir + PS + src/test/java, 
p.getBuild().getUnitTestSourceDirectory() );
  +assertEquals( basedir + FS + src/test/java, 
p.getBuild().getUnitTestSourceDirectory() );
   String iuSrc = p.getBuild().getIntegrationUnitTestSourceDirectory();
   assertTrue( Should be empty in maven's project descriptor: [ + iuSrc + 
],
   StringUtils.isEmpty( iuSrc ) );
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: maven/src/test/java/org/apache/maven/project ProjectInheritanceTest.java

2003-06-24 Thread dion 
dion2003/06/24 17:10:23

  Modified:src/test/java/org/apache/maven/project
ProjectInheritanceTest.java
  Log:
  Someone should compile stuff first
  
  Revision  ChangesPath
  1.32  +4 -4  
maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java
  
  Index: ProjectInheritanceTest.java
  ===
  RCS file: 
/home/cvs/maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- ProjectInheritanceTest.java   24 Jun 2003 23:58:25 -  1.31
  +++ ProjectInheritanceTest.java   25 Jun 2003 00:10:23 -  1.32
  @@ -68,7 +68,7 @@
   {
   private String TEST_DOCUMENT = null;
   private String TEST_DOCUMENT2 = null;
  -private String basedir;
  +private String baseDir;
   private String FS = System.getProperty( file.separator );
   
   public ProjectInheritanceTest( String testName )
  @@ -121,15 +121,15 @@
 ( (Dependency) p.getDependencies().get( 1 ) ).getVersion() );
   
   // Test Source Directories
  -assertEquals( basedir + FS + src/java, p.getBuild().getSourceDirectory() 
);
  +assertEquals( baseDir + FS + src/java, p.getBuild().getSourceDirectory() 
);
   // Unit Test Source Directories
  -assertEquals( basedir + FS + src/test/java, 
p.getBuild().getUnitTestSourceDirectory() );
  +assertEquals( baseDir + FS + src/test/java, 
p.getBuild().getUnitTestSourceDirectory() );
   
   // Test Aspect Source Directories
   //assertEquals(src/aspect, p.getBuild().getAspectSourceDirectory());
   
   // Test Test Source Directories ;-)
  -assertEquals( basedir + FS + src/test/java, 
p.getBuild().getUnitTestSourceDirectory() );
  +assertEquals( baseDir + FS + src/test/java, 
p.getBuild().getUnitTestSourceDirectory() );
   String iuSrc = p.getBuild().getIntegrationUnitTestSourceDirectory();
   assertTrue( Should be empty in maven's project descriptor: [ + iuSrc + 
],
   StringUtils.isEmpty( iuSrc ) );
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: maven/src/test/java/org/apache/maven/project ProjectInheritanceTest.java

2003-06-24 Thread dion 
dion2003/06/24 17:37:30

  Modified:src/test/java/org/apache/maven/project
ProjectInheritanceTest.java
  Log:
  Fix so that this works on windows and other operating systems.
  - the project.xml file has ${basedir}/src/java note the '/' used, it's not operating 
system dependent
  - the basedir being passed in is not the same as the one for the newly created 
project, as all projects have basedir set to the project.xml location by default.
  
  Revision  ChangesPath
  1.33  +2 -1  
maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java
  
  Index: ProjectInheritanceTest.java
  ===
  RCS file: 
/home/cvs/maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- ProjectInheritanceTest.java   25 Jun 2003 00:10:23 -  1.32
  +++ ProjectInheritanceTest.java   25 Jun 2003 00:37:30 -  1.33
  @@ -69,7 +69,7 @@
   private String TEST_DOCUMENT = null;
   private String TEST_DOCUMENT2 = null;
   private String baseDir;
  -private String FS = System.getProperty( file.separator );
  +private String FS = /; // note: same on windows and others 
   
   public ProjectInheritanceTest( String testName )
   {
  @@ -120,6 +120,7 @@
   assertEquals( 1.4-dev-8,
 ( (Dependency) p.getDependencies().get( 1 ) ).getVersion() );
   
  +baseDir = p.getContext().findVariable(basedir).toString();
   // Test Source Directories
   assertEquals( baseDir + FS + src/java, p.getBuild().getSourceDirectory() 
);
   // Unit Test Source Directories
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]