diff --git a/BUILD.bazel b/BUILD.bazel index a767045a39..11b2b84ce0 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -46,7 +46,6 @@ java_binary( ], ) - # google-java-format java_binary( name = "google_java_format_binary", diff --git a/src/test/java/com/google/api/generator/gapic/BUILD.bazel b/src/test/java/com/google/api/generator/gapic/BUILD.bazel index 4710f67755..7c614e8093 100644 --- a/src/test/java/com/google/api/generator/gapic/BUILD.bazel +++ b/src/test/java/com/google/api/generator/gapic/BUILD.bazel @@ -4,7 +4,6 @@ filegroup( name = "gapic_files", srcs = [ "//src/test/java/com/google/api/generator/gapic/composer:composer_files", - "//src/test/java/com/google/api/generator/gapic/dummy:dummy_files", "//src/test/java/com/google/api/generator/gapic/model:model_files", "//src/test/java/com/google/api/generator/gapic/protoparser:protoparser_files", "//src/test/java/com/google/api/generator/gapic/utils:utils_files", diff --git a/src/test/java/com/google/api/generator/gapic/dummy/BUILD.bazel b/src/test/java/com/google/api/generator/gapic/dummy/BUILD.bazel deleted file mode 100644 index 0a4ae41759..0000000000 --- a/src/test/java/com/google/api/generator/gapic/dummy/BUILD.bazel +++ /dev/null @@ -1,40 +0,0 @@ -load("//:rules_bazel/java/java_diff_test.bzl", "golden_update") - -package(default_visibility = ["//visibility:public"]) - -TESTS = [ - "FileDiffInfraDummyTest", -] - -TEST_DEPS = [ - "//src/main/java/com/google/api/generator/engine/ast", - "//src/main/java/com/google/api/generator/engine/writer", - "//src/test/java/com/google/api/generator/test/framework:asserts", - "//src/test/java/com/google/api/generator/test/framework:utils", - "@junit_junit//jar", -] - -filegroup( - name = "dummy_files", - srcs = ["{0}.java".format(f) for f in TESTS], -) - -[java_test( - name = test_name, - srcs = ["{0}.java".format(test_name)], - data = ["//src/test/java/com/google/api/generator/gapic/dummy/goldens:goldens_files"], - test_class = "com.google.api.generator.gapic.dummy.{0}".format(test_name), - deps = TEST_DEPS, -) for test_name in TESTS] - -TEST_CLASS_NAME = "com.google.api.generator.gapic.dummy.FileDiffInfraDummyTest" - -# Run `bazel run src/test/java/com/google/api/generator/gapic/dummy:FileDiffInfraDummyTest_update` -# to update goldens as expected generated code. -[golden_update( - name = "{0}_update".format(test_name), - srcs = ["{0}.java".format(test_name)], - data = ["//src/test/java/com/google/api/generator/gapic/dummy/goldens:goldens_files"], - test_class = "com.google.api.generator.gapic.dummy.{0}".format(test_name), - deps = TEST_DEPS, -) for test_name in TESTS] diff --git a/src/test/java/com/google/api/generator/gapic/dummy/FileDiffInfraDummyTest.java b/src/test/java/com/google/api/generator/gapic/dummy/FileDiffInfraDummyTest.java deleted file mode 100644 index 060a613dac..0000000000 --- a/src/test/java/com/google/api/generator/gapic/dummy/FileDiffInfraDummyTest.java +++ /dev/null @@ -1,102 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed 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 com.google.api.generator.gapic.dummy; - -import com.google.api.generator.engine.ast.BlockComment; -import com.google.api.generator.engine.ast.ClassDefinition; -import com.google.api.generator.engine.ast.CommentStatement; -import com.google.api.generator.engine.ast.LineComment; -import com.google.api.generator.engine.ast.ScopeNode; -import com.google.api.generator.engine.writer.JavaWriterVisitor; -import com.google.api.generator.test.framework.Assert; -import com.google.api.generator.test.framework.Utils; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Arrays; -import org.junit.Test; - -public class FileDiffInfraDummyTest { - // Add two simple tests for testing the file-diff infra. - // 1. The two unit tests create simple java classes. - // 2. Two unit tests are created because we have the case of two expected strings comparison - // in one test class e.g. ResourceNameHelperClassComposer. In that case, two golden files will be - // created. - // - // TODO(xiaozhenliu): remove this test class once the file-diff infra is in place and well-tested. - private final String GOLDENFILES_DIRECTORY = Utils.getGoldenDir(this.getClass()); - private final String GOLDENFILES_SIMPLE_CLASS = - Utils.getClassName(this.getClass()) + "SimpleClass.golden"; - private final String GOLDENFILES_CLASS_WITH_HEADER = - Utils.getClassName(this.getClass()) + "ClassWithHeader.golden"; - - @Test - public void simpleClass() { - ClassDefinition classDef = - ClassDefinition.builder() - .setHeaderCommentStatements( - Arrays.asList( - CommentStatement.withComment( - LineComment.withComment("This is a test class for file-diff infra")))) - .setPackageString("com.google.showcase.v1beta1.stub") - .setName("EchoStubSettings") - .setScope(ScopeNode.PUBLIC) - .build(); - JavaWriterVisitor visitor = new JavaWriterVisitor(); - classDef.accept(visitor); - Utils.saveCodegenToFile(this.getClass(), GOLDENFILES_SIMPLE_CLASS, visitor.write()); - Path goldenFilePath = Paths.get(GOLDENFILES_DIRECTORY, GOLDENFILES_SIMPLE_CLASS); - Assert.assertCodeEquals(goldenFilePath, visitor.write()); - } - - @Test - public void classWithHeader() { - ClassDefinition classDef = - ClassDefinition.builder() - .setFileHeader( - Arrays.asList( - CommentStatement.withComment(BlockComment.withComment(APACHE_LICENSE_STRING)))) - .setPackageString("com.google.showcase.v1beta1.stub") - .setName("EchoStubSettings") - .setScope(ScopeNode.PUBLIC) - .build(); - JavaWriterVisitor visitor = new JavaWriterVisitor(); - classDef.accept(visitor); - // Save the generated code to a file for updating goldens if needed. - Utils.saveCodegenToFile(this.getClass(), GOLDENFILES_CLASS_WITH_HEADER, visitor.write()); - Path goldenFilePath = Paths.get(GOLDENFILES_DIRECTORY, GOLDENFILES_CLASS_WITH_HEADER); - Assert.assertCodeEquals(goldenFilePath, visitor.write()); - } - - // Add a simple test for two strings comparison. - @Test - public void simpleLineComment() { - JavaWriterVisitor visitor = new JavaWriterVisitor(); - LineComment lineComment = LineComment.withComment("test strings comparison."); - lineComment.accept(visitor); - Assert.assertCodeEquals("// test strings comparison.", visitor.write()); - } - - private static final String APACHE_LICENSE_STRING = - "Copyright 2020 Google LLC\n\n" - + "Licensed under the Apache License, Version 2.0 (the \"License\");\n" - + "you may not use this file except in compliance with the License.\n" - + "You may obtain a copy of the License at\n\n" - + " https://www.apache.org/licenses/LICENSE-2.0\n\n" - + "Unless required by applicable law or agreed to in writing, software\n" - + "distributed under the License is distributed on an \"AS IS\" BASIS,\n" - + "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" - + "See the License for the specific language governing permissions and\n" - + "limitations under the License."; -} diff --git a/src/test/java/com/google/api/generator/gapic/dummy/goldens/BUILD.bazel b/src/test/java/com/google/api/generator/gapic/dummy/goldens/BUILD.bazel deleted file mode 100644 index 85ac1a519e..0000000000 --- a/src/test/java/com/google/api/generator/gapic/dummy/goldens/BUILD.bazel +++ /dev/null @@ -1,6 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -filegroup( - name = "goldens_files", - srcs = glob(["*.golden"]), -) diff --git a/src/test/java/com/google/api/generator/gapic/dummy/goldens/FileDiffInfraDummyTestClassWithHeader.golden b/src/test/java/com/google/api/generator/gapic/dummy/goldens/FileDiffInfraDummyTestClassWithHeader.golden deleted file mode 100644 index ad531d6d09..0000000000 --- a/src/test/java/com/google/api/generator/gapic/dummy/goldens/FileDiffInfraDummyTestClassWithHeader.golden +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright 2020 Google LLC - * - * Licensed 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 - * - * https://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 com.google.showcase.v1beta1.stub; - -public class EchoStubSettings {} diff --git a/src/test/java/com/google/api/generator/gapic/dummy/goldens/FileDiffInfraDummyTestSimpleClass.golden b/src/test/java/com/google/api/generator/gapic/dummy/goldens/FileDiffInfraDummyTestSimpleClass.golden deleted file mode 100644 index 82eb2e6b92..0000000000 --- a/src/test/java/com/google/api/generator/gapic/dummy/goldens/FileDiffInfraDummyTestSimpleClass.golden +++ /dev/null @@ -1,4 +0,0 @@ -package com.google.showcase.v1beta1.stub; - -// This is a test class for file-diff infra -public class EchoStubSettings {}