Skip to content
This repository was archived by the owner on Oct 15, 2023. It is now read-only.

Commit 8e0993c

Browse files
authored
v0.4.12: LatestRelease <- Development
Merge pull request #41 from NineNineFive/Development
2 parents 67008aa + 5178b01 commit 8e0993c

File tree

6 files changed

+95
-12
lines changed

6 files changed

+95
-12
lines changed

launcher/chromeLauncher.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,12 @@ func (launcher *ChromeLauncher) launchForWindows() bool {
6565

6666
// Start frontend by starting a new Chrome process
6767
path := "C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe"
68-
// TODO: see if --user-data-dir can be removed
68+
6969
cmd := exec.Command(path, "--app=http://"+fileserver.GetServerAddress(), "--user-data-dir="+launcher.FrontendInstallLocation)
70-
cmd.Start()
70+
err := cmd.Start()
71+
if err != nil {
72+
println("Warning: Chrome could not start, is it installed?")
73+
}
7174

7275
// Set up a signal handler to gracefully shutdown the program, when it should shutdown
7376
signalHandler := make(chan os.Signal, 1)

tests/main/main.go

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
var organisationName = "NewOrganisationName" // put in organisation name
1313
var projectName = "NewProjectName" // put in project name
1414

15-
var frontendPath = "./frontend" // this should be set to where frontend files is (frontend folder: html, css, javascript...)
15+
var frontendPath = "./tests/main/frontend" // this should be set to where frontend files is (frontend folder: html, css, javascript...)
1616

1717
var chromeLauncher = launcher.ChromeLauncher{
1818
Location: "C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe",
@@ -25,15 +25,6 @@ var chromeLauncher = launcher.ChromeLauncher{
2525
}
2626

2727
var chromiumLauncher = launcher.DefaultChromiumLauncher // default chrome or chromium launcher settings can be used like this
28-
/* // Otherwise they can also be customized like this
29-
var chromiumLauncher = launcher.ChromiumLauncher{
30-
Location: "/var/lib/snapd/desktop/applications/chromium_chromium.desktop", // TODO: check if better location or can be customised
31-
Domain: "localhost",
32-
PortMin: 11430,
33-
PreferredPort: 11451,
34-
PortMax: 11500,
35-
}
36-
*/
3728

3829
func main() {
3930
launchApp()

tests/main/main_test.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package main
2+
3+
import (
4+
"testing"
5+
)
6+
7+
func TestLaunchApp(test *testing.T) {
8+
var err error
9+
10+
// TODO: let launchApp return an error, if it could not open app correctly
11+
launchApp()
12+
if err != nil {
13+
test.Errorf("failed")
14+
}
15+
16+
}

tests/utils/net/port_test.go

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package utils
2+
3+
import (
4+
"github.com/NineNineFive/go-local-web-gui/utils/net"
5+
"strconv"
6+
"testing"
7+
)
8+
9+
func BenchmarkGetInt(benchmark *testing.B) {
10+
// Reset the timer before running the code
11+
benchmark.ResetTimer()
12+
13+
// Run the code b.N times
14+
for i := 0; i < benchmark.N; i++ {
15+
for j := 11450; j < 11453; j++ {
16+
net.IsPortUsed("localhost", strconv.Itoa(j))
17+
}
18+
}
19+
}
20+
21+
func TestPortIsUsed(test *testing.T) {
22+
for i := 11450; i < 11453; i++ {
23+
net.IsPortUsed("localhost", strconv.Itoa(i))
24+
}
25+
}

tests/utils/random/random_test.go

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package random
2+
3+
import (
4+
"github.com/NineNineFive/go-local-web-gui/utils/random"
5+
"testing"
6+
)
7+
8+
func TestGetInt(test *testing.T) {
9+
// Set the random seed to a fixed value to make the test deterministic
10+
random.SetRandomSeed(0)
11+
12+
for i := 0; i < 100; i++ { // modify amount of tries
13+
// Call the function that returns the value to be tested
14+
value := random.GetInt(10000, 10100)
15+
16+
// Check if the value is within the range of 10000 and 10100
17+
if value < 10000 || value > 10100 {
18+
test.Errorf("Value returned is outside the range of 10000 and 10100. Value: %d", value)
19+
}
20+
//println(value) // uncomment to check values
21+
}
22+
23+
}

tests/utils_test.go

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package utils
2+
3+
import (
4+
"github.com/NineNineFive/go-local-web-gui/utils"
5+
"reflect"
6+
"testing"
7+
)
8+
9+
func BenchmarkToString(benchmark *testing.B) {
10+
// Reset the timer before running the code
11+
benchmark.ResetTimer()
12+
13+
// Run the code b.N times
14+
for i := 0; i < benchmark.N; i++ {
15+
utils.IntegerToString(50)
16+
}
17+
}
18+
19+
func TestIntegerToString(test *testing.T) {
20+
newString := utils.IntegerToString(50)
21+
if reflect.TypeOf(newString).Kind() != reflect.String {
22+
test.Error("not a string")
23+
}
24+
println(newString)
25+
}

0 commit comments

Comments
 (0)