CovenantSQL · laodouya · May 21, 2019 · May 23, 2019 · May 24, 2019 · May 24, 2019
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -46,6 +46,7 @@
 
 [[override]]
   name = "github.com/gohxs/readline"
+  source = "github.com/CovenantSQL/readline"
   branch = "master"
 
 [[override]]

diff --git a/client/driver.go b/client/driver.go
@@ -158,6 +158,15 @@ func Init(configFile string, masterKey []byte) (err error) {
 	return
 }
 
+// UnInit is just for unit test. Do not use it!
+func UnInit() {
+	if !atomic.CompareAndSwapUint32(&driverInitialized, 1, 0) {
+		return
+	}
+
+	stopPeersUpdater()
+}
+
 // Create sends create database operation to block producer.
 func Create(meta ResourceMeta) (txHash hash.Hash, dsn string, err error) {
 	if atomic.LoadUint32(&driverInitialized) == 0 {

diff --git a/cmd/cql/internal/adapter_test.go b/cmd/cql/internal/adapter_test.go
@@ -0,0 +1,43 @@
+// +build !testbinary
+
+/*
+ * Copyright 2018-2019 The CovenantSQL Authors.
+ *
+ * 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 internal
+
+import (
+	"testing"
+
+	"github.com/CovenantSQL/CovenantSQL/client"
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestAdapter(t *testing.T) {
+	Convey("adapter", t, func() {
+		// reset
+		commonVarsReset()
+		adapterAddr = ""
+		adapterUseMirrorAddr = ""
+
+		adapterAddr = "127.0.0.1:9001"
+		configFile = FJ(testWorkingDir, "./bench_testnet/node_c/config.yaml")
+		client.UnInit()
+		configInit()
+		bgServerInit()
+		cancelFunc := startAdapterServer(adapterAddr, adapterUseMirrorAddr)
+		cancelFunc()
+	})
+}
diff --git a/cmd/cql/internal/base_test.go b/cmd/cql/internal/base_test.go
@@ -0,0 +1,85 @@
+// +build !testbinary
+
+/*
+ * Copyright 2018-2019 The CovenantSQL Authors.
+ *
+ * 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 internal
+
+import (
+	"path/filepath"
+	"testing"
+
+	"github.com/CovenantSQL/CovenantSQL/utils"
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+var (
+	FJ             = filepath.Join
+	baseDir        = utils.GetProjectSrcDir()
+	testWorkingDir = FJ(baseDir, "./test/")
+)
+
+func commonVarsReset() {
+	// common flags
+	help = false
+	withPassword = false
+	password = ""
+	consoleLogLevel = "info"
+
+	// config flags
+	configFile = "~/.cql/config.yaml"
+	waitTxConfirmationMaxDuration = 0
+
+	// wait flag
+	waitTxConfirmation = false
+
+	// bg server flags
+	tmpPath = ""
+	bgLogLevel = "info"
+
+	// reset exit status
+	SetExitStatus(0)
+}
+
+func TestBase(t *testing.T) {
+	cmd := Command{
+		UsageLine: "cql generate",
+	}
+
+	Convey("LongName", t, func() {
+		longName := cmd.LongName()
+		So(longName, ShouldResemble, "generate")
+	})
+
+	Convey("Name", t, func() {
+		name := cmd.Name()
+		So(name, ShouldResemble, "generate")
+	})
+
+	//Convey("Usage", t, func() {
+	//	go cmd.Usage()
+	//	time.Sleep(1 * time.Second)
+	//})
+
+	//Convey("Exit", t, func() {
+	//	go func() {
+	//		SetExitStatus(1)
+	//		AtExit(func() {})
+	//		ExitIfErrors()
+	//	}()
+	//	time.Sleep(1 * time.Second)
+	//})
+}
diff --git a/cmd/cql/internal/console_test.go b/cmd/cql/internal/console_test.go
@@ -0,0 +1,48 @@
+// +build !testbinary
+
+/*
+ * Copyright 2018-2019 The CovenantSQL Authors.
+ *
+ * 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 internal
+
+import (
+	"testing"
+
+	"github.com/CovenantSQL/CovenantSQL/client"
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestConsole(t *testing.T) {
+	Convey("console", t, func() {
+		// reset
+		commonVarsReset()
+		variables = varsFlag{}
+		dsn = ""
+		outFile = ""
+		noRC = false
+		singleTransaction = false
+		command = ""
+		fileName = ""
+		adapterAddr = ""
+		explorerAddr = ""
+		client.UnInit()
+
+		dsn = "covenantsql://c9e8b381aa466a8d9955701967ad5535e7899ab138b8674ab14b31b75c64b656"
+		command = "select 1 from test1;"
+		configFile = FJ(testWorkingDir, "./bench_testnet/node_c/config.yaml")
+		runConsole(CmdConsole, []string{dsn})
+	})
+}
diff --git a/cmd/cql/internal/create_test.go b/cmd/cql/internal/create_test.go
@@ -0,0 +1,54 @@
+// +build !testbinary
+
+/*
+ * Copyright 2018-2019 The CovenantSQL Authors.
+ *
+ * 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 internal
+
+import (
+	"testing"
+
+	"github.com/CovenantSQL/CovenantSQL/client"
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestCreate(t *testing.T) {
+	Convey("create", t, func() {
+		// reset
+		commonVarsReset()
+		targetMiners = List{}
+		node32 = 0
+		meta = client.ResourceMeta{}
+		client.UnInit()
+
+		//targetMiners = List{[]string{"000005aa62048f85da4ae9698ed59c14ec0d48a88a07c15a32265634e7e64ade", "000005f4f22c06f76c43c4f48d5a7ec1309cc94030cbf9ebae814172884ac8b5"}}
+		node32 = 1
+		// waitTxConfirmation = true
+		configFile = FJ(testWorkingDir, "./bench_testnet/node_c/config.yaml")
+		jsonStr := `
+			{
+					"loadavgpercpu": 0,
+					"encryptionkey": "",
+					"useeventualconsistency": false,
+					"consistencylevel": 1,
+					"isolationlevel": 1,
+					"gasprice": 1,
+					"advancepayment": 20000000
+			}
+		`
+		runCreate(CmdCreate, []string{jsonStr})
+	})
+}
diff --git a/cmd/cql/internal/drop.go b/cmd/cql/internal/drop.go
@@ -71,22 +71,22 @@ func runDrop(cmd *Command, args []string) {
 		return
 	}
 
-	txHash, err := client.Drop(dsn)
+	_, err := client.Drop(dsn)
 	if err != nil {
 		// drop database failed
 		ConsoleLog.WithField("db", dsn).WithError(err).Error("drop database failed")
 		SetExitStatus(1)
 		return
 	}
 
-	if waitTxConfirmation {
-		err = wait(txHash)
-		if err != nil {
-			ConsoleLog.WithField("db", dsn).WithError(err).Error("drop database failed")
-			SetExitStatus(1)
-			return
-		}
-	}
+	//if waitTxConfirmation {
+	//	err = wait(txHash)
+	//	if err != nil {
+	//		ConsoleLog.WithField("db", dsn).WithError(err).Error("drop database failed")
+	//		SetExitStatus(1)
+	//		return
+	//	}
+	//}
 
 	// drop database success
 	ConsoleLog.Infof("drop database %#v success", dsn)

diff --git a/cmd/cql/internal/drop_test.go b/cmd/cql/internal/drop_test.go
@@ -0,0 +1,39 @@
+// +build !testbinary
+
+/*
+ * Copyright 2018 The CovenantSQL Authors.
+ *
+ * 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 internal
+
+import (
+	"testing"
+
+	"github.com/CovenantSQL/CovenantSQL/client"
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestDrop(t *testing.T) {
+	Convey("drop", t, func() {
+		// reset
+		commonVarsReset()
+		client.UnInit()
+
+		dsn = "covenantsql://c9e8b381aa466a8d9955701967ad5535e7899ab138b8674ab14b31b75c64b656"
+		waitTxConfirmation = true
+		configFile = FJ(testWorkingDir, "./bench_testnet/node_c/config.yaml")
+		runDrop(CmdDrop, []string{dsn})
+	})
+}
diff --git a/cmd/cql/internal/explorer_test.go b/cmd/cql/internal/explorer_test.go
@@ -0,0 +1,44 @@
+// +build !testbinary
+
+/*
+ * Copyright 2018-2019 The CovenantSQL Authors.
+ *
+ * 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 internal
+
+import (
+	"testing"
+
+	"github.com/CovenantSQL/CovenantSQL/client"
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestExplorer(t *testing.T) {
+	Convey("explorer", t, func() {
+		// reset
+		commonVarsReset()
+		explorerAddr = ""
+		explorerService = nil
+		explorerHTTPServer = nil
+		client.UnInit()
+
+		explorerAddr = "127.0.0.1:9002"
+		configFile = FJ(testWorkingDir, "./bench_testnet/node_c/config.yaml")
+		configInit()
+		bgServerInit()
+		cancelFunc := startExplorerServer(explorerAddr)
+		cancelFunc()
+	})
+}