1 files changed, 3 insertions, 19 deletions

diff --git a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/OrderingTest.java b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/OrderingTest.java
index 2f6b90efcf..298d480902 100644
--- a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/OrderingTest.java
+++ b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/OrderingTest.java
@@ -32,8 +32,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.jetty.util.resource.Resource;
-import org.eclipse.jetty.webapp.Ordering.AbsoluteOrdering;
-import org.eclipse.jetty.webapp.Ordering.RelativeOrdering;
 import org.junit.Test;
 
 /**
@@ -185,7 +183,6 @@ public class OrderingTest
     throws Exception
     {
         //Example from ServletSpec p.70
-        WebAppContext wac = new WebAppContext();
         MetaData metaData = new MetaData();
         List<Resource> resources = new ArrayList<Resource>();
         metaData._ordering = new RelativeOrdering(metaData);
@@ -279,7 +276,6 @@ public class OrderingTest
     throws Exception
     {
         List<Resource> resources = new ArrayList<Resource>();
-        WebAppContext wac = new WebAppContext();
         MetaData metaData = new MetaData();
         metaData._ordering = new RelativeOrdering(metaData);
 
@@ -364,7 +360,7 @@ public class OrderingTest
                              "BEFplainDC",
                              "EBFplainCD",
                              "EBFplainDC",
-                             "EBFDplain"};
+                             "EBFDplainC"};
 
         String orderedNames = "";
         for (Resource r:orderedList)
@@ -379,7 +375,6 @@ public class OrderingTest
     throws Exception
     {
         List<Resource> resources = new ArrayList<Resource>();
-        WebAppContext wac = new WebAppContext();
         MetaData metaData = new MetaData();
         metaData._ordering = new RelativeOrdering(metaData);
 
@@ -454,7 +449,6 @@ public class OrderingTest
     throws Exception
     {
         List<Resource> resources = new ArrayList<Resource>();
-        WebAppContext wac = new WebAppContext();
         MetaData metaData = new MetaData();
         metaData._ordering = new RelativeOrdering(metaData);
 
@@ -511,7 +505,7 @@ public class OrderingTest
         final MetaData metadata = new MetaData();
         final Resource jarResource = new TestResource("A");
 
-        metadata.setOrdering(new Ordering.RelativeOrdering(metadata));
+        metadata.setOrdering(new RelativeOrdering(metadata));
         metadata.addWebInfJar(jarResource);
         metadata.orderFragments();
         assertEquals(1, metadata.getOrderedWebInfJars().size());
@@ -529,7 +523,6 @@ public class OrderingTest
         //A: after B
         //B: after A
         List<Resource> resources = new ArrayList<Resource>();
-        WebAppContext wac = new WebAppContext();
         MetaData metaData = new MetaData();
         metaData._ordering = new RelativeOrdering(metaData);
 
@@ -559,7 +552,7 @@ public class OrderingTest
 
         try
         {
-            List<Resource> orderedList = metaData._ordering.order(resources);
+            metaData._ordering.order(resources);
             fail("No circularity detected");
         }
         catch (Exception e)
@@ -575,7 +568,6 @@ public class OrderingTest
     throws Exception
     {
         List<Resource> resources = new ArrayList<Resource>();
-        WebAppContext wac = new WebAppContext();
         MetaData metaData = new MetaData();
         metaData._ordering = new RelativeOrdering(metaData);
 
@@ -637,7 +629,6 @@ public class OrderingTest
         // A,B,C,others
         //
         List<Resource> resources = new ArrayList<Resource>();
-        WebAppContext wac = new WebAppContext();
         MetaData metaData = new MetaData();
         metaData._ordering = new AbsoluteOrdering(metaData);
         ((AbsoluteOrdering)metaData._ordering).add("A");
@@ -711,7 +702,6 @@ public class OrderingTest
         // C,B,A
         List<Resource> resources = new ArrayList<Resource>();
 
-        WebAppContext wac = new WebAppContext();
         MetaData metaData = new MetaData();
         metaData._ordering = new AbsoluteOrdering(metaData);
         ((AbsoluteOrdering)metaData._ordering).add("C");
@@ -783,7 +773,6 @@ public class OrderingTest
     {
         //empty <absolute-ordering>
 
-        WebAppContext wac = new WebAppContext();
         MetaData metaData = new MetaData();
         metaData._ordering = new AbsoluteOrdering(metaData);
         List<Resource> resources = new ArrayList<Resource>();
@@ -801,7 +790,6 @@ public class OrderingTest
     {
         //B,A,C other jars with no fragments
         List<Resource> resources = new ArrayList<Resource>();
-        WebAppContext wac = new WebAppContext();
         MetaData metaData = new MetaData();
         metaData._ordering = new RelativeOrdering(metaData);
 
@@ -867,7 +855,6 @@ public class OrderingTest
     {
         //web.xml has no ordering, jar A has fragment after others, jar B is plain, jar C is plain
         List<Resource> resources = new ArrayList<Resource>();
-        WebAppContext wac = new WebAppContext();
         MetaData metaData = new MetaData();
         metaData._ordering = new RelativeOrdering(metaData);
         
@@ -907,7 +894,6 @@ public class OrderingTest
         // A,B,C,others
         //
         List<Resource> resources = new ArrayList<Resource>();
-        WebAppContext wac = new WebAppContext();
         MetaData metaData = new MetaData();
         metaData._ordering = new AbsoluteOrdering(metaData);
         ((AbsoluteOrdering)metaData._ordering).add("A");
@@ -981,8 +967,6 @@ public class OrderingTest
             fail("No outcome matched "+result);
     }
 
-
-
     public boolean checkResult (String result, String[] outcomes)
     {
         boolean matched = false;