-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Restructuring btconnect private methods for better testing
- Loading branch information
1 parent
2a04082
commit c773df7
Showing
6 changed files
with
238 additions
and
219 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,113 +1 @@ | ||
| package btconnect_test | ||
|
|
||
| import ( | ||
| "os" | ||
| "path/filepath" | ||
| "testing" | ||
|
|
||
| btconnect "aaronromeo.com/rfid-jukebox/system/bin/btconnect" | ||
| ) | ||
|
|
||
| func TestFilesAreDifferent(t *testing.T) { | ||
| service := &btconnect.Service{} | ||
|
|
||
| // Test 1: Two identical files | ||
| err := os.WriteFile("test1.txt", []byte("test"), 0644) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| err = os.WriteFile("test2.txt", []byte("test"), 0644) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| diff, err := service.FilesAreDifferent("test1.txt", "test2.txt") | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if diff { | ||
| t.Errorf("Expected files to be identical, but they were different") | ||
| } | ||
|
|
||
| // Test 2: Two different files | ||
| err = os.WriteFile("test2.txt", []byte("test2"), 0644) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| diff, err = service.FilesAreDifferent("test1.txt", "test2.txt") | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if !diff { | ||
| t.Errorf("Expected files to be different, but they were identical") | ||
| } | ||
|
|
||
| // Test 3: File does not exist | ||
| _, err = service.FilesAreDifferent("test1.txt", "nonexistent.txt") | ||
| if err == nil { | ||
| t.Errorf("Expected error, but got none") | ||
| } | ||
|
|
||
| // Cleanup | ||
| os.Remove("test1.txt") | ||
| os.Remove("test2.txt") | ||
| } | ||
|
|
||
| func TestHasALSAConfigChanged(t *testing.T) { | ||
| service := &btconnect.Service{} | ||
|
|
||
| // Setup test files | ||
| testDir, err := os.MkdirTemp(".", "test_data") | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| defer os.RemoveAll(testDir) | ||
| err = os.MkdirAll(filepath.Join(testDir, "system", "home"), 0755) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| testSystemConfig := filepath.Join(testDir, "system.asoundrc") | ||
| testRepoConfig := filepath.Join(filepath.Join(testDir, "system", "home"), ".asoundrc") | ||
|
|
||
| t.Setenv("PJ_ALSA_CONFIG", testSystemConfig) | ||
| t.Setenv("PJ_PROJECT_ROOT", testDir) | ||
|
|
||
| // Test 1: Identical Files | ||
| err = os.WriteFile(testSystemConfig, []byte("test config"), 0644) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| err = os.WriteFile(testRepoConfig, []byte("test config"), 0644) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| diff, err := service.HasALSAConfigChanged() | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if diff { | ||
| t.Errorf("Expected ALSA configs to be identical, but they were reported as different") | ||
| } | ||
|
|
||
| // Test 2: Different Files | ||
| err = os.WriteFile(testRepoConfig, []byte("different config"), 0644) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| diff, err = service.HasALSAConfigChanged() | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if !diff { | ||
| t.Errorf("Expected ALSA configs to be different, but they were reported as identical") | ||
| } | ||
|
|
||
| // Test 3: File Does Not Exist | ||
| os.Remove(testRepoConfig) | ||
| _, err = service.HasALSAConfigChanged() | ||
| if err == nil { | ||
| t.Errorf("Expected error for missing file, but got none") | ||
| } | ||
|
|
||
| // Optionally, add more tests for scenarios with environment variables set | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| package helper | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "log" | ||
| "os" | ||
| "path/filepath" | ||
| ) | ||
|
|
||
| const DefaultASLAConfig = "/home/pi/.asoundrc" | ||
| const DefaultProjectRoot = "/home/pi/workspace/pyrfid-jukebox" | ||
| const DefaultRelativeASLAConfig = "/system/home/.asoundrc" | ||
|
|
||
| func UpdateALSAConfig(cmdExecutor CommandExecutor) error { | ||
| if hasChanged, errHC := HasALSAConfigChanged(); errHC != nil { | ||
| return errHC | ||
| } else if hasChanged { | ||
| log.Println("ALSA config has changed. Copying over system config...") | ||
|
|
||
| aslaConfig := GetALSASystemConfig() | ||
| projectAslaConfig := GetALSARepoConfig() | ||
|
|
||
| if err := CopyFile(aslaConfig, projectAslaConfig); err != nil { | ||
| log.Printf("Error copying file: %v", err) | ||
| return err | ||
| } | ||
|
|
||
| if err := cmdExecutor.Command("sudo", "alsactl", "restore").Run(); err != nil { | ||
| log.Printf("Error executing alsactl restore: %v", err) | ||
| return err | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func HasALSAConfigChanged() (bool, error) { | ||
| aslaConfig := GetALSASystemConfig() | ||
| projectAslaConfig := GetALSARepoConfig() | ||
|
|
||
| var diff bool | ||
| var err error | ||
| if diff, err = FilesAreDifferent(aslaConfig, projectAslaConfig); err != nil { | ||
| return false, err | ||
| } | ||
| return diff, nil | ||
| } | ||
|
|
||
| func CopyFile(src, dst string) error { | ||
| input, err := os.ReadFile(src) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| err = os.WriteFile(dst, input, 0600) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func GetALSASystemConfig() string { | ||
| aslaConfig := os.Getenv("PJ_ALSA_CONFIG") | ||
| if aslaConfig == "" { | ||
| aslaConfig = DefaultASLAConfig | ||
| } | ||
| return aslaConfig | ||
| } | ||
|
|
||
| func GetALSARepoConfig() string { | ||
| projectRoot := os.Getenv("PJ_PROJECT_ROOT") | ||
| if projectRoot == "" { | ||
| projectRoot = DefaultProjectRoot | ||
| } | ||
| return filepath.Join(projectRoot, DefaultRelativeASLAConfig) | ||
| } | ||
|
|
||
| func FilesAreDifferent(file1, file2 string) (bool, error) { | ||
| bytes1, err := os.ReadFile(file1) | ||
| if err != nil { | ||
| return false, err | ||
| } | ||
|
|
||
| bytes2, err := os.ReadFile(file2) | ||
| if err != nil { | ||
| return false, err | ||
| } | ||
|
|
||
| return !bytes.Equal(bytes1, bytes2), nil | ||
| } |
Oops, something went wrong.