Skip to content

Commit e63e10b

Browse files
committed
Improve one test and make some utils faster
1 parent ec6fa8f commit e63e10b

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

lib/protobuf/protoc/generator/util.ex

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ defmodule Protobuf.Protoc.Generator.Util do
4444
def normalize_type_name(name) do
4545
name
4646
|> String.split(".")
47-
|> Enum.map(&Macro.camelize(&1))
48-
|> Enum.join(".")
47+
|> Enum.map_join(".", &trans_name/1)
4948
end
5049

5150
def print(v) when is_atom(v), do: inspect(v)

test/protobuf/protoc/generator/enum_test.exs

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,28 @@ defmodule Protobuf.Protoc.Generator.EnumTest do
1212
options: nil,
1313
value: [
1414
Google.Protobuf.EnumValueDescriptorProto.new(name: "A", number: 0),
15-
Google.Protobuf.EnumValueDescriptorProto.new(name: "B", number: 1)
15+
Google.Protobuf.EnumValueDescriptorProto.new(name: "B", number: 1),
16+
Google.Protobuf.EnumValueDescriptorProto.new(name: "HAS_UNDERSCORES", number: 2),
17+
Google.Protobuf.EnumValueDescriptorProto.new(name: "HAS_UNDERSCORES_X", number: 3),
18+
Google.Protobuf.EnumValueDescriptorProto.new(name: "HAS_UNDERSCORES_", number: 4)
1619
]
1720
}
1821

1922
msg = Generator.generate(ctx, desc)
2023
assert msg =~ "defmodule EnumFoo do\n"
2124
assert msg =~ "use Protobuf, enum: true\n"
22-
assert msg =~ "@type t :: integer | :A | :B\n"
25+
26+
assert msg =~
27+
"@type t :: integer | :A | :B | :HAS_UNDERSCORES | :HAS_UNDERSCORES_X | :HAS_UNDERSCORES_\n"
28+
2329
refute msg =~ "defstruct "
24-
assert msg =~ "field :A, 0\n field :B, 1\n"
30+
31+
assert msg =~ """
32+
field :A, 0
33+
field :B, 1
34+
field :HAS_UNDERSCORES, 2
35+
field :HAS_UNDERSCORES_X, 3
36+
field :HAS_UNDERSCORES_, 4
37+
"""
2538
end
2639
end

0 commit comments

Comments
 (0)