mbenson     2005/03/07 13:05:17

  Modified:    src/testcases/org/apache/tools/ant/types/optional/depend
                        Tag: ANT_16_BRANCH ClassFileSetTest.java
  Log:
  Sync
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.6.2.5   +18 -18    
ant/src/testcases/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java
  
  Index: ClassFileSetTest.java
  ===================================================================
  RCS file: 
/home/cvs/ant/src/testcases/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java,v
  retrieving revision 1.6.2.4
  retrieving revision 1.6.2.5
  diff -u -r1.6.2.4 -r1.6.2.5
  --- ClassFileSetTest.java     9 Mar 2004 17:02:08 -0000       1.6.2.4
  +++ ClassFileSetTest.java     7 Mar 2005 21:05:17 -0000       1.6.2.5
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2001-2004 The Apache Software Foundation
  + * Copyright  2001-2005 The Apache Software Foundation
    *
    *  Licensed under the Apache License, Version 2.0 (the "License");
    *  you may not use this file except in compliance with the License.
  @@ -50,13 +50,13 @@
       }
   
       /**
  -     * Test basic clasfileset
  +     * Test basic classfileset
        */
       public void testBasicSet() {
  -        Project project = getProject();
  +        Project p = getProject();
           executeTarget("testbasicset");
  -        FileSet resultFileSet = 
(FileSet)project.getReference(RESULT_FILESET);
  -        DirectoryScanner scanner = 
resultFileSet.getDirectoryScanner(project);
  +        FileSet resultFileSet = (FileSet)p.getReference(RESULT_FILESET);
  +        DirectoryScanner scanner = resultFileSet.getDirectoryScanner(p);
           String[] scannedFiles = scanner.getIncludedFiles();
           Hashtable files = new Hashtable();
           for (int i = 0; i < scannedFiles.length; ++i) {
  @@ -78,10 +78,10 @@
        * Test small classfileset
        */
       public void testSmallSet() {
  -        Project project = getProject();
  +        Project p = getProject();
           executeTarget("testsmallset");
  -        FileSet resultFileSet = 
(FileSet)project.getReference(RESULT_FILESET);
  -        DirectoryScanner scanner = 
resultFileSet.getDirectoryScanner(project);
  +        FileSet resultFileSet = (FileSet)p.getReference(RESULT_FILESET);
  +        DirectoryScanner scanner = resultFileSet.getDirectoryScanner(p);
           String[] scannedFiles = scanner.getIncludedFiles();
           Hashtable files = new Hashtable();
           for (int i = 0; i < scannedFiles.length; ++i) {
  @@ -96,13 +96,13 @@
       }
   
       /**
  -     * Test conbo classfileset
  +     * Test combo classfileset
        */
       public void testComboSet() {
  -        Project project = getProject();
  +        Project p = getProject();
           executeTarget("testcomboset");
  -        FileSet resultFileSet = 
(FileSet)project.getReference(RESULT_FILESET);
  -        DirectoryScanner scanner = 
resultFileSet.getDirectoryScanner(project);
  +        FileSet resultFileSet = (FileSet)p.getReference(RESULT_FILESET);
  +        DirectoryScanner scanner = resultFileSet.getDirectoryScanner(p);
           String[] scannedFiles = scanner.getIncludedFiles();
           Hashtable files = new Hashtable();
           for (int i = 0; i < scannedFiles.length; ++i) {
  @@ -125,10 +125,10 @@
        * Test that classes included in a method 
"System.out.println(MyClass.class)" are included.
        */
       public void testMethodParam() {
  -        Project project = getProject();
  +        Project p = getProject();
           executeTarget("testmethodparam");
  -        FileSet resultFileSet = 
(FileSet)project.getReference(RESULT_FILESET);
  -        DirectoryScanner scanner = 
resultFileSet.getDirectoryScanner(project);
  +        FileSet resultFileSet = (FileSet)p.getReference(RESULT_FILESET);
  +        DirectoryScanner scanner = resultFileSet.getDirectoryScanner(p);
           String[] scannedFiles = scanner.getIncludedFiles();
           Hashtable files = new Hashtable();
           for (int i = 0; i < scannedFiles.length; ++i) {
  @@ -152,10 +152,10 @@
        * Test that classes included in a method 
"System.out.println(Outer.Inner.class)" are included.
        */
       public void testMethodParamInner() {
  -        Project project = getProject();
  +        Project p = getProject();
           executeTarget("testmethodparaminner");
  -        FileSet resultFileSet = 
(FileSet)project.getReference(RESULT_FILESET);
  -        DirectoryScanner scanner = 
resultFileSet.getDirectoryScanner(project);
  +        FileSet resultFileSet = (FileSet)p.getReference(RESULT_FILESET);
  +        DirectoryScanner scanner = resultFileSet.getDirectoryScanner(p);
           String[] scannedFiles = scanner.getIncludedFiles();
           Hashtable files = new Hashtable();
           for (int i = 0; i < scannedFiles.length; ++i) {
  
  
  

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

Reply via email to