svn commit: r686941 - in /incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse: GadgetCssRuleTest.java GadgetHtmlNodeTest.java

[jo...@apache.org]

Author: johnh
Date: Mon Aug 18 19:40:49 2008
New Revision: 686941

URL: http://svn.apache.org/viewvc?rev=686941&view=rev
Log:
Oops, quick fix for broken test resulting from deleted GadgetHtmlAttributeTest and GadgetCssDeclarationTest.


Modified:
    incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/GadgetCssRuleTest.java
    incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/GadgetHtmlNodeTest.java

Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/GadgetCssRuleTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/GadgetCssRuleTest.java?rev=686941&r1=686940&r2=686941&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/GadgetCssRuleTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/GadgetCssRuleTest.java Mon Aug 18 19:40:49 2008
@@ -32,6 +32,14 @@
   private String[][] decls =
       { { "color", "blue" }, { " font-size ", "10 em" } };
   
+  private ParsedCssDeclaration makeParsedDecl(String name, String val) {
+    ParsedCssDeclaration parsedDecl = EasyMock.createNiceMock(ParsedCssDeclaration.class);
+    expect(parsedDecl.getName()).andReturn(name).anyTimes();
+    expect(parsedDecl.getValue()).andReturn(val).anyTimes();
+    replay(parsedDecl);
+    return parsedDecl;
+  }
+  
   private ParsedCssRule makeParsedRule(String[] selectors, String[][] decls) {
     ParsedCssRule parsedMock = EasyMock.createNiceMock(ParsedCssRule.class);
     
@@ -44,8 +52,7 @@
     List<ParsedCssDeclaration> declList =
         new LinkedList<ParsedCssDeclaration>();
     for (String[] decl : decls) {
-      declList.add(
-          GadgetCssDeclarationTest.makeParsedDecl(decl[0], decl[1]));
+      declList.add(makeParsedDecl(decl[0], decl[1]));
     }
     expect(parsedMock.getDeclarations()).andReturn(declList).anyTimes();
     

Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/GadgetHtmlNodeTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/GadgetHtmlNodeTest.java?rev=686941&r1=686940&r2=686941&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/GadgetHtmlNodeTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/GadgetHtmlNodeTest.java Mon Aug 18 19:40:49 2008
@@ -31,6 +31,14 @@
 import java.util.Set;
 
 public class GadgetHtmlNodeTest extends TestCase {
+  private ParsedHtmlAttribute makeParsedAttribute(String key, String val) {
+    ParsedHtmlAttribute parsed = EasyMock.createNiceMock(ParsedHtmlAttribute.class);
+    expect(parsed.getName()).andReturn(key).anyTimes();
+    expect(parsed.getValue()).andReturn(val).anyTimes();
+    replay(parsed);
+    return parsed;
+  }
+  
   private ParsedHtmlNode makeTagNodeFromParsed(
       String tag, String[][] attribs, ParsedHtmlNode[] children) {
     ParsedHtmlNode parsed = EasyMock.createNiceMock(ParsedHtmlNode.class);
@@ -38,8 +46,7 @@
     List<ParsedHtmlAttribute> attributes = new LinkedList<ParsedHtmlAttribute>();
     if (attribs != null) {
       for (String[] attrib : attribs) {
-        attributes.add(
-            GadgetHtmlAttributeTest.makeParsedAttribute(attrib[0], attrib[1]));
+        attributes.add(makeParsedAttribute(attrib[0], attrib[1]));
       }
     }
     expect(parsed.getAttributes()).andReturn(attributes).anyTimes();