Skip to content

Commit

Permalink
fix(masteries): codelyzer issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@SteveVanOpstal
SteveVanOpstal committed Jun 2, 2016
1 parent 6921882 commit f65482d
Show file tree
Hide file tree
Showing 10 changed files with 157 additions and 174 deletions.
14 changes: 8 additions & 6 deletions src/app/build/ability-sequence.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,26 +44,28 @@ export class AbilitySequenceComponent {
}
}

if (spell.lets) {
for (let value of spell.lets) {
if (spell.vars) {
for (let value of spell.vars) {
if (value.key && value.coeff) {
effects[value.key] = value.coeff[0];
}
}
}

let stats = this.getStats();
for (let i = 0; i < stats.length; i++) {
effects[i] = stats[i];
for (var attrname in stats) {
effects[attrname] = stats[attrname];
}

return tim(spell.sanitizedTooltip, effects);
}

private getStats(): Array<string> {
let stats = [];
for (let i = 0; i < this.champion.stats.length; i++) {
stats['f' + i] = this.champion.stats[i];
let i = 0;
for (let stat in this.champion.stats) {
i++;
stats['f' + i] = this.champion.stats[stat];
}
return stats;
}
Expand Down
4 changes: 2 additions & 2 deletions src/app/build/items/item-slot.component.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('ItemSlotComponent', () => {
'gold': { 'total': 50 }
};

component.config = { g: [0, 100, 200, 300], gameTime: 200, sampleSize: 20 };
component.config = { g: [0, 100, 200, 300] };
component.items = [item1, item2, item2, item2];
}));

Expand All @@ -43,7 +43,7 @@ describe('ItemSlotComponent', () => {
component.addTime(item1);
expect(item1.time).toBe(0);
component.addTime(item2);
expect(item2.time).toBe(5);
expect(item2.time).toBe(28125);
}));

it('should bundle', inject([ItemSlotComponent], (component) => {
Expand Down
22 changes: 11 additions & 11 deletions src/app/build/masteries/masteries.component.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ describe('MasteriesComponent', () => {

beforeEach(inject([MasteriesComponent], (component) => {
component.categoryComponents = [
new MockMasteryCategoryComponent(component),
new MockMasteryCategoryComponent(component),
new MockMasteryCategoryComponent(component),
new MockMasteryCategoryComponent(component)
new MockMasteryCategoryComponent(),
new MockMasteryCategoryComponent(),
new MockMasteryCategoryComponent(),
new MockMasteryCategoryComponent()
];
}));

Expand Down Expand Up @@ -76,7 +76,7 @@ describe('MasteriesComponent', () => {
spyOn(component, 'disable');
expect(component.disable).not.toHaveBeenCalled();
component.categoryComponents[0].rank = 30;
component.rankAdded();
component.rankAdd();
expect(component.disable).toHaveBeenCalled();
}));

Expand Down Expand Up @@ -128,7 +128,7 @@ describe('MasteriesComponent', () => {
{
masteryId: 6121
},
undefined,
null,
{
masteryId: 6122
}
Expand All @@ -154,7 +154,7 @@ describe('MasteriesComponent', () => {
{
masteryId: 6121
},
undefined,
null,
{
masteryId: 6122
}
Expand All @@ -167,7 +167,7 @@ describe('MasteriesComponent', () => {
{
masteryId: 6121
},
undefined,
null,
{
masteryId: 6122
}
Expand All @@ -191,7 +191,7 @@ describe('MasteriesComponent', () => {
tiers: [
[
{ id: 0 },
undefined,
null,
{ id: 1 }
],
[
Expand All @@ -206,7 +206,7 @@ describe('MasteriesComponent', () => {
tiers: [
[
{ id: 0 },
undefined,
null,
{ id: 1 }
]
]
Expand All @@ -216,7 +216,7 @@ describe('MasteriesComponent', () => {
tiers: [
[
{ id: 0 },
undefined,
null,
{ id: 1 }
]
]
Expand Down
10 changes: 6 additions & 4 deletions src/app/build/masteries/masteries.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ export class MasteriesComponent {
return rank;
}

public rankAdd(tier: MasteryTierComponent, mastery: MasteryComponent) {
public rankAdd(event: { tier: MasteryTierComponent, mastery: MasteryComponent }) {
let tier = event.tier;
let mastery = event.mastery;
let deviation = this.getTotalRankDeviation();
if (deviation) {
if (tier.getRank() > mastery.getRank()) {
Expand All @@ -59,7 +61,7 @@ export class MasteriesComponent {
}
}

public rankRemove() {
public rankRemove(event: { tier: MasteryTierComponent, mastery: MasteryComponent }) {
if (this.getRank() === 29) {
this.enable();
}
Expand Down Expand Up @@ -88,10 +90,10 @@ export class MasteriesComponent {
let item = [];
for (let masteryName in masteryTreeItem.masteryTreeItems) {
let mastery = masteryTreeItem.masteryTreeItems[masteryName];
if (mastery !== undefined) {
if (mastery !== null) {
item.push(newMasteries.data[mastery.masteryId]);
} else {
item.push(undefined);
item.push(null);
}
}
tiers.push(item);
Expand Down
84 changes: 36 additions & 48 deletions src/app/build/masteries/mastery-category.component.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ class MockMasteryComponent extends MasteryComponent {
public rank: number = 0;
public maxRank: number = 0;

constructor(category: MockMasteryTierComponent) {
super(<MasteryTierComponent>category);
constructor() {
super();
super.enable();
super.unlock();
super.data = {};
Expand All @@ -31,14 +31,14 @@ class MockMasteryComponent extends MasteryComponent {
class MockMasteryTierComponent extends MasteryTierComponent {
public index = 0;

constructor( @Inject(forwardRef(() => MasteryCategoryComponent)) private category: MasteryCategoryComponent, index: number) {
super(category);
constructor(index: number) {
super();
this.index = index;
this.masteryComponents = [
new MockMasteryComponent(this),
new MockMasteryComponent(this),
new MockMasteryComponent(this),
new MockMasteryComponent(this)
new MockMasteryComponent(),
new MockMasteryComponent(),
new MockMasteryComponent(),
new MockMasteryComponent()
];
}
}
Expand All @@ -63,10 +63,10 @@ describe('MasteryCategoryComponent', () => {

beforeEach(inject([MasteryCategoryComponent], (component) => {
component.tierComponents = [
new MockMasteryTierComponent(component, 0),
new MockMasteryTierComponent(component, 1),
new MockMasteryTierComponent(component, 2),
new MockMasteryTierComponent(component, 3)
new MockMasteryTierComponent(0),
new MockMasteryTierComponent(1),
new MockMasteryTierComponent(2),
new MockMasteryTierComponent(3)
];
}));

Expand All @@ -76,20 +76,6 @@ describe('MasteryCategoryComponent', () => {
expect(component.totalRank).toBe(0);
}));

it('should add category to masteries', inject([MasteryCategoryComponent], (component) => {
spyOn(component.masteries, 'addCategoryComponent');
expect(component.masteries.addCategoryComponent).not.toHaveBeenCalled();
component.ngOnInit();
expect(component.masteries.addCategoryComponent).toHaveBeenCalled();
}));


it('should add a tier', inject([MasteryCategoryComponent], (component) => {
let tier = new MockMasteryTierComponent(component, 4);
component.addTierComponent(tier);
expect(component.tierComponents[4]).toBeDefined();
}));


it('should enable tier zero', inject([MasteryCategoryComponent], (component) => {
component.enable();
Expand Down Expand Up @@ -129,7 +115,7 @@ describe('MasteryCategoryComponent', () => {
component.tierComponents[1].masteryComponents[0].maxRank = 5;
component.tierComponents[2].masteryComponents[0].enabled = false;
component.tierComponents[0].masteryComponents[0].locked = false;
component.rankAdded(component.tierComponents[1], component.tierComponents[1].masteryComponents[0]);
component.rankAdd(component.tierComponents[1], component.tierComponents[1].masteryComponents[0]);
expect(component.tierComponents[2].masteryComponents[0].enabled).toBeTruthy();
expect(component.tierComponents[0].masteryComponents[0].locked).toBeTruthy();
}));
Expand All @@ -138,7 +124,7 @@ describe('MasteryCategoryComponent', () => {
component.tierComponents[0].masteryComponents[0].maxRank = 5;
component.tierComponents[0].masteryComponents[0].rank = 5;
component.tierComponents[0].masteryComponents[1].rank = 1;
component.rankAdded(component.tierComponents[0], component.tierComponents[0].masteryComponents[0]);
component.rankAdd(component.tierComponents[0], component.tierComponents[0].masteryComponents[0]);
expect(component.tierComponents[0].masteryComponents[1].rank).toBe(0);
}));

Expand All @@ -148,7 +134,7 @@ describe('MasteryCategoryComponent', () => {
component.tierComponents[1].masteryComponents[0].maxRank = 5;
component.tierComponents[1].masteryComponents[0].rank = 2;
component.masteries.addCategoryComponent(component);
component.rankAdded(component.tierComponents[1], component.tierComponents[1].masteryComponents[0]);
component.rankAdd(component.tierComponents[1], component.tierComponents[1].masteryComponents[0]);
expect(component.tierComponents[1].masteryComponents[0].rank).toBe(1);
expect(component.totalRank).toBe(30);
}));
Expand All @@ -159,54 +145,56 @@ describe('MasteryCategoryComponent', () => {
component.tierComponents[1].masteryComponents[0].rank = 2;
component.tierComponents[1].masteryComponents[1].rank = 2;
component.masteries.addCategoryComponent(component);
component.rankAdded(component.tierComponents[1], component.tierComponents[1].masteryComponents[0]);
component.rankAdd(component.tierComponents[1], component.tierComponents[1].masteryComponents[0]);
expect(component.tierComponents[1].masteryComponents[0].rank).toBe(2);
expect(component.tierComponents[1].masteryComponents[1].rank).toBe(1);
expect(component.totalRank).toBe(30);
}));

it('should should trigger masteries rankAdded event', inject([MasteryCategoryComponent], (component) => {
spyOn(component.masteries, 'rankAdded');
spyOn(component.rankAdded, 'emit');
expect(component.rankAdded.emit).not.toHaveBeenCalled();
component.tierComponents[0].masteryComponents[0].rank = 1;
component.rankAdded(component.tierComponents[0], component.tierComponents[0].masteryComponents[0]);
expect(component.masteries.rankAdded).toHaveBeenCalled();
component.rankAdd(component.tierComponents[0], component.tierComponents[0].masteryComponents[0]);
expect(component.rankAdded.emit).toHaveBeenCalled();
expect(component.totalRank).toBe(1);
}));


it('should disable/unlock tiers', inject([MasteryCategoryComponent], (component) => {
component.tierComponents[1].masteryComponents[0].rank = 2;
component.tierComponents[1].masteryComponents[0].maxRank = 5;
component.rankRemoved(component.tierComponents[1], component.tierComponents[1].masteryComponents[0]);
component.rankRemove(component.tierComponents[1], component.tierComponents[1].masteryComponents[0]);
expect(component.tierComponents[2].masteryComponents[0].enabled).toBeFalsy();
expect(component.tierComponents[0].masteryComponents[0].locked).toBeFalsy();
}));

it('should should trigger masteries rankRemoved event', inject([MasteryCategoryComponent], (component) => {
spyOn(component.masteries, 'rankRemoved');
spyOn(component.rankRemoved, 'emit');
expect(component.rankRemoved.emit).not.toHaveBeenCalled();
component.tierComponents[0].masteryComponents[0].rank = 1;
component.tierComponents[1].masteryComponents[0].rank = 1;
component.tierComponents[0].masteryComponents[0].maxRank = 5;
component.rankRemoved(component.tierComponents[0], component.tierComponents[0].masteryComponents[0]);
expect(component.masteries.rankRemoved).toHaveBeenCalled();
component.rankRemove(component.tierComponents[0], component.tierComponents[0].masteryComponents[0]);
expect(component.rankRemoved.emit).toHaveBeenCalled();
expect(component.totalRank).toBe(2);
}));


it('should do nothing when tier or mastery is incorrect', inject([MasteryCategoryComponent], (component) => {
component.tierComponents[0].masteryComponents[0].rank = 1;

spyOn(component.masteries, 'rankRemoved');
component.rankRemoved(undefined, component.tierComponents[0].masteryComponents[0]);
expect(component.masteries.rankRemoved).not.toHaveBeenCalled();
component.rankRemoved(component.tierComponents[0], undefined);
expect(component.masteries.rankRemoved).not.toHaveBeenCalled();

spyOn(component.masteries, 'rankAdded');
component.rankAdded(undefined, component.tierComponents[0].masteryComponents[0]);
expect(component.masteries.rankAdded).not.toHaveBeenCalled();
component.rankAdded(component.tierComponents[0], undefined);
expect(component.masteries.rankAdded).not.toHaveBeenCalled();
spyOn(component.rankRemoved, 'emit');
component.rankRemove(undefined, component.tierComponents[0].masteryComponents[0]);
expect(component.rankRemoved.emit).not.toHaveBeenCalled();
component.rankRemove(component.tierComponents[0], undefined);
expect(component.rankRemoved.emit).not.toHaveBeenCalled();

spyOn(component.rankAdded, 'emit');
component.rankAdd(undefined, component.tierComponents[0].masteryComponents[0]);
expect(component.rankAdded.emit).not.toHaveBeenCalled();
component.rankAdd(component.tierComponents[0], undefined);
expect(component.rankAdded.emit).not.toHaveBeenCalled();
}));


Expand Down
21 changes: 13 additions & 8 deletions src/app/build/masteries/mastery-category.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {MasteryComponent} from './mastery.component';
import {MasteryTierComponent} from './mastery-tier.component';
import {MasteriesComponent} from './masteries.component';

type EventEmitterRank = EventEmitter<{ tier: MasteryTierComponent, mastery: MasteryComponent }>;
type EventData = { tier: MasteryTierComponent, mastery: MasteryComponent };

@Component({
selector: 'mastery-category',
Expand All @@ -18,8 +18,8 @@ type EventEmitterRank = EventEmitter<{ tier: MasteryTierComponent, mastery: Mast
export class MasteryCategoryComponent {
@Input() data: Object;

@Output() rankAdded: EventEmitterRank = new EventEmitterRank();
@Output() rankRemoved: EventEmitterRank = new EventEmitterRank();
@Output() rankAdded: EventEmitter<EventData> = new EventEmitter<EventData>();
@Output() rankRemoved: EventEmitter<EventData> = new EventEmitter<EventData>();

@ViewChildren(MasteryTierComponent) children: QueryList<MasteryTierComponent>;

Expand All @@ -32,7 +32,7 @@ export class MasteryCategoryComponent {
this.children.forEach((t: MasteryTierComponent) => {
if (t.index === 0) {
t.enable();
} else if (this.children[t.index - 1].getRank() !== 0) {
} else if (this.children.toArray()[t.index - 1].getRank() !== 0) {
t.enable();
}
});
Expand All @@ -45,7 +45,9 @@ export class MasteryCategoryComponent {
});
}

public rankAdd(tier: MasteryTierComponent, mastery: MasteryComponent) {
public rankAdd(event: { tier: MasteryTierComponent, mastery: MasteryComponent }) {
let tier = event.tier;
let mastery = event.mastery;
if (!tier || !mastery) {
return;
}
Expand All @@ -60,7 +62,9 @@ export class MasteryCategoryComponent {
this.totalRank = this.getRank();
}

public rankRemove(tier: MasteryTierComponent, mastery: MasteryComponent) {
public rankRemove(event: { tier: MasteryTierComponent, mastery: MasteryComponent }) {
let tier = event.tier;
let mastery = event.mastery;
if (!tier || !mastery) {
return;
}
Expand All @@ -79,9 +83,10 @@ export class MasteryCategoryComponent {
}

private forTier(index: number, callback: (masteryTierComponent: MasteryTierComponent) => void) {
if (!this.children[index]) {
let tier = this.children.toArray()[index];
if (!tier) {
return;
}
callback(this.children[index]);
callback(tier);
}
}
Loading

0 comments on commit f65482d

Please sign in to comment.