Merge lp:~james-page/ubuntu/oneiric/testng/fix-ftbfs into lp:ubuntu/oneiric/testng

[James Page]

[Matthias Klose (doko)]

thanks, looks fine!

review: Approve

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2010-08-16 10:52:51 +0000
+++ .pc/applied-patches	2011-09-20 11:36:30 +0000
@@ -6,3 +6,4 @@
 features/qdox-1.9.diff
 features/scope-qdox-bsh.diff
 features/threadsafe-collections-in-tests.diff
+debian/junitconvertor-test-fix.diff

=== added directory '.pc/debian/junitconvertor-test-fix.diff'
=== added directory '.pc/debian/junitconvertor-test-fix.diff/test'
=== added directory '.pc/debian/junitconvertor-test-fix.diff/test/src'
=== added directory '.pc/debian/junitconvertor-test-fix.diff/test/src/test'
=== added directory '.pc/debian/junitconvertor-test-fix.diff/test/src/test/converter'
=== added file '.pc/debian/junitconvertor-test-fix.diff/test/src/test/converter/JUnitConverterTest.java'
--- .pc/debian/junitconvertor-test-fix.diff/test/src/test/converter/JUnitConverterTest.java	1970-01-01 00:00:00 +0000
+++ .pc/debian/junitconvertor-test-fix.diff/test/src/test/converter/JUnitConverterTest.java	2011-09-20 11:36:30 +0000
@@ -0,0 +1,130 @@
+package test.converter;
+
+import org.testng.Assert;
+import org.testng.JUnitConverter;
+import org.testng.annotations.Test;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Pattern;
+
+public class JUnitConverterTest {
+  
+  /**
+   * 
+   * @param fileName The filename to parse
+   * @param regexp The regular expression
+   * @param resultLines An out parameter that will contain all the lines
+   * that matched the regexp
+   * @return A List<Integer> containing the lines of all the matches
+   * 
+   * Note that the size() of the returned valuewill always be equal to 
+   * result.size() at the end of this function.
+   */
+  static public List grep(File fileName, String regexp, List resultLines) {
+    List resultLineNumbers = new ArrayList();
+    try {
+      BufferedReader fr = new BufferedReader(new FileReader(fileName));
+      String line = fr.readLine();
+      int currentLine = 0;
+      Pattern p = Pattern.compile(".*" + regexp + ".*");
+      
+      while (null != line) {
+//        ppp("COMPARING " + p + " TO @@@" + line + "@@@");
+         if (p.matcher(line).matches()) {
+           resultLines.add(line);
+           resultLineNumbers.add(currentLine);
+         }
+         
+         line = fr.readLine();
+         currentLine++;
+      }
+    }
+    catch (FileNotFoundException e) {
+      e.printStackTrace();
+    }
+    catch (IOException e) {
+      e.printStackTrace();
+    }
+    
+    return resultLineNumbers;
+    
+  }
+  
+  public static void ppp(String s) {
+    System.out.println("[JUnitConverterTest] " + s);
+  }
+  
+  /**
+   * @param fileName
+   * @param tag
+   * @param annotationType
+   * @param expected A list of line numbers where the tag is expected
+   * to be present
+   */
+  private void runTest(File sourceDir, String packageName, String fileName, String tag, 
+      String annotationType, List expected) 
+  {
+    String outputDir = System.getProperty("java.io.tmpdir");
+    String packageDir = packageName.replace('.', File.separatorChar);
+    List args = new ArrayList();
+    args.add("-quiet");
+    args.add(annotationType);
+    args.add("-srcdir");
+    args.add(sourceDir.getAbsolutePath());
+    args.add("-d");
+    args.add(outputDir);
+    String[] argv = (String[]) args.toArray(new String[args.size()]);
+    JUnitConverter.main(argv);
+    
+    List resultLines = new ArrayList();
+    File file = new File(outputDir, packageDir + File.separatorChar + fileName);
+    List actualLineNumbers = grep(file, tag, resultLines);
+    Assert.assertEquals(actualLineNumbers, expected, file + "\n    tag:" + tag);
+    
+  }
+  
+  private void runJavaDocTest(File sourcePath, String pkg, String fileName, List[] expected) {
+    runTest(sourcePath, pkg, fileName, "@testng.test", "-javadoc", expected[0]);
+    runTest(sourcePath, pkg, fileName, "@testng.before-method", "-javadoc", expected[1]);
+    runTest(sourcePath, pkg, fileName, "@testng.after-method", "-javadoc", expected[2]);
+  }
+
+  private void runAnnotationTest(File sourcePath, String pkg, String fileName, List[] expected) {
+    runTest(sourcePath, pkg, fileName, "@Test", "-annotation", expected[0]);
+    runTest(sourcePath, pkg, fileName, "@BeforeMethod", "-annotation", expected[1]);
+    runTest(sourcePath, pkg, fileName, "@AfterMethod", "-annotation", expected[2]);
+  }
+
+  @Test(parameters = { "source-directory" })
+  public void testAnnotations(String dir) {
+    runAnnotationTest(new File(dir),  "test.converter", "ConverterSample1.java", 
+        new List[] { Arrays.asList(23, 30, 35), Arrays.asList(9), Arrays.asList(18) });
+  }
+  
+  @Test(parameters = { "source-directory" })
+  public void testAnnotationsNoPackage(String dir) {
+    runAnnotationTest(new File(dir, "../../.."),  "", "ConverterSample2.java", 
+        new List[] { Arrays.asList(23, 30, 35), Arrays.asList(9), Arrays.asList(18) });
+  }
+  
+  @Test(parameters = { "source-directory" })
+  public void testJavaDoc(String dir) {
+    runJavaDocTest(new File(dir),  "test.converter", "ConverterSample1.java", 
+        new List[] { Arrays.asList(25, 34, 41), Arrays.asList(7), Arrays.asList(18) });
+  }
+
+  @Test(parameters = { "source-directory" })
+  public void testJavaDocNoPackage(String dir) {
+    runJavaDocTest(new File(dir, "../../.."),  "", "ConverterSample2.java",
+        new List[] { Arrays.asList(25, 34, 41), Arrays.asList(7), Arrays.asList(18) });
+  }
+
+  
+}

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-12 09:09:59 +0000
+++ debian/changelog	2011-09-20 11:36:30 +0000
@@ -1,3 +1,12 @@
+testng (5.11+dfsg-2ubuntu2) oneiric; urgency=low
+
+  * Fix FTBFS (LP: #829508):
+    - d/patches/debian/junitconvertor-test-fix.diff: Switch from use of 
+      deprecated parameters attribute in @Test to using @Parameters to 
+      ensure that JUnitConvertor Test passes.
+
+ -- James Page <[e-mail]>  Tue, 20 Sep 2011 12:15:27 +0100
+
 testng (5.11+dfsg-2ubuntu1) natty; urgency=low
 
   * debian/rules: updated to use ant-nodeps to fix FTBFS (LP: #674382)

=== modified file 'debian/control'
--- debian/control	2010-11-12 09:09:59 +0000
+++ debian/control	2011-09-20 11:36:30 +0000
@@ -1,7 +1,8 @@
 Source: testng
 Section: java
 Priority: optional
-Maintainer: Marcus Better <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Marcus Better <[e-mail]>
 Build-Depends: debhelper (>= 7.3.5), ant
 Build-Depends-Indep: default-jdk, ant-optional, junit, bsh, libqdox-java (>= 1.9), libbackport-util-concurrent-java, maven-repo-helper
 Standards-Version: 3.8.4

=== added file 'debian/patches/debian/junitconvertor-test-fix.diff'
--- debian/patches/debian/junitconvertor-test-fix.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/debian/junitconvertor-test-fix.diff	2011-09-20 11:36:30 +0000
@@ -0,0 +1,52 @@
+Description: Switches JUnitConverter test to use Parameters annotation to 
+ pickup source-directory for tests.  This resolves a FTBFS seen in Ubuntu
+ Oneiric but not in earlier releases and is present in the upstream release
+ as well went build on Oneiric
+ .
+ This test is no longer executed in the next release of testng so not
+ forwarding upstream. 
+Author: James Page <[e-mail]>
+Forwarded: not-needed
+
+Index: testng/test/src/test/converter/JUnitConverterTest.java
+===================================================================
+--- testng.orig/test/src/test/converter/JUnitConverterTest.java	2011-09-20 08:49:59.668342142 +0100
++++ testng/test/src/test/converter/JUnitConverterTest.java	2011-09-20 08:51:09.178496996 +0100
+@@ -3,6 +3,7 @@
+ import org.testng.Assert;
+ import org.testng.JUnitConverter;
+ import org.testng.annotations.Test;
++import org.testng.annotations.Parameters;
+ 
+ import java.io.BufferedReader;
+ import java.io.File;
+@@ -102,25 +103,25 @@
+     runTest(sourcePath, pkg, fileName, "@AfterMethod", "-annotation", expected[2]);
+   }
+ 
+-  @Test(parameters = { "source-directory" })
++  @Parameters({ "source-directory" })
+   public void testAnnotations(String dir) {
+     runAnnotationTest(new File(dir),  "test.converter", "ConverterSample1.java", 
+         new List[] { Arrays.asList(23, 30, 35), Arrays.asList(9), Arrays.asList(18) });
+   }
+   
+-  @Test(parameters = { "source-directory" })
++  @Parameters({ "source-directory" })
+   public void testAnnotationsNoPackage(String dir) {
+     runAnnotationTest(new File(dir, "../../.."),  "", "ConverterSample2.java", 
+         new List[] { Arrays.asList(23, 30, 35), Arrays.asList(9), Arrays.asList(18) });
+   }
+   
+-  @Test(parameters = { "source-directory" })
++  @Parameters({ "source-directory" })
+   public void testJavaDoc(String dir) {
+     runJavaDocTest(new File(dir),  "test.converter", "ConverterSample1.java", 
+         new List[] { Arrays.asList(25, 34, 41), Arrays.asList(7), Arrays.asList(18) });
+   }
+ 
+-  @Test(parameters = { "source-directory" })
++  @Parameters({ "source-directory" })
+   public void testJavaDocNoPackage(String dir) {
+     runJavaDocTest(new File(dir, "../../.."),  "", "ConverterSample2.java",
+         new List[] { Arrays.asList(25, 34, 41), Arrays.asList(7), Arrays.asList(18) });

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-08-16 10:52:51 +0000
+++ debian/patches/series	2011-09-20 11:36:30 +0000
@@ -6,3 +6,4 @@
 features/qdox-1.9.diff -p1
 features/scope-qdox-bsh.diff -p1
 features/threadsafe-collections-in-tests.diff -p1
+debian/junitconvertor-test-fix.diff

=== modified file 'test/src/test/converter/JUnitConverterTest.java'
--- test/src/test/converter/JUnitConverterTest.java	2009-05-04 10:47:43 +0000
+++ test/src/test/converter/JUnitConverterTest.java	2011-09-20 11:36:30 +0000
@@ -3,6 +3,7 @@
 import org.testng.Assert;
 import org.testng.JUnitConverter;
 import org.testng.annotations.Test;
+import org.testng.annotations.Parameters;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -102,25 +103,25 @@
     runTest(sourcePath, pkg, fileName, "@AfterMethod", "-annotation", expected[2]);
   }
 
-  @Test(parameters = { "source-directory" })
+  @Parameters({ "source-directory" })
   public void testAnnotations(String dir) {
     runAnnotationTest(new File(dir),  "test.converter", "ConverterSample1.java", 
         new List[] { Arrays.asList(23, 30, 35), Arrays.asList(9), Arrays.asList(18) });
   }
   
-  @Test(parameters = { "source-directory" })
+  @Parameters({ "source-directory" })
   public void testAnnotationsNoPackage(String dir) {
     runAnnotationTest(new File(dir, "../../.."),  "", "ConverterSample2.java", 
         new List[] { Arrays.asList(23, 30, 35), Arrays.asList(9), Arrays.asList(18) });
   }
   
-  @Test(parameters = { "source-directory" })
+  @Parameters({ "source-directory" })
   public void testJavaDoc(String dir) {
     runJavaDocTest(new File(dir),  "test.converter", "ConverterSample1.java", 
         new List[] { Arrays.asList(25, 34, 41), Arrays.asList(7), Arrays.asList(18) });
   }
 
-  @Test(parameters = { "source-directory" })
+  @Parameters({ "source-directory" })
   public void testJavaDocNoPackage(String dir) {
     runJavaDocTest(new File(dir, "../../.."),  "", "ConverterSample2.java",
         new List[] { Arrays.asList(25, 34, 41), Arrays.asList(7), Arrays.asList(18) });