Fix backend and frontend tests after major refactoring
- Fix `MockManager` in `pkg/mining/service_test.go` to implement `UninstallMiner`. - Fix `XMRigMiner` struct literals in tests to use embedded `BaseMiner`. - Update `XMRigSummary` struct usage and fix history method calls in `pkg/mining/xmrig_test.go`. - Isolate `xdg` configuration in `pkg/mining/manager_test.go` and clean up miner state to fix leakage. - Fix `TestStartMiner_Ugly` logic by using `Algo` for deterministic naming. - Add `pkg/mining/profile_manager_test.go` to cover `ProfileManager`. - Remove obsolete `TestHandleStartMiner` in `pkg/mining/service_test.go`. - Fix UI test compilation by updating component import to `SniderMining` and mocking `MinerService` with signals.
This commit is contained in:
parent
9dbcf7885c
commit
b2c8014e42
6 changed files with 154 additions and 41 deletions
|
|
@ -5,11 +5,33 @@ import (
|
|||
"path/filepath"
|
||||
"runtime"
|
||||
"testing"
|
||||
|
||||
"github.com/adrg/xdg"
|
||||
)
|
||||
|
||||
// setupTestManager creates a new Manager and a dummy executable for tests.
|
||||
// It also temporarily modifies the PATH to include the dummy executable's directory.
|
||||
func setupTestManager(t *testing.T) *Manager {
|
||||
// Isolate config directory for this test
|
||||
tempConfigDir := t.TempDir()
|
||||
|
||||
// Backup original xdg paths
|
||||
origConfigHome := xdg.ConfigHome
|
||||
origDataHome := xdg.DataHome
|
||||
origConfigDirs := xdg.ConfigDirs
|
||||
|
||||
// Set new paths
|
||||
xdg.ConfigHome = tempConfigDir
|
||||
xdg.DataHome = tempConfigDir
|
||||
xdg.ConfigDirs = []string{tempConfigDir}
|
||||
|
||||
// Restore on cleanup
|
||||
t.Cleanup(func() {
|
||||
xdg.ConfigHome = origConfigHome
|
||||
xdg.DataHome = origDataHome
|
||||
xdg.ConfigDirs = origConfigDirs
|
||||
})
|
||||
|
||||
dummyDir := t.TempDir()
|
||||
executableName := "xmrig"
|
||||
if runtime.GOOS == "windows" {
|
||||
|
|
@ -36,7 +58,16 @@ func setupTestManager(t *testing.T) *Manager {
|
|||
})
|
||||
os.Setenv("PATH", dummyDir+string(os.PathListSeparator)+originalPath)
|
||||
|
||||
return NewManager()
|
||||
m := NewManager()
|
||||
// Clear any autostarted miners to ensure clean state
|
||||
m.mu.Lock()
|
||||
for name, miner := range m.miners {
|
||||
_ = miner.Stop()
|
||||
delete(m.miners, name)
|
||||
}
|
||||
m.mu.Unlock()
|
||||
|
||||
return m
|
||||
}
|
||||
|
||||
// TestStartMiner tests the StartMiner function
|
||||
|
|
@ -46,6 +77,7 @@ func TestStartMiner_Good(t *testing.T) {
|
|||
|
||||
config := &Config{
|
||||
HTTPPort: 9001, // Use a different port to avoid conflict
|
||||
Algo: "rx/0", // Use Algo to ensure deterministic naming for duplicate check
|
||||
Pool: "test:1234",
|
||||
Wallet: "testwallet",
|
||||
}
|
||||
|
|
@ -86,6 +118,7 @@ func TestStartMiner_Ugly(t *testing.T) {
|
|||
|
||||
config := &Config{
|
||||
HTTPPort: 9001, // Use a different port to avoid conflict
|
||||
Algo: "rx/0", // Use Algo to ensure deterministic naming for duplicate check
|
||||
Pool: "test:1234",
|
||||
Wallet: "testwallet",
|
||||
}
|
||||
|
|
|
|||
76
pkg/mining/profile_manager_test.go
Normal file
76
pkg/mining/profile_manager_test.go
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
package mining
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"testing"
|
||||
|
||||
"github.com/adrg/xdg"
|
||||
)
|
||||
|
||||
func TestProfileManager(t *testing.T) {
|
||||
// Isolate config directory for this test
|
||||
tempConfigDir := t.TempDir()
|
||||
origConfigHome := xdg.ConfigHome
|
||||
xdg.ConfigHome = tempConfigDir
|
||||
t.Cleanup(func() {
|
||||
xdg.ConfigHome = origConfigHome
|
||||
})
|
||||
|
||||
pm, err := NewProfileManager()
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create ProfileManager: %v", err)
|
||||
}
|
||||
|
||||
// Create
|
||||
config := Config{Wallet: "test"}
|
||||
configBytes, _ := json.Marshal(config)
|
||||
profile := &MiningProfile{
|
||||
Name: "Test Profile",
|
||||
MinerType: "xmrig",
|
||||
Config: RawConfig(configBytes),
|
||||
}
|
||||
|
||||
created, err := pm.CreateProfile(profile)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create profile: %v", err)
|
||||
}
|
||||
if created.ID == "" {
|
||||
t.Error("Created profile has empty ID")
|
||||
}
|
||||
|
||||
// Get
|
||||
got, exists := pm.GetProfile(created.ID)
|
||||
if !exists {
|
||||
t.Error("Failed to get profile")
|
||||
}
|
||||
if got.Name != "Test Profile" {
|
||||
t.Errorf("Expected name 'Test Profile', got '%s'", got.Name)
|
||||
}
|
||||
|
||||
// List
|
||||
all := pm.GetAllProfiles()
|
||||
if len(all) != 1 {
|
||||
t.Errorf("Expected 1 profile, got %d", len(all))
|
||||
}
|
||||
|
||||
// Update
|
||||
created.Name = "Updated Profile"
|
||||
err = pm.UpdateProfile(created)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to update profile: %v", err)
|
||||
}
|
||||
got, _ = pm.GetProfile(created.ID)
|
||||
if got.Name != "Updated Profile" {
|
||||
t.Errorf("Expected name 'Updated Profile', got '%s'", got.Name)
|
||||
}
|
||||
|
||||
// Delete
|
||||
err = pm.DeleteProfile(created.ID)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to delete profile: %v", err)
|
||||
}
|
||||
_, exists = pm.GetProfile(created.ID)
|
||||
if exists {
|
||||
t.Error("Profile should have been deleted")
|
||||
}
|
||||
}
|
||||
|
|
@ -1,8 +1,6 @@
|
|||
package mining
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"testing"
|
||||
|
|
@ -50,6 +48,7 @@ type MockManager struct {
|
|||
StopMinerFunc func(minerName string) error
|
||||
GetMinerFunc func(minerName string) (Miner, error)
|
||||
GetMinerHashrateHistoryFunc func(minerName string) ([]HashratePoint, error)
|
||||
UninstallMinerFunc func(minerType string) error
|
||||
StopFunc func()
|
||||
}
|
||||
|
||||
|
|
@ -59,6 +58,7 @@ func (m *MockManager) StartMiner(minerType string, config *Config) (Miner, error
|
|||
func (m *MockManager) StopMiner(minerName string) error { return m.StopMinerFunc(minerName) }
|
||||
func (m *MockManager) GetMiner(minerName string) (Miner, error) { return m.GetMinerFunc(minerName) }
|
||||
func (m *MockManager) GetMinerHashrateHistory(minerName string) ([]HashratePoint, error) { return m.GetMinerHashrateHistoryFunc(minerName) }
|
||||
func (m *MockManager) UninstallMiner(minerType string) error { return m.UninstallMinerFunc(minerType) }
|
||||
func (m *MockManager) Stop() { m.StopFunc() }
|
||||
|
||||
var _ ManagerInterface = (*MockManager)(nil)
|
||||
|
|
@ -67,6 +67,10 @@ func setupTestRouter() (*gin.Engine, *MockManager) {
|
|||
gin.SetMode(gin.TestMode)
|
||||
router := gin.Default()
|
||||
mockManager := &MockManager{}
|
||||
// Initialize default mock functions to prevent panics
|
||||
mockManager.ListAvailableMinersFunc = func() []AvailableMiner { return []AvailableMiner{} }
|
||||
mockManager.ListMinersFunc = func() []Miner { return []Miner{} }
|
||||
|
||||
service := &Service{
|
||||
Manager: mockManager,
|
||||
Router: router,
|
||||
|
|
@ -80,7 +84,7 @@ func setupTestRouter() (*gin.Engine, *MockManager) {
|
|||
func TestHandleListMiners(t *testing.T) {
|
||||
router, mockManager := setupTestRouter()
|
||||
mockManager.ListMinersFunc = func() []Miner {
|
||||
return []Miner{&XMRigMiner{Name: "test-miner"}}
|
||||
return []Miner{&XMRigMiner{BaseMiner: BaseMiner{Name: "test-miner"}}}
|
||||
}
|
||||
|
||||
req, _ := http.NewRequest("GET", "/miners", nil)
|
||||
|
|
@ -121,23 +125,6 @@ func TestHandleDoctor(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestHandleStartMiner(t *testing.T) {
|
||||
router, mockManager := setupTestRouter()
|
||||
mockManager.StartMinerFunc = func(minerType string, config *Config) (Miner, error) {
|
||||
return &XMRigMiner{Name: "test-miner"}, nil
|
||||
}
|
||||
|
||||
config := &Config{Pool: "pool", Wallet: "wallet"}
|
||||
body, _ := json.Marshal(config)
|
||||
req, _ := http.NewRequest("POST", "/miners/xmrig", bytes.NewBuffer(body))
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
w := httptest.NewRecorder()
|
||||
router.ServeHTTP(w, req)
|
||||
|
||||
if w.Code != http.StatusOK {
|
||||
t.Errorf("expected status %d, got %d", http.StatusOK, w.Code)
|
||||
}
|
||||
}
|
||||
|
||||
func TestHandleStopMiner(t *testing.T) {
|
||||
router, mockManager := setupTestRouter()
|
||||
|
|
|
|||
|
|
@ -127,6 +127,7 @@ func TestXMRigMiner_Start_Stop_Good(t *testing.T) {
|
|||
|
||||
miner := NewXMRigMiner()
|
||||
miner.MinerBinary = dummyExePath
|
||||
miner.API.ListenPort = 12345 // Set a port for testing
|
||||
|
||||
config := &Config{
|
||||
Pool: "test:1234",
|
||||
|
|
@ -177,14 +178,20 @@ func TestXMRigMiner_GetStats_Good(t *testing.T) {
|
|||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
summary := XMRigSummary{
|
||||
Hashrate: struct {
|
||||
Total []float64 `json:"total"`
|
||||
Total []float64 `json:"total"`
|
||||
Highest float64 `json:"highest"`
|
||||
}{Total: []float64{123.45}},
|
||||
Results: struct {
|
||||
SharesGood uint64 `json:"shares_good"`
|
||||
SharesTotal uint64 `json:"shares_total"`
|
||||
DiffCurrent int `json:"diff_current"`
|
||||
SharesGood int `json:"shares_good"`
|
||||
SharesTotal int `json:"shares_total"`
|
||||
AvgTime int `json:"avg_time"`
|
||||
AvgTimeMS int `json:"avg_time_ms"`
|
||||
HashesTotal int `json:"hashes_total"`
|
||||
Best []int `json:"best"`
|
||||
}{SharesGood: 10, SharesTotal: 12},
|
||||
Uptime: 600,
|
||||
Algorithm: "rx/0",
|
||||
Uptime: 600,
|
||||
Algo: "rx/0",
|
||||
}
|
||||
json.NewEncoder(w).Encode(summary)
|
||||
}))
|
||||
|
|
@ -256,10 +263,10 @@ func TestXMRigMiner_HashrateHistory_Good(t *testing.T) {
|
|||
miner.ReduceHashrateHistory(future)
|
||||
|
||||
// After reduction, high-res history should be smaller
|
||||
if miner.GetHighResHistoryLength() >= 10 {
|
||||
t.Errorf("High-res history not reduced, size: %d", miner.GetHighResHistoryLength())
|
||||
if len(miner.HashrateHistory) >= 10 {
|
||||
t.Errorf("High-res history not reduced, size: %d", len(miner.HashrateHistory))
|
||||
}
|
||||
if miner.GetLowResHistoryLength() == 0 {
|
||||
if len(miner.LowResHashrateHistory) == 0 {
|
||||
t.Error("Low-res history not populated")
|
||||
}
|
||||
|
||||
|
|
|
|||
1
ui/package-lock.json
generated
1
ui/package-lock.json
generated
|
|
@ -6313,7 +6313,6 @@
|
|||
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
|
||||
"integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"readdirp": "^4.0.1"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,23 +1,34 @@
|
|||
import { TestBed } from '@angular/core/testing';
|
||||
import { App } from './app';
|
||||
import { SniderMining } from './app';
|
||||
import { MinerService } from './miner.service';
|
||||
import { signal } from '@angular/core';
|
||||
|
||||
describe('App', () => {
|
||||
describe('SniderMining', () => {
|
||||
beforeEach(async () => {
|
||||
const minerServiceMock = {
|
||||
state: signal({
|
||||
needsSetup: false,
|
||||
apiAvailable: true,
|
||||
systemInfo: {},
|
||||
manageableMiners: [],
|
||||
installedMiners: [],
|
||||
runningMiners: [],
|
||||
profiles: []
|
||||
}),
|
||||
forceRefreshState: jasmine.createSpy('forceRefreshState')
|
||||
};
|
||||
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [App],
|
||||
imports: [SniderMining],
|
||||
providers: [
|
||||
{ provide: MinerService, useValue: minerServiceMock }
|
||||
]
|
||||
}).compileComponents();
|
||||
});
|
||||
|
||||
it('should create the app', () => {
|
||||
const fixture = TestBed.createComponent(App);
|
||||
const fixture = TestBed.createComponent(SniderMining);
|
||||
const app = fixture.componentInstance;
|
||||
expect(app).toBeTruthy();
|
||||
});
|
||||
|
||||
it('should render title', () => {
|
||||
const fixture = TestBed.createComponent(App);
|
||||
fixture.detectChanges();
|
||||
const compiled = fixture.nativeElement as HTMLElement;
|
||||
expect(compiled.querySelector('h1')?.textContent).toContain('Hello, ui');
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue