Browse Source

Tidy up the code

master
Gintas Grigelionis 7 years ago
parent
commit
22a05c5baf
7 changed files with 3 additions and 8 deletions
  1. +0
    -2
      src/tests/junit/org/apache/tools/ant/taskdefs/ExecStreamRedirectorTest.java
  2. +1
    -1
      src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java
  3. +0
    -1
      src/tests/junit/org/apache/tools/ant/taskdefs/FilterTest.java
  4. +0
    -1
      src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
  5. +1
    -1
      src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
  6. +1
    -1
      src/tests/junit/org/apache/tools/ant/types/ResourceOutputTest.java
  7. +0
    -1
      src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java

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

@@ -1,8 +1,6 @@
package org.apache.tools.ant.taskdefs; package org.apache.tools.ant.taskdefs;


import org.apache.tools.ant.BuildFileRule; import org.apache.tools.ant.BuildFileRule;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.ProjectHelper;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;


+ 1
- 1
src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java View File

@@ -74,7 +74,7 @@ public class ExecuteWatchdogTest {
return Runtime.getRuntime().exec(cmdArray); return Runtime.getRuntime().exec(cmdArray);
} }


private String getErrorOutput(Process p) throws Exception {
private String getErrorOutput(Process p) {
BufferedReader err = new BufferedReader(new InputStreamReader(p.getErrorStream())); BufferedReader err = new BufferedReader(new InputStreamReader(p.getErrorStream()));
return err.lines().collect(Collectors.joining()); return err.lines().collect(Collectors.joining());
} }


+ 0
- 1
src/tests/junit/org/apache/tools/ant/taskdefs/FilterTest.java View File

@@ -31,7 +31,6 @@ import org.junit.Rule;
import org.junit.Test; import org.junit.Test;


import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;




+ 0
- 1
src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java View File

@@ -25,7 +25,6 @@ import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.IOException; import java.io.IOException;
import java.util.Collections; import java.util.Collections;
import java.util.Enumeration;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipFile; import java.util.zip.ZipFile;




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

@@ -585,7 +585,7 @@ public class JUnitTaskTest {
} }


@Test @Test
public void testCheckDuplicateAntJar() throws Exception {
public void testCheckDuplicateAntJar() {
setupCheckDuplicateTest(); setupCheckDuplicateTest();
buildRule.executeTarget("testCheckForkedPath"); buildRule.executeTarget("testCheckForkedPath");
assertThat("Expecting the warning about the duplicate ant jar", buildRule.getLog(), assertThat("Expecting the warning about the duplicate ant jar", buildRule.getLog(),


+ 1
- 1
src/tests/junit/org/apache/tools/ant/types/ResourceOutputTest.java View File

@@ -110,7 +110,7 @@ public class ResourceOutputTest {
} }


@Test @Test
public void testpropertyoutput3() throws IOException {
public void testpropertyoutput3() {
project.setNewProperty("bar", "bar"); project.setNewProperty("bar", "bar");
assertEquals("bar", project.getProperty("bar")); assertEquals("bar", project.getProperty("bar"));
} }


+ 0
- 1
src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java View File

@@ -23,7 +23,6 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Collections; import java.util.Collections;
import java.util.Enumeration;
import java.util.zip.CRC32; import java.util.zip.CRC32;
import org.junit.Test; import org.junit.Test;




Loading…
Cancel
Save