parent
8cc5fe1f01
commit
1dbd52c5cd
|
@ -46,6 +46,7 @@ type Owner struct {
|
||||||
type System struct {
|
type System struct {
|
||||||
SiteCode string `json:"site_code,omitempty"`
|
SiteCode string `json:"site_code,omitempty"`
|
||||||
DomainCode string `json:"domain_code,omitempty"`
|
DomainCode string `json:"domain_code,omitempty"`
|
||||||
|
PrimaryDomainCode string `json:"primary_domain_code,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Location struct
|
// Location struct
|
||||||
|
|
|
@ -39,13 +39,13 @@ func TestStart(t *testing.T) {
|
||||||
},
|
},
|
||||||
"b": nil,
|
"b": nil,
|
||||||
"c": []map[string]interface{}{
|
"c": []map[string]interface{}{
|
||||||
map[string]interface{}{
|
{
|
||||||
"path": "c1",
|
"path": "c1",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
// fetch continue command in Connect
|
// fetch continue command in Connect
|
||||||
"d": []map[string]interface{}{
|
"d": []map[string]interface{}{
|
||||||
map[string]interface{}{
|
{
|
||||||
"path": "d0",
|
"path": "d0",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
@ -50,28 +50,28 @@ func TestStart(t *testing.T) {
|
||||||
})
|
})
|
||||||
allOutput, err := Register(map[string]interface{}{
|
allOutput, err := Register(map[string]interface{}{
|
||||||
"a": []map[string]interface{}{
|
"a": []map[string]interface{}{
|
||||||
map[string]interface{}{
|
{
|
||||||
"enable": false,
|
"enable": false,
|
||||||
"path": "a1",
|
"path": "a1",
|
||||||
},
|
},
|
||||||
map[string]interface{}{
|
{
|
||||||
"path": "a2",
|
"path": "a2",
|
||||||
},
|
},
|
||||||
map[string]interface{}{
|
{
|
||||||
"enable": true,
|
"enable": true,
|
||||||
"path": "a3",
|
"path": "a3",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"b": nil,
|
"b": nil,
|
||||||
"c": []map[string]interface{}{
|
"c": []map[string]interface{}{
|
||||||
map[string]interface{}{
|
{
|
||||||
"path": "c1",
|
"path": "c1",
|
||||||
"filter": map[string]interface{}{},
|
"filter": map[string]interface{}{},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
// fetch continue command in Connect
|
// fetch continue command in Connect
|
||||||
"d": []map[string]interface{}{
|
"d": []map[string]interface{}{
|
||||||
map[string]interface{}{
|
{
|
||||||
"path": "d0",
|
"path": "d0",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
@ -3,9 +3,15 @@ package inarea
|
||||||
import (
|
import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
"github.com/FreifunkBremen/yanic/data"
|
"github.com/FreifunkBremen/yanic/data"
|
||||||
"github.com/FreifunkBremen/yanic/runtime"
|
"github.com/FreifunkBremen/yanic/runtime"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
|
=======
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"yanic/data"
|
||||||
|
"yanic/runtime"
|
||||||
|
>>>>>>> 64b9cfe (add primary_domain_dode)
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestFilterInArea(t *testing.T) {
|
func TestFilterInArea(t *testing.T) {
|
||||||
|
|
Loading…
Reference in New Issue