Skip to content

Commit

Permalink
Use a more fluent style for calling builders.
Browse files Browse the repository at this point in the history 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=209177515
  • Loading branch information
@blickly @lauraharker
blickly authored and lauraharker committed Aug 18, 2018
1 parent 315cdf2 commit 3f9dda2
Show file tree
Hide file tree
Showing 2 changed files with 82 additions and 72 deletions.
60 changes: 32 additions & 28 deletions test/com/google/javascript/jscomp/ConformanceWhitelisterTest.java
View file
Expand Up @@ -38,13 +38,14 @@ public void testConformanceWhitelistAddNew() throws IOException {
"/entry.js",
lines("var foo = document.getElementById('name');", "foo.innerHTML = 'test';")));

Requirement.Builder requirement = Requirement.newBuilder();
requirement
.setType(Type.BANNED_PROPERTY)
.setErrorMessage("Lorem Ipsum")
.addValue("Object.prototype.innerHTML");

assertThat(testConformanceWhitelister(sources.build(), requirement.build()))
Requirement requirement =
Requirement.newBuilder()
.setType(Type.BANNED_PROPERTY)
.setErrorMessage("Lorem Ipsum")
.addValue("Object.prototype.innerHTML")
.build();

assertThat(testConformanceWhitelister(sources.build(), requirement))
.containsExactly("/entry.js", 2);
}

Expand All @@ -56,14 +57,15 @@ public void testConformanceWhitelistRemove() throws IOException {
"/entry.js",
lines("var foo = document.getElementById('name');", "foo.outerHTML = 'test';")));

Requirement.Builder requirement = Requirement.newBuilder();
requirement
.setType(Type.BANNED_PROPERTY)
.setErrorMessage("Lorem Ipsum")
.addValue("Object.prototype.innerHTML")
.addWhitelist("/entry.js");
Requirement requirement =
Requirement.newBuilder()
.setType(Type.BANNED_PROPERTY)
.setErrorMessage("Lorem Ipsum")
.addValue("Object.prototype.innerHTML")
.addWhitelist("/entry.js")
.build();

assertThat(testConformanceWhitelister(sources.build(), requirement.build())).isEmpty();
assertThat(testConformanceWhitelister(sources.build(), requirement)).isEmpty();
}

public void testConformanceWhitelistPreserve() throws IOException {
Expand All @@ -74,14 +76,15 @@ public void testConformanceWhitelistPreserve() throws IOException {
"/entry.js",
lines("var foo = document.getElementById('name');", "foo.innerHTML = 'test';")));

Requirement.Builder requirement = Requirement.newBuilder();
requirement
.setType(Type.BANNED_PROPERTY)
.setErrorMessage("Lorem Ipsum")
.addValue("Object.prototype.innerHTML")
.addWhitelist("/entry.js");
Requirement requirement =
Requirement.newBuilder()
.setType(Type.BANNED_PROPERTY)
.setErrorMessage("Lorem Ipsum")
.addValue("Object.prototype.innerHTML")
.addWhitelist("/entry.js")
.build();

assertThat(testConformanceWhitelister(sources.build(), requirement.build()))
assertThat(testConformanceWhitelister(sources.build(), requirement))
.containsExactly("/entry.js", 2);
}

Expand All @@ -96,14 +99,15 @@ public void testConformanceWhitelistBreaksDownFolder() throws IOException {
"/test/entry.js",
lines("var foo = document.getElementById('name');", "foo.innerHTML = 'test';")));

Requirement.Builder requirement = Requirement.newBuilder();
requirement
.setType(Type.BANNED_PROPERTY)
.setErrorMessage("Lorem Ipsum")
.addValue("Object.prototype.innerHTML")
.addWhitelist("/test/");
Requirement requirement =
Requirement.newBuilder()
.setType(Type.BANNED_PROPERTY)
.setErrorMessage("Lorem Ipsum")
.addValue("Object.prototype.innerHTML")
.addWhitelist("/test/")
.build();

assertThat(testConformanceWhitelister(sources.build(), requirement.build()))
assertThat(testConformanceWhitelister(sources.build(), requirement))
.containsExactly("/test/entry.js", 2);
}

Expand Down
94 changes: 50 additions & 44 deletions test/com/google/javascript/jscomp/RecordFunctionInformationTest.java
View file
Expand Up @@ -18,7 +18,6 @@

import com.google.common.collect.ImmutableList;
import com.google.javascript.rhino.Node;

import junit.framework.TestCase;

/**
Expand All @@ -33,28 +32,31 @@ public void testFunction() {
String fAndG = "function f(){" + g + "}";
String js = "var h=" + fAndG + ";h()";

FunctionInformationMap.Builder expected =
FunctionInformationMap.newBuilder();
expected.addEntry(
FunctionInformationMap.Entry.newBuilder()
.setId(0)
.setSourceName("testcode")
.setLineNumber(1)
.setModuleName("")
.setSize(g.length())
.setName("f::g")
.setCompiledSource(g).build());
expected.addEntry(
FunctionInformationMap.Entry.newBuilder()
.setId(1)
.setSourceName("testcode")
.setLineNumber(1)
.setModuleName("")
.setSize(fAndG.length())
.setName("f")
.setCompiledSource(fAndG).build());

test(js, expected.build());
FunctionInformationMap expected =
FunctionInformationMap.newBuilder()
.addEntry(
FunctionInformationMap.Entry.newBuilder()
.setId(0)
.setSourceName("testcode")
.setLineNumber(1)
.setModuleName("")
.setSize(g.length())
.setName("f::g")
.setCompiledSource(g)
.build())
.addEntry(
FunctionInformationMap.Entry.newBuilder()
.setId(1)
.setSourceName("testcode")
.setLineNumber(1)
.setModuleName("")
.setSize(fAndG.length())
.setName("f")
.setCompiledSource(fAndG)
.build())
.build();

test(js, expected);
}

public void testMotionPreservesOriginalSourceName() {
Expand All @@ -74,27 +76,31 @@ public void testMotionPreservesOriginalSourceName() {
mainRoot.getFirstChild().removeChild(nodeG);
mainRoot.getLastChild().addChildToBack(nodeG.cloneTree());

FunctionInformationMap.Builder expected = FunctionInformationMap.newBuilder();
expected.addEntry(
FunctionInformationMap.Entry.newBuilder()
.setId(0)
.setSourceName("i0.js")
.setLineNumber(1)
.setModuleName("m0")
.setSize(g.length())
.setName("f")
.setCompiledSource(f).build());
expected.addEntry(
FunctionInformationMap.Entry.newBuilder()
.setId(1)
.setSourceName("i0.js")
.setLineNumber(1)
.setModuleName("m1")
.setSize(g.length())
.setName("g")
.setCompiledSource(g).build());

test(compiler, externsRoot, mainRoot, expected.build());
FunctionInformationMap expected =
FunctionInformationMap.newBuilder()
.addEntry(
FunctionInformationMap.Entry.newBuilder()
.setId(0)
.setSourceName("i0.js")
.setLineNumber(1)
.setModuleName("m0")
.setSize(g.length())
.setName("f")
.setCompiledSource(f)
.build())
.addEntry(
FunctionInformationMap.Entry.newBuilder()
.setId(1)
.setSourceName("i0.js")
.setLineNumber(1)
.setModuleName("m1")
.setSize(g.length())
.setName("g")
.setCompiledSource(g)
.build())
.build();

test(compiler, externsRoot, mainRoot, expected);
}


Expand Down

0 comments on commit 3f9dda2

Please sign in to comment.