You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by mh...@apache.org on 2011/08/04 00:42:26 UTC
svn commit: r1153693 - in /shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/js/DeferJsProcessor.java
main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java
test/java/org/apache/shindig/gadgets/js/ExportJsProcessorTest.java
Author: mhermanto
Date: Wed Aug 3 22:42:25 2011
New Revision: 1153693
URL: http://svn.apache.org/viewvc?rev=1153693&view=rev
Log:
Minor fixes to [Export|Defer]JsProcessor.
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferJsProcessor.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ExportJsProcessorTest.java
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferJsProcessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferJsProcessor.java?rev=1153693&r1=1153692&r2=1153693&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferJsProcessor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferJsProcessor.java Wed Aug 3 22:42:25 2011
@@ -32,7 +32,7 @@ import org.apache.shindig.gadgets.uri.Js
import java.util.List;
-public class DeferJsProcessor extends BaseSurfaceJsProcessor {
+public class DeferJsProcessor extends BaseSurfaceJsProcessor implements JsProcessor {
@VisibleForTesting
static final String FEATURE_NAME = "deferjs";
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java?rev=1153693&r1=1153692&r2=1153693&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java Wed Aug 3 22:42:25 2011
@@ -31,7 +31,7 @@ import org.apache.shindig.gadgets.uri.Js
import java.util.List;
-public class ExportJsProcessor extends BaseSurfaceJsProcessor {
+public class ExportJsProcessor extends BaseSurfaceJsProcessor implements JsProcessor {
@VisibleForTesting
static final String FEATURE_NAME = "exportjs";
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ExportJsProcessorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ExportJsProcessorTest.java?rev=1153693&r1=1153692&r2=1153693&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ExportJsProcessorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ExportJsProcessorTest.java Wed Aug 3 22:42:25 2011
@@ -18,7 +18,6 @@
package org.apache.shindig.gadgets.js;
import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isA;
import static org.easymock.EasyMock.replay;
@@ -78,10 +77,6 @@ public class ExportJsProcessorTest {
private final String EXPORT_STRING_3 = "";
- private final List<String> LIBS1 = Lists.newArrayList("lib1");
- private final List<String> LIBS2 = Lists.newArrayList("lib2");
- private final List<String> LOADED = Lists.newArrayList();
-
private JsContent textJsContent1;
private JsContent textJsContent2;
private JsContent featureJsContent1;
@@ -117,15 +112,6 @@ public class ExportJsProcessorTest {
expect(result.getFeatureResources(
isA(GadgetContext.class), isA(List.class), EasyMock.isNull(List.class))).
andReturn(lookupMock).anyTimes();
- expect(result.getFeatureResources(
- isA(GadgetContext.class), eq(LIBS1), EasyMock.isNull(List.class), eq(false))).
- andReturn(mockLookupResult(mockBundle(EXPORTS_1))).anyTimes();
- expect(result.getFeatureResources(
- isA(GadgetContext.class), eq(LIBS2), EasyMock.isNull(List.class), eq(false))).
- andReturn(mockLookupResult(mockBundle(EXPORTS_2))).anyTimes();
- expect(result.getFeatures(LIBS2)).andReturn(LIBS2).anyTimes();
- expect(result.getFeatures(LIBS1)).andReturn(LIBS1).anyTimes();
- expect(result.getFeatures(LOADED)).andReturn(LOADED).anyTimes();
replay(result);
return result;
}
@@ -135,16 +121,10 @@ public class ExportJsProcessorTest {
}
private JsUri mockJsUri(JsCompileMode mode, boolean isJsload) {
- return mockJsUri(mode, isJsload, LIBS2);
- }
-
- private JsUri mockJsUri(JsCompileMode mode, boolean isJsload, List<String> libs) {
JsUri result = createMock(JsUri.class);
expect(result.getCompileMode()).andStubReturn(mode);
expect(result.getRepository()).andStubReturn(null);
expect(result.isJsload()).andReturn(isJsload).anyTimes();
- expect(result.getLibs()).andReturn(libs).anyTimes();
- expect(result.getLoadedLibs()).andReturn(LOADED).anyTimes();
replay(result);
return result;
}