提交 5ede2ec4 编写于 作者: K kohsuke

tab -> WS

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@21262 71c3de6d-444a-0410-be80-ed276b4c234a
上级 5bcdc23d
......@@ -25,32 +25,19 @@ package org.jvnet.hudson.test;
import hudson.FilePath;
import hudson.Launcher;
import hudson.model.User;
import hudson.model.AbstractBuild;
import hudson.model.BuildListener;
import hudson.scm.ChangeLogParser;
import hudson.scm.NullSCM;
import hudson.scm.SCM;
import hudson.scm.ChangeLogSet;
import hudson.scm.ChangeLogParser;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.io.FileOutputStream;
import java.io.PrintStream;
import java.io.IOException;
import java.io.PrintStream;
import java.net.URL;
import java.util.zip.ZipInputStream;
import java.util.zip.ZipEntry;
import java.util.List;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import org.apache.commons.digester.Digester;
import org.kohsuke.stapler.export.ExportedBean;
import org.kohsuke.stapler.export.Exported;
import org.xml.sax.SAXException;
import java.util.zip.ZipInputStream;
/**
* {@link SCM} useful for testing that extracts the given resource as a zip file.
......@@ -62,7 +49,7 @@ public class ExtractResourceWithChangesSCM extends NullSCM {
private final URL secondZip;
public ExtractResourceWithChangesSCM(URL firstZip, URL secondZip) {
if ((firstZip==null) || (secondZip==null))
if ((firstZip == null) || (secondZip == null))
throw new IllegalArgumentException();
this.firstZip = firstZip;
this.secondZip = secondZip;
......@@ -74,9 +61,9 @@ public class ExtractResourceWithChangesSCM extends NullSCM {
listener.getLogger().println("Deleting existing workspace " + workspace.getRemote());
workspace.deleteRecursive();
}
listener.getLogger().println("Staging first zip: "+firstZip);
listener.getLogger().println("Staging first zip: " + firstZip);
workspace.unzipFrom(firstZip.openStream());
listener.getLogger().println("Staging second zip: "+secondZip);
listener.getLogger().println("Staging second zip: " + secondZip);
workspace.unzipFrom(secondZip.openStream());
// Get list of files changed in secondZip.
......@@ -85,7 +72,7 @@ public class ExtractResourceWithChangesSCM extends NullSCM {
ExtractChangeLogParser.ExtractChangeLogEntry changeLog = new ExtractChangeLogParser.ExtractChangeLogEntry(secondZip.toString());
try {
while ((e=zip.getNextEntry())!=null) {
while ((e = zip.getNextEntry()) != null) {
if (!e.isDirectory())
changeLog.addFile(new ExtractChangeLogParser.FileInZip(e.getName()));
}
......@@ -160,7 +147,4 @@ public class ExtractResourceWithChangesSCM extends NullSCM {
stream.close();
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册