Skip to content

Commit

Permalink
Merge pull request #19 from kcmvp/td
Browse files Browse the repository at this point in the history 
#11: add test for artifact
  • Loading branch information
@kcmvp
kcmvp authored May 13, 2024
2 parents d920770 + a429d36 commit 37e139b
Show file tree
Hide file tree
Showing 4 changed files with 79 additions and 50 deletions.
23 changes: 0 additions & 23 deletions internal/artifact.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,6 @@ func Arch() *Artifact {
return arch
}

func CleanStr(str string) string {
cleanStr := func(r rune) rune {
if r >= 32 && r != 127 {
return r
}
return -1
}
return strings.Map(cleanStr, str)
}

func PkgPattern(path string) (*regexp.Regexp, error) {
p := `^(?:[a-zA-Z]+(?:\.[a-zA-Z]+)*|\.\.\.)$`
re := regexp.MustCompile(p)
Expand Down Expand Up @@ -154,19 +144,6 @@ func (artifact *Artifact) AllSources() []string {
return files
}

//func (artifact *Artifact) AllInterfaces() []*types.Interface {
// var interfaces []*types.Interface
// for _, pkg := range artifact.Packages() {
// interfaces = append(interfaces, lo.FilterMap(pkg.types, func(typ Type, _ int) (*types.Interface, bool) {
// if typ.interfaces {
// return typ.named.Underlying().(*types.Interface), true
// }
// return nil, false
// })...)
// }
// return interfaces
//}

func (artifact *Artifact) Types() []Type {
var types []Type
for _, pkg := range artifact.pkgs {
Expand Down
100 changes: 78 additions & 22 deletions internal/artifact_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,26 +87,24 @@ func TestPackage_Functions(t *testing.T) {
{
pkg: "github.com/kcmvp/archunit/internal",
funcs: []string{"github.com/kcmvp/archunit/internal.Arch",
"github.com/kcmvp/archunit/internal.CleanStr",
"github.com/kcmvp/archunit/internal.PkgPattern",
"github.com/kcmvp/archunit/internal.function"},
exists: true,
},
{
pkg: "github.com/kcmvp/archunit",
funcs: []string{"github.com/kcmvp/archunit.BeLowerCase",
"github.com/kcmvp/archunit.BeUpperCase",
funcs: []string{"github.com/kcmvp/archunit.LowerCase",
"github.com/kcmvp/archunit.UpperCase",
"github.com/kcmvp/archunit.ConstantsShouldBeDefinedInOneFileByPackage",
"github.com/kcmvp/archunit.HavePrefix",
"github.com/kcmvp/archunit.HaveSuffix",
"github.com/kcmvp/archunit.MethodsOfTypeShouldBeDefinedInSameFile",
"github.com/kcmvp/archunit.PackageNameShould",
"github.com/kcmvp/archunit.PackageNameShouldBe",
"github.com/kcmvp/archunit.PackageNameShouldBeSameAsFolderName",
"github.com/kcmvp/archunit.Packages",
"github.com/kcmvp/archunit.SourceNameShould",
"github.com/kcmvp/archunit.SourceNameShouldBe",
"github.com/kcmvp/archunit.TypeEmbeddedWith",
"github.com/kcmvp/archunit.TypeImplement",
"github.com/kcmvp/archunit.exportedMustBeReferenced",
},
exists: true,
},
Expand Down Expand Up @@ -138,8 +136,9 @@ func TestPackage_Functions(t *testing.T) {
funcs := lo.Map(pkg.Functions(), func(item Function, _ int) string {
return item.A
})
assert.Equal(t, len(test.funcs), len(funcs))
assert.True(t, len(test.funcs) == 0 || lo.Some(funcs, test.funcs))
assert.ElementsMatch(t, test.funcs, funcs)
//assert.Equal(t, len(test.funcs), len(funcs))
//assert.True(t, len(test.funcs) == 0 || lo.Some(funcs, test.funcs))
}
})
}
Expand All @@ -160,7 +159,7 @@ func TestFunctionsOfType(t *testing.T) {
functions: []string{
"(github.com/kcmvp/archunit/internal/sample/service.UserService).GetUserById",
"(github.com/kcmvp/archunit/internal/sample/service.UserService).GetUserByNameAndAddress",
"(github.com/kcmvp/archunit/internal/sample/service.UserService).SearchUsersByFirsName",
"(github.com/kcmvp/archunit/internal/sample/service.UserService).SearchUsersByFirstName",
"(*github.com/kcmvp/archunit/internal/sample/service.UserService).SearchUsersByLastName"},
},
{
Expand All @@ -170,26 +169,83 @@ func TestFunctionsOfType(t *testing.T) {
"(github.com/kcmvp/archunit/internal/sample/service.NameService).LastNameI",
},
},
{
typName: "internal/sample/service.NameService1",
functions: []string{},
},
}
for _, test := range tests {
t.Run(test.typName, func(t *testing.T) {
fs := lo.Map(Arch().FunctionsOfType(test.typName), func(item Function, _ int) string {
functions := Arch().FunctionsOfType(test.typName)
fs := lo.Map(functions, func(item Function, _ int) string {
return item.Name()
})
assert.Equal(t, test.functions, fs)
assert.ElementsMatch(t, test.functions, fs)
if f, ok := lo.Find(functions, func(item Function) bool {
return strings.HasSuffix(item.Name(), "service.UserService).SearchUsersByFirstName")
}); ok {
assert.Equal(t, f.Params(), []Param{
{"firstName", "string"},
})
assert.Equal(t, f.Returns(), []string{
"error", "[]github.com/kcmvp/archunit/internal/sample/model.User",
})
}

})
}
}

func TestArtifact_AllInterfaces(t *testing.T) {
//assert.Equal(t, 3, len(Arch().AllInterfaces()))
//assert.True(t, lo.SomeBy(lo.Map(Arch().AllInterfaces(), func(item lo.Tuple2[string, *types.Interface], _ int) string {
// return item.A
//}), func(itn string) bool {
// return lo.Contains([]string{
// "github.com/kcmvp/archunit/internal/sample.A",
// "github.com/kcmvp/archunit/internal/sample.AB",
// "github.com/kcmvp/archunit/internal/sample/service.NameService",
// }, itn)
//}))
func TestArtifact_AllPackages(t *testing.T) {
allPkgs := lo.Map(Arch().AllPackages(), func(item lo.Tuple2[string, string], _ int) string {
return item.A
})
expPkgs := []string{"github.com/kcmvp/archunit/internal",
"github.com/kcmvp/archunit",
"github.com/kcmvp/archunit/internal/sample/model",
"github.com/kcmvp/archunit/internal/sample/repository",
"github.com/kcmvp/archunit/internal/sample/service",
"github.com/kcmvp/archunit/internal/sample/vutil",
"github.com/kcmvp/archunit/internal/sample/views",
"github.com/kcmvp/archunit/internal/sample/controller",
"github.com/kcmvp/archunit/internal/sample/service/ext/v1",
"github.com/kcmvp/archunit/internal/sample/controller/module1",
"github.com/kcmvp/archunit/internal/sample/repository/ext",
"github.com/kcmvp/archunit/internal/sample/service/ext",
"github.com/kcmvp/archunit/internal/sample/service/ext/v2",
"github.com/kcmvp/archunit/internal/sample/service/thirdparty"}
assert.Equal(t, 14, len(allPkgs))
assert.ElementsMatch(t, expPkgs, allPkgs)
}

func TestPkgTypes(t *testing.T) {
tests := []struct {
pkgName string
typs []string
valid bool
}{
{
pkgName: "github.com/kcmvp/archunit/internal",
typs: []string{
"github.com/kcmvp/archunit/internal.Artifact",
"github.com/kcmvp/archunit/internal.Function",
"github.com/kcmvp/archunit/internal.Package",
"github.com/kcmvp/archunit/internal.Param",
"github.com/kcmvp/archunit/internal.Type",
},
valid: true,
},
}
for _, test := range tests {
t.Run(test.pkgName, func(t *testing.T) {
pkg, ok := Arch().Package(test.pkgName)
assert.Equal(t, ok, test.valid)
assert.Equal(t, 5, len(pkg.Types()))
typs := lo.Map(pkg.Types(), func(item Type, _ int) string {
return item.Name()
})
assert.ElementsMatch(t, test.typs, typs)
assert.Equal(t, 1, len(pkg.GoFiles()))
})
}
}
2 changes: 1 addition & 1 deletion internal/sample/service/user_service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func (receiver UserService) GetUserByNameAndAddress(name, address string) (model
panic("for test")
}

func (receiver UserService) SearchUsersByFirsName(firstName string) ([]model.User, error) {
func (receiver UserService) SearchUsersByFirstName(firstName string) ([]model.User, error) {
panic("for test")
}

Expand Down
4 changes: 0 additions & 4 deletions layer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,6 @@ func SourceNameShouldBe(pattern NamePattern, args ...string) error {
return nil
}

func exportedMustBeReferenced() error {
panic("to be implemented")
}

func MethodsOfTypeShouldBeDefinedInSameFile() error {
for _, pkg := range internal.Arch().Packages() {
for _, typ := range pkg.Types() {
Expand Down

0 comments on commit 37e139b

Please sign in to comment.