Author: mhermanto
Date: Thu Apr 21 23:29:04 2011
New Revision: 1095846
URL: http://svn.apache.org/viewvc?rev=1095846&view=rev
Log:
Transform externs and better compile mode names.
http://codereview.appspot.com/4449043/
Added:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsResponseBuilderTest.java
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsCompileMode.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AnonFuncWrappingProcessor.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponseBuilder.java
shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsCompileModeTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AnonFuncWrappingProcessorTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CompilationProcessorTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ExportJsProcessorTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/GetJsContentProcessorTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultJsUriManagerTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/JsUriManagerTest.java
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsCompileMode.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsCompileMode.java?rev=1095846&r1=1095845&r2=1095846&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsCompileMode.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsCompileMode.java
Thu Apr 21 23:29:04 2011
@@ -19,16 +19,16 @@ package org.apache.shindig.gadgets;
public enum JsCompileMode {
// Concats all build-time compile-version JS.
- BUILD_TIME("0"),
+ COMPILE_CONCAT("0"),
// Performs run-time compilation of concatenated built-time debug-version JS.
// All symbols exported (and as long as in transitive dependency) are
// retained/unbofuscated.
- ALL_RUN_TIME("1"),
+ CONCAT_COMPILE_EXPORT_ALL("1"),
// Like run ALL_RUN_TIME, except the only retained/unobfuscated symbols are
// ones exported from the explicitly-requested features, ie: if feature=foo
// depends on feature=bar, /gadgets/js/foo will expose foo.* exported APIs,
// not bar.* exported APIs. This can potentially eliminate all un-used code.
- EXPLICIT_RUN_TIME("2");
+ CONCAT_COMPILE_EXPORT_EXPLICIT("2");
private final String paramValue;
@@ -47,11 +47,11 @@ public enum JsCompileMode {
return mode;
}
}
- return JsCompileMode.BUILD_TIME;
+ return JsCompileMode.COMPILE_CONCAT;
}
public static JsCompileMode getDefault() {
- return JsCompileMode.BUILD_TIME;
+ return JsCompileMode.COMPILE_CONCAT;
}
}
\ No newline at end of file
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AnonFuncWrappingProcessor.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AnonFuncWrappingProcessor.java?rev=1095846&r1=1095845&r2=1095846&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AnonFuncWrappingProcessor.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AnonFuncWrappingProcessor.java
Thu Apr 21 23:29:04 2011
@@ -22,7 +22,7 @@ import org.apache.shindig.gadgets.JsComp
public class AnonFuncWrappingProcessor implements JsProcessor {
public boolean process(JsRequest jsRequest, JsResponseBuilder builder)
throws JsException {
- if (jsRequest.getJsUri().getCompileMode() != JsCompileMode.BUILD_TIME) {
+ if (jsRequest.getJsUri().getCompileMode() != JsCompileMode.COMPILE_CONCAT)
{
builder.prependJs("(function(){", "[js-anon-wrapper]");
builder.appendJs("})();", "[js-anon-wrapper]");
}
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=1095846&r1=1095845&r2=1095846&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
Thu Apr 21 23:29:04 2011
@@ -85,11 +85,11 @@ public class ExportJsProcessor implement
List<String> exports = Lists.newArrayList();
// Add exports of bundle, regardless.
- if (jsUri.getCompileMode() == JsCompileMode.ALL_RUN_TIME) {
+ if (jsUri.getCompileMode() == JsCompileMode.CONCAT_COMPILE_EXPORT_ALL) {
exports = bundle.getApis(ApiDirective.Type.JS, true);
// Add exports of bundle if it is an explicitly-specified feature.
- } else if (jsUri.getCompileMode() == JsCompileMode.EXPLICIT_RUN_TIME) {
+ } else if (jsUri.getCompileMode() ==
JsCompileMode.CONCAT_COMPILE_EXPORT_EXPLICIT) {
if (jsUri.getLibs().contains(bundle.getName())) {
exports = bundle.getApis(ApiDirective.Type.JS, true);
}
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponseBuilder.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponseBuilder.java?rev=1095846&r1=1095845&r2=1095846&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponseBuilder.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponseBuilder.java
Thu Apr 21 23:29:04 2011
@@ -30,7 +30,6 @@ import javax.servlet.http.HttpServletRes
*/
public class JsResponseBuilder {
private static final String EXTERN_DELIM = ";\n";
- private static final Joiner EXTERN_JOINER = Joiner.on(EXTERN_DELIM);
private List<JsContent> jsCode;
private final List<String> errors;
@@ -185,10 +184,20 @@ public class JsResponseBuilder {
}
/**
- * Appends externs as string.
+ * Appends a blob of raw extern.
*/
- public JsResponseBuilder appendExterns(String externs) {
- this.externs.append(externs).append(EXTERN_DELIM);
+ public JsResponseBuilder appendRawExtern(String rawExtern) {
+ this.externs.append(rawExtern).append(EXTERN_DELIM);
+ return this;
+ }
+
+ /**
+ * Appends a line of extern.
+ */
+ public JsResponseBuilder appendExtern(String extern) {
+ this.externs
+ .append((extern.indexOf(".") <= 0) ? ("var " + extern) : extern)
+ .append(" = {}").append(EXTERN_DELIM);
return this;
}
@@ -196,7 +205,10 @@ public class JsResponseBuilder {
* Appends externs as from list of strings.
*/
public JsResponseBuilder appendExterns(List<String> externs) {
- return appendExterns(EXTERN_JOINER.join(externs));
+ for (String extern : externs) {
+ appendExtern(extern);
+ }
+ return this;
}
/**
Modified:
shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java?rev=1095846&r1=1095845&r2=1095846&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
Thu Apr 21 23:29:04 2011
@@ -163,7 +163,7 @@ public class ClosureJsCompiler implement
builder.appendJs(compiled, "[compiled]");
}
- builder.clearExterns().appendExterns(result.externExport);
+ builder.clearExterns().appendRawExtern(result.externExport);
} else {
// Otherwise, return original content and null exports.
builder.appendAllJs(content);
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsCompileModeTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsCompileModeTest.java?rev=1095846&r1=1095845&r2=1095846&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsCompileModeTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsCompileModeTest.java
Thu Apr 21 23:29:04 2011
@@ -25,9 +25,9 @@ import org.junit.Test;
public class JsCompileModeTest {
@Test
public void testValueOfParam() {
- assertEquals(JsCompileMode.BUILD_TIME, JsCompileMode.valueOfParam(null));
- assertEquals(JsCompileMode.BUILD_TIME, JsCompileMode.valueOfParam("0"));
- assertEquals(JsCompileMode.ALL_RUN_TIME, JsCompileMode.valueOfParam("1"));
- assertEquals(JsCompileMode.EXPLICIT_RUN_TIME,
JsCompileMode.valueOfParam("2"));
+ assertEquals(JsCompileMode.COMPILE_CONCAT,
JsCompileMode.valueOfParam(null));
+ assertEquals(JsCompileMode.COMPILE_CONCAT,
JsCompileMode.valueOfParam("0"));
+ assertEquals(JsCompileMode.CONCAT_COMPILE_EXPORT_ALL,
JsCompileMode.valueOfParam("1"));
+ assertEquals(JsCompileMode.CONCAT_COMPILE_EXPORT_EXPLICIT,
JsCompileMode.valueOfParam("2"));
}
}
\ No newline at end of file
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AnonFuncWrappingProcessorTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AnonFuncWrappingProcessorTest.java?rev=1095846&r1=1095845&r2=1095846&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AnonFuncWrappingProcessorTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AnonFuncWrappingProcessorTest.java
Thu Apr 21 23:29:04 2011
@@ -31,17 +31,17 @@ import org.junit.Test;
public class AnonFuncWrappingProcessorTest {
@Test
public void wrapCodeAllRunTime() throws Exception {
- checkWrapCode(JsCompileMode.ALL_RUN_TIME, true);
+ checkWrapCode(JsCompileMode.CONCAT_COMPILE_EXPORT_ALL, true);
}
@Test
public void wrapCodeExplicitRunTime() throws Exception {
- checkWrapCode(JsCompileMode.EXPLICIT_RUN_TIME, true);
+ checkWrapCode(JsCompileMode.CONCAT_COMPILE_EXPORT_EXPLICIT, true);
}
@Test
public void wrapCodeBuildTimeDoesNothing() throws Exception {
- checkWrapCode(JsCompileMode.BUILD_TIME, false);
+ checkWrapCode(JsCompileMode.COMPILE_CONCAT, false);
}
private void checkWrapCode(JsCompileMode mode, boolean wraps) throws
Exception {
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CompilationProcessorTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CompilationProcessorTest.java?rev=1095846&r1=1095845&r2=1095846&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CompilationProcessorTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CompilationProcessorTest.java
Thu Apr 21 23:29:04 2011
@@ -21,6 +21,7 @@ import static org.easymock.EasyMock.crea
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;
import static org.easymock.EasyMock.same;
import static org.junit.Assert.assertEquals;
@@ -67,7 +68,7 @@ public class CompilationProcessorTest {
JsRequest request = control.createMock(JsRequest.class);
expect(request.getJsUri()).andReturn(jsUri);
expect(compiler.compile(same(jsUri), eq(builder.build().getAllJsContent()),
- eq("extern3;\n" + "extern4;\n"))).andReturn(outputResponse);
+ isA(String.class))).andReturn(outputResponse);
control.replay();
boolean status = processor.process(request, builder);
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=1095846&r1=1095845&r2=1095846&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
Thu Apr 21 23:29:04 2011
@@ -159,7 +159,7 @@ public class ExportJsProcessorTest {
@Test
public void testProcessEmpty() throws Exception {
- JsUri jsUri = mockJsUri(JsCompileMode.ALL_RUN_TIME);
+ JsUri jsUri = mockJsUri(JsCompileMode.CONCAT_COMPILE_EXPORT_ALL);
JsRequest jsRequest = new JsRequest(jsUri, null, false);
JsResponseBuilder jsBuilder = new JsResponseBuilder();
boolean actualReturnCode = compiler.process(jsRequest, jsBuilder);
@@ -169,7 +169,7 @@ public class ExportJsProcessorTest {
@Test
public void testProcessWithOneText() throws Exception {
- JsUri jsUri = mockJsUri(JsCompileMode.ALL_RUN_TIME);
+ JsUri jsUri = mockJsUri(JsCompileMode.CONCAT_COMPILE_EXPORT_ALL);
JsRequest jsRequest = new JsRequest(jsUri, null, false);
JsResponseBuilder jsBuilder = new JsResponseBuilder();
jsBuilder.appendJs(textJsContent1);
@@ -182,7 +182,7 @@ public class ExportJsProcessorTest {
@Test
public void testProcessWithOneNonEmptyFeature() throws Exception {
- JsUri jsUri = mockJsUri(JsCompileMode.ALL_RUN_TIME);
+ JsUri jsUri = mockJsUri(JsCompileMode.CONCAT_COMPILE_EXPORT_ALL);
JsRequest jsRequest = new JsRequest(jsUri, null, false);
JsResponseBuilder jsBuilder = new JsResponseBuilder();
jsBuilder.appendJs(featureJsContent1);
@@ -195,7 +195,7 @@ public class ExportJsProcessorTest {
@Test
public void testProcessWithOneEmptyFeature() throws Exception {
- JsUri jsUri = mockJsUri(JsCompileMode.ALL_RUN_TIME);
+ JsUri jsUri = mockJsUri(JsCompileMode.CONCAT_COMPILE_EXPORT_ALL);
JsRequest jsRequest = new JsRequest(jsUri, null, false);
JsResponseBuilder jsBuilder = new JsResponseBuilder();
jsBuilder.appendJs(featureJsContent3);
@@ -208,7 +208,7 @@ public class ExportJsProcessorTest {
@Test
public void testProcessWithFeaturesAndTexts() throws Exception {
- JsUri jsUri = mockJsUri(JsCompileMode.ALL_RUN_TIME);
+ JsUri jsUri = mockJsUri(JsCompileMode.CONCAT_COMPILE_EXPORT_ALL);
JsRequest jsRequest = new JsRequest(jsUri, null, false);
JsResponseBuilder jsBuilder = new JsResponseBuilder();
jsBuilder.appendJs(textJsContent1);
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/GetJsContentProcessorTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/GetJsContentProcessorTest.java?rev=1095846&r1=1095845&r2=1095846&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/GetJsContentProcessorTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/GetJsContentProcessorTest.java
Thu Apr 21 23:29:04 2011
@@ -126,7 +126,7 @@ public class GetJsContentProcessorTest {
control.replay();
processor.process(request, response);
- checkResponse(true, 3600, JS_CODE1, "export2;\nextern2;\n");
+ checkResponse(true, 3600, JS_CODE1, "export2", "extern2");
control.verify();
}
@@ -199,10 +199,12 @@ public class GetJsContentProcessorTest {
}
private void checkResponse(boolean proxyCacheable, int expectedTtl,
- String jsString, String externsString) {
+ String jsString, String... externs) {
assertEquals(proxyCacheable, response.isProxyCacheable());
assertEquals(expectedTtl, response.getCacheTtlSecs());
assertEquals(jsString, response.build().toJsString());
- assertEquals(externsString, response.build().getExterns());
+ for (String extern : externs) {
+ assertTrue(response.build().getExterns().contains(extern));
+ }
}
}
Added:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsResponseBuilderTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsResponseBuilderTest.java?rev=1095846&view=auto
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsResponseBuilderTest.java
(added)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsResponseBuilderTest.java
Thu Apr 21 23:29:04 2011
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.shindig.gadgets.js;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class JsResponseBuilderTest {
+
+ private JsResponseBuilder builder;
+
+ @Before
+ public void setUp() {
+ builder = new JsResponseBuilder();
+ }
+
+ @Test
+ public void testExterns() throws Exception {
+ builder.appendExtern("a");
+ builder.appendExtern("a.b");
+ assertEquals("var a = {};\na.b = {};\n", builder.build().getExterns());
+ }
+
+}
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultJsUriManagerTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultJsUriManagerTest.java?rev=1095846&r1=1095845&r2=1095846&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultJsUriManagerTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultJsUriManagerTest.java
Thu Apr 21 23:29:04 2011
@@ -164,7 +164,7 @@ public class DefaultJsUriManagerTest {
TestDefaultJsUriManager manager = makeManager(config, null);
List<String> extern = Lists.newArrayList("feature", "another");
JsUri ctx = mockGadgetContext(false, false, extern, null, true, null,
- JsCompileMode.ALL_RUN_TIME);
+ JsCompileMode.CONCAT_COMPILE_EXPORT_ALL);
Uri jsUri = manager.makeExternJsUri(ctx);
assertFalse(manager.hadError());
assertEquals("http", jsUri.getScheme());
@@ -173,7 +173,7 @@ public class DefaultJsUriManagerTest {
assertEquals(CONTAINER, jsUri.getQueryParameter(Param.CONTAINER.getKey()));
assertEquals("0", jsUri.getQueryParameter(Param.NO_CACHE.getKey()));
assertEquals("0", jsUri.getQueryParameter(Param.DEBUG.getKey()));
- assertEquals(JsCompileMode.ALL_RUN_TIME.getParamValue(),
+ assertEquals(JsCompileMode.CONCAT_COMPILE_EXPORT_ALL.getParamValue(),
jsUri.getQueryParameter(Param.COMPILE_MODE.getKey()));
assertEquals(RenderingContext.CONTAINER.getParamValue(),
jsUri.getQueryParameter(Param.CONTAINER_MODE.getKey()));
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/JsUriManagerTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/JsUriManagerTest.java?rev=1095846&r1=1095845&r2=1095846&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/JsUriManagerTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/JsUriManagerTest.java
Thu Apr 21 23:29:04 2011
@@ -46,10 +46,10 @@ public class JsUriManagerTest extends Ur
@Test
public void newJsUriWithOriginalUri() throws Exception {
Uri uri = newTestUriBuilder(RenderingContext.CONTAINER,
- JsCompileMode.ALL_RUN_TIME).toUri();
+ JsCompileMode.CONCAT_COMPILE_EXPORT_ALL).toUri();
JsUriManager.JsUri jsUri = new JsUriManager.JsUri(STATUS, uri, LIBS, HAVE);
assertEquals(RenderingContext.CONTAINER, jsUri.getContext());
- assertEquals(JsCompileMode.ALL_RUN_TIME, jsUri.getCompileMode());
+ assertEquals(JsCompileMode.CONCAT_COMPILE_EXPORT_ALL,
jsUri.getCompileMode());
assertEquals(CONTAINER_VALUE, jsUri.getContainer());
assertTrue(jsUri.isJsload());
assertTrue(jsUri.isNoCache());
@@ -63,10 +63,10 @@ public class JsUriManagerTest extends Ur
@Test
public void newJsUriWithConfiguredGadgetContext() throws Exception {
Uri uri = newTestUriBuilder(RenderingContext.CONFIGURED_GADGET,
- JsCompileMode.ALL_RUN_TIME).toUri();
+ JsCompileMode.CONCAT_COMPILE_EXPORT_ALL).toUri();
JsUriManager.JsUri jsUri = new JsUriManager.JsUri(STATUS, uri, LIBS, HAVE);
assertEquals(RenderingContext.CONFIGURED_GADGET, jsUri.getContext());
- assertEquals(JsCompileMode.ALL_RUN_TIME, jsUri.getCompileMode());
+ assertEquals(JsCompileMode.CONCAT_COMPILE_EXPORT_ALL,
jsUri.getCompileMode());
assertEquals(CONTAINER_VALUE, jsUri.getContainer());
assertTrue(jsUri.isJsload());
assertTrue(jsUri.isNoCache());
@@ -83,7 +83,7 @@ public class JsUriManagerTest extends Ur
Collections.<String>emptyList(), null); // Null URI.
assertEquals(RenderingContext.GADGET, jsUri.getContext());
assertEquals(ContainerConfig.DEFAULT_CONTAINER, jsUri.getContainer());
- assertEquals(JsCompileMode.BUILD_TIME, jsUri.getCompileMode());
+ assertEquals(JsCompileMode.COMPILE_CONCAT, jsUri.getCompileMode());
assertFalse(jsUri.isJsload());
assertFalse(jsUri.isNoCache());
assertFalse(jsUri.isNohint());
@@ -96,7 +96,7 @@ public class JsUriManagerTest extends Ur
@Test
public void newJsUriCopyOfOtherJsUri() throws Exception {
Uri uri = newTestUriBuilder(RenderingContext.CONTAINER,
- JsCompileMode.ALL_RUN_TIME).toUri();
+ JsCompileMode.CONCAT_COMPILE_EXPORT_ALL).toUri();
JsUriManager.JsUri jsUri = new JsUriManager.JsUri(STATUS, uri, LIBS, HAVE);
JsUriManager.JsUri jsUriCopy = new JsUriManager.JsUri(jsUri);
assertEquals(jsUri, jsUriCopy);
