Merge pull request #661 from hansjoachim/issues

Issues
unclebob · Mar 1, 2015 · aba3085 · aba3085
2 parents fb6c4e1 + cd3812c
commit aba3085
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 19 deletions.
diff --git a/src/fitnesse/responders/MockWikiImporter.java b/src/fitnesse/responders/MockWikiImporter.java
@@ -4,7 +4,6 @@
 
 import java.util.Iterator;
 
-import fitnesse.wiki.PageCrawler;
 import fitnesse.wiki.PageData;
 import fitnesse.wiki.WikiPage;
 

diff --git a/src/fitnesse/responders/refactoring/MovePageResponder.java b/src/fitnesse/responders/refactoring/MovePageResponder.java
@@ -4,7 +4,6 @@
 
 
 import fitnesse.FitNesseContext;
-import fitnesse.authentication.SecureResponder;
 import fitnesse.wiki.refactoring.MovedPageReferenceRenamer;
 import fitnesse.wiki.refactoring.ReferenceRenamer;
 import fitnesse.http.Request;

diff --git a/src/fitnesse/slim/SlimServer.java b/src/fitnesse/slim/SlimServer.java
@@ -6,11 +6,7 @@
 import fitnesse.slim.protocol.SlimSerializer;
 import fitnesse.socketservice.SocketFactory;
 import fitnesse.socketservice.SocketServer;
-import util.StreamReader;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.Socket;

diff --git a/src/fitnesse/testrunner/PageListSetUpTearDownSurrounder.java b/src/fitnesse/testrunner/PageListSetUpTearDownSurrounder.java
@@ -20,21 +20,21 @@ public PageListSetUpTearDownSurrounder(WikiPage root) {
   }
 
   public List<WikiPage> surroundGroupsOfTestPagesWithRespectiveSetUpAndTearDowns(List<WikiPage> pageList) {
-    Map<String, LinkedList<WikiPage>> pageSetUpTearDownGroups = createPageSetUpTearDownGroups(pageList);
+    Map<String, List<WikiPage>> pageSetUpTearDownGroups = createPageSetUpTearDownGroups(pageList);
     return reinsertPagesViaSetUpTearDownGroups(pageSetUpTearDownGroups);
   }
 
-  private Map<String, LinkedList<WikiPage>> createPageSetUpTearDownGroups(List<WikiPage> pageList) {
-    Map<String, LinkedList<WikiPage>> pageSetUpTearDownGroups = new HashMap<String, LinkedList<WikiPage>>();
+  private Map<String, List<WikiPage>> createPageSetUpTearDownGroups(List<WikiPage> pageList) {
+    Map<String, List<WikiPage>> pageSetUpTearDownGroups = new HashMap<String, List<WikiPage>>();
     for (WikiPage page : pageList) {
       makeSetUpTearDownPageGroupForPage(page, pageSetUpTearDownGroups);
     }
     return pageSetUpTearDownGroups;
   }
 
-  private void makeSetUpTearDownPageGroupForPage(WikiPage page, Map<String, LinkedList<WikiPage>> pageSetUpTearDownGroups) {
+  private void makeSetUpTearDownPageGroupForPage(WikiPage page, Map<String, List<WikiPage>> pageSetUpTearDownGroups) {
     String group = getSetUpTearDownGroup(page);
-    LinkedList<WikiPage> pageGroup;
+    List<WikiPage> pageGroup;
     if (pageSetUpTearDownGroups.get(group) != null) {
       pageGroup = pageSetUpTearDownGroups.get(group);
       pageGroup.add(page);
@@ -59,15 +59,15 @@ private String getPathForSetUpTearDown(WikiPage page, String setUpTearDownName)
     return path;
   }
 
-  private List<WikiPage> reinsertPagesViaSetUpTearDownGroups(Map<String, LinkedList<WikiPage>> pageSetUpTearDownGroups) {
+  private List<WikiPage> reinsertPagesViaSetUpTearDownGroups(Map<String, List<WikiPage>> pageSetUpTearDownGroups) {
     List<WikiPage> pageList = new LinkedList<WikiPage>();
-    for (Map.Entry<String, LinkedList<WikiPage>> entry : pageSetUpTearDownGroups.entrySet()) {
+    for (Map.Entry<String, List<WikiPage>> entry : pageSetUpTearDownGroups.entrySet()) {
       pageList.addAll(insertSetUpTearDownPageGroup(entry.getKey(), entry.getValue()));
     }
     return pageList;
   }
 
-  private List<WikiPage> insertSetUpTearDownPageGroup(String setUpAndTearDownGroupKey, LinkedList<WikiPage> pageGroup) {
+  private List<WikiPage> insertSetUpTearDownPageGroup(String setUpAndTearDownGroupKey, List<WikiPage> pageGroup) {
     List<WikiPage> pageList = new LinkedList<WikiPage>();
     pageList.addAll(setUpForThisGroup(setUpAndTearDownGroupKey));
     pageList.addAll(pageGroup);
@@ -76,7 +76,6 @@ private List<WikiPage> insertSetUpTearDownPageGroup(String setUpAndTearDownGroup
   }
 
   private List<WikiPage> setUpForThisGroup(String setUpAndTearDown) {
-
     String setUpPath = setUpAndTearDown.split(",")[0];
     WikiPage setUpPage = root.getPageCrawler().getPage(PathParser.parse(setUpPath));
     return setUpPage != null ? asList(setUpPage) : Collections.<WikiPage>emptyList();

diff --git a/src/fitnesse/testsystems/slim/SlimCommandRunningClient.java b/src/fitnesse/testsystems/slim/SlimCommandRunningClient.java
@@ -12,9 +12,7 @@
 import fitnesse.socketservice.SocketFactory;
 import fitnesse.testsystems.CommandRunner;
 import org.apache.commons.lang.ArrayUtils;
-import util.StreamReader;
 
-import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.Socket;

diff --git a/src/fitnesse/wikitext/parser/WikiWordBuilder.java b/src/fitnesse/wikitext/parser/WikiWordBuilder.java
@@ -1,7 +1,6 @@
 package fitnesse.wikitext.parser;
 
 import fitnesse.html.HtmlTag;
-import fitnesse.wiki.PageCrawler;
 import fitnesse.wiki.PathParser;
 import fitnesse.wiki.WikiPage;
 import org.apache.commons.lang.StringUtils;

diff --git a/test/fitnesse/reporting/TestTextFormatterTest.java b/test/fitnesse/reporting/TestTextFormatterTest.java
@@ -45,6 +45,7 @@ public void testCompleteShouldAddPageAndSummaryAndTimingToResponse() throws Exce
     formatter.testStarted(page);
     clock.elapse(9800);
     formatter.testComplete(page, summary);
+    formatter.close();
     verify(response).add("F " + START_TIME + " R:1    W:2    I:3    E:4    page\t()\t9" + getDecimalSeparator() + "800 seconds\n");
   }
 

diff --git a/test/fitnesse/testrunner/WikiPageDescriptor.java b/test/fitnesse/testrunner/WikiPageDescriptor.java
@@ -3,7 +3,6 @@
 import fitnesse.testsystems.ClassPath;
 import fitnesse.testsystems.CompositeExecutionLogListener;
 import fitnesse.testsystems.Descriptor;
-import fitnesse.testsystems.ExecutionLogListener;
 import fitnesse.wiki.WikiPage;
 
 /**