Make clear map function name more concise
Renam resetting the grid to clearMap.
This commit is contained in:
parent
66c273c783
commit
e115ed2f48
3 changed files with 10 additions and 10 deletions
|
@ -18,7 +18,7 @@ class SimulationService {
|
||||||
}
|
}
|
||||||
|
|
||||||
void reset() {
|
void reset() {
|
||||||
_sim.reset();
|
_sim.clearMap();
|
||||||
}
|
}
|
||||||
|
|
||||||
void addRandomPattern() {
|
void addRandomPattern() {
|
||||||
|
|
|
@ -30,12 +30,12 @@ class Simulation {
|
||||||
}
|
}
|
||||||
|
|
||||||
Simulation(int w, int h) : this.map = new Grid(w, h) {
|
Simulation(int w, int h) : this.map = new Grid(w, h) {
|
||||||
this.map = reset();
|
this.map = clearMap();
|
||||||
}
|
}
|
||||||
|
|
||||||
Simulation.fromGrid(Grid<bool> map) : this.map = map;
|
Simulation.fromGrid(Grid<bool> map) : this.map = map;
|
||||||
|
|
||||||
Grid<bool> reset([Grid<bool> map]) {
|
Grid<bool> clearMap(Grid<bool> map) {
|
||||||
map ??= this.map;
|
map ??= this.map;
|
||||||
// dirty = true;
|
// dirty = true;
|
||||||
// map.setAll(0, List.filled(map.length, false));
|
// map.setAll(0, List.filled(map.length, false));
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
import 'dart:math';
|
import 'dart:math';
|
||||||
|
|
||||||
import 'package:mockito/mockito.dart';
|
import 'package:mockito/mockito.dart';
|
||||||
import 'package:rules_of_living/src/Grid.dart';
|
import 'package:rules_of_living/src/Grid.dart';
|
||||||
import 'package:test/test.dart';
|
|
||||||
|
|
||||||
import 'package:rules_of_living/src/Simulation.dart';
|
import 'package:rules_of_living/src/Simulation.dart';
|
||||||
|
import 'package:test/test.dart';
|
||||||
|
|
||||||
class MockGrid extends Mock implements Grid<bool> {}
|
class MockGrid extends Mock implements Grid<bool> {}
|
||||||
|
|
||||||
|
@ -25,20 +25,20 @@ void main() {
|
||||||
var oldMap = sut.map;
|
var oldMap = sut.map;
|
||||||
sut.gridSize = Point(10, 10);
|
sut.gridSize = Point(10, 10);
|
||||||
expect(sut.map, isNot(same(oldMap)));
|
expect(sut.map, isNot(same(oldMap)));
|
||||||
});
|
}, tags: "nobrowser");
|
||||||
});
|
});
|
||||||
group("resetMap", () {
|
group("resetMap", () {
|
||||||
test("sets the internal map filled with 'false' ", () {
|
test("sets the internal map filled with 'false' ", () {
|
||||||
sut.map.set(1, 1, true);
|
sut.map.set(1, 1, true);
|
||||||
sut.reset();
|
sut.clearMap();
|
||||||
expect(sut.map, allOf(TypeMatcher<Grid>(), isNot(contains(true))));
|
expect(sut.map, allOf(TypeMatcher<Grid>(), isNot(contains(true))));
|
||||||
});
|
});
|
||||||
test("sets the simulation to need re-rendering", () {
|
test("sets the simulation to need re-rendering", () {
|
||||||
sut.dirty = false;
|
sut.dirty = false;
|
||||||
sut.reset();
|
sut.clearMap();
|
||||||
expect(sut.dirty, true);
|
expect(sut.dirty, true);
|
||||||
});
|
});
|
||||||
});
|
}, tags: "nobrowser");
|
||||||
group("save&load", () {
|
group("save&load", () {
|
||||||
test(
|
test(
|
||||||
"saves a copy of the map which does not change when the actual map changes",
|
"saves a copy of the map which does not change when the actual map changes",
|
||||||
|
@ -49,5 +49,5 @@ void main() {
|
||||||
|
|
||||||
expect(sut.loadSnapshot(), isNot(equals(snapshot)));
|
expect(sut.loadSnapshot(), isNot(equals(snapshot)));
|
||||||
});
|
});
|
||||||
});
|
}, tags: "nobrowser");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue