Merge branch 'master' of https://gitee.com/290198252/background into master

master
zcy 2020-11-12 12:08:31 +08:00
commit 32bc2f6c5e
2 changed files with 30 additions and 6 deletions

23
test/git_test.go Normal file
View File

@ -0,0 +1,23 @@
package test
import (
"log"
"testing"
"github.com/sergi/go-diff/diffmatchpatch"
)
const (
text1 = "Lorem ipsum dolor."
text2 = "Lorem dolor sit amet. sdfsdfsd"
)
func TestDiff(t *testing.T) {
dmp := diffmatchpatch.New()
diffs := dmp.DiffMain(text1, text2, false)
log.Print(diffs)
prettydiff := dmp.DiffPrettyText(diffs)
log.Print(prettydiff)
}

View File

@ -8,6 +8,7 @@ import (
"log"
"testing"
)
func InitConfig() {
e := config.Init("user.yaml")
if nil != e {
@ -29,16 +30,16 @@ func InitRedisConfig() {
return
}
}
func InitElasticSearch(){
e := db.GetElastic().CreateIndex("hardware",model.HardwareTypeMapping())
if nil != e{
func InitElasticSearch() {
e := db.GetElastic().CreateIndex("hardware", model.HardwareTypeMapping())
if nil != e {
}
}
func InitLogs() {
logs.Init(config.GetLogConfig().Dir, config.GetLogConfig().File, config.GetLogConfig().Level, config.GetLogConfig().SaveFile)
}
func TestPortDocToElastic(t *testing.T) {
func TestPortDocToElastic(t *testing.T) {
InitConfig()
InitLogs()
InitRedisConfig()
@ -46,7 +47,7 @@ func TestPortDocToElastic(t *testing.T) {
InitElasticSearch()
db.InitELK()
e := model.PortDocumentToElasticsearch("doc")
if nil != e{
if nil != e {
t.Error(e)
}
}
}