Browse Source

really remove Java7 and Java8 features

master
Stefan Bodewig 8 years ago
parent
commit
e95fe11095
2 changed files with 9 additions and 4 deletions
  1. +7
    -2
      src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
  2. +2
    -2
      src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java

+ 7
- 2
src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java View File

@@ -21,6 +21,7 @@ package org.apache.tools.ant.taskdefs.optional.junit;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FilenameFilter;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.FileWriter;
@@ -1755,7 +1756,7 @@ public class JUnitTask extends Task {
null,
getProject(),
path,
true)) {
true);
try {
loader.loadClass("junit.framework.Test");
return true;
@@ -1780,7 +1781,11 @@ public class JUnitTask extends Task {
for (String path : modulePath.list()) {
final File modulePathEntry = getProject().resolveFile(path);
if (modulePathEntry.isDirectory() && !hasModuleInfo(modulePathEntry)) {
final File[] modules = modulePathEntry.listFiles((dir,name)->name.toLowerCase(Locale.ENGLISH).endsWith(".jar"));
final File[] modules = modulePathEntry.listFiles(new FilenameFilter() {
public boolean accept(File dir, String name) {
return name.toLowerCase(Locale.ENGLISH).endsWith(".jar");
}
});
if (modules != null) {
for (File module : modules) {
expanded.add(new Path(getProject(), String.format(


+ 2
- 2
src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java View File

@@ -472,7 +472,7 @@ public class JUnitTaskTest {
assertNotNull(mockProcLauncher.cmd);
String resCp = null;
String resMp = null;
Set<String> resExports = new TreeSet<>();
Set<String> resExports = new TreeSet<String>();
for (int i = 1; i< mockProcLauncher.cmd.length; i++) {
if ("-classpath".equals(mockProcLauncher.cmd[i])) { //NOI18N
resCp = mockProcLauncher.cmd[++i];
@@ -526,7 +526,7 @@ public class JUnitTaskTest {
assertNotNull(mockProcLauncher.cmd);
String resCp = null;
String resMp = null;
Set<String> resExports = new TreeSet<>();
Set<String> resExports = new TreeSet<String>();
for (int i = 1; i< mockProcLauncher.cmd.length; i++) {
if ("-classpath".equals(mockProcLauncher.cmd[i])) { //NOI18N
resCp = mockProcLauncher.cmd[++i];


Loading…
Cancel
Save