svn commit: r920588 - /shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTest.java

[jo...@apache.org]

Author: johnh
Date: Tue Mar  9 00:26:38 2010
New Revision: 920588

URL: http://svn.apache.org/viewvc?rev=920588&view=rev
Log:
Hopefully-last test helper.


Modified:
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTest.java

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTest.java?rev=920588&r1=920587&r2=920588&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTest.java Tue Mar  9 00:26:38 2010
@@ -25,29 +25,18 @@
 import static org.easymock.classextension.EasyMock.verify;
 
 import com.google.common.collect.Lists;
-import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.name.Names;
-import com.google.inject.util.Modules;
 
-import org.apache.shindig.common.uri.Uri;
 import org.apache.shindig.gadgets.Gadget;
-import org.apache.shindig.gadgets.spec.GadgetSpec;
-import org.apache.shindig.gadgets.parse.ParseModule;
 import org.apache.shindig.gadgets.rewrite.MutableContent;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import org.w3c.dom.Document;
-import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Node;
 
 import java.util.List;
 
-public class DomWalkerTest {
-  private Document doc;
+public class DomWalkerTest extends DomWalkerTestBase {
   private Node root;
   private Node child1;
   private Node child2;
@@ -57,6 +46,8 @@
   
   @Before
   public void setUp() {
+    super.setUp();
+    
     // Create a base document with structure:
     // <root>
     //   <child1>text1</child1>
@@ -65,17 +56,6 @@
     //   </child2>
     // </root>
     // ...which should allow all relevant test cases to be exercised.
-    Injector injector = Guice.createInjector(Modules.override(new ParseModule())
-        .with(new AbstractModule() {
-          @Override
-          protected void configure() {
-            bind(Integer.class).annotatedWith(
-                Names.named("shindig.cache.lru.default.capacity"))
-                  .toInstance(0);
-          }
-        }));
-    DOMImplementation domImpl = injector.getInstance(DOMImplementation.class);
-    doc = domImpl.createDocument(null, null, null);
     root = doc.createElement("root");
     child1 = doc.createElement("child1");
     text1 = doc.createTextNode("text1");
@@ -280,13 +260,4 @@
     replay(mc);
     return mc;
   }
-  
-  private Gadget gadget() {
-    GadgetSpec spec = createMock(GadgetSpec.class);
-    expect(spec.getUrl()).andReturn(Uri.parse("http://example.com")).anyTimes();
-    Gadget gadget = createMock(Gadget.class);
-    expect(gadget.getSpec()).andReturn(spec).anyTimes();
-    replay(spec, gadget);
-    return gadget;
-  }
 }