Fix tests

Author: LocalIdentity

spec/System/TestImportReimport_spec.lua

@@ -1,9 +1,7 @@
 describe("TestImportReimport", function()
-	local dkjson = require "dkjson"
 	local DEFAULT_CHARACTER_LEVEL = 12
 	local DEFAULT_ITEM_LEVEL = 10
 	local TEST_IMPORT_ITEM_ID = "test-import-item-1"
-	local DEFAULT_SOCKET_COLOR = "R"
 
 	before_each(function()
 		newBuild()
@@ -16,25 +14,17 @@ describe("TestImportReimport", function()
 		}
 	end
 
-	local function makeSocketedGemEntry(socket, support, typeLine, level)
+	local function makeGemEntry(support, typeLine, level, socketedItems)
 		return {
-			socket = socket,
 			support = support,
 			typeLine = typeLine,
 			properties = makeGemProperties(level),
+			socketedItems = socketedItems,
 		}
 	end
 
 	-- Build a minimal import item so the tests stay focused on state, not fixture noise.
-	local function makeImportItem(itemTypeLine, inventoryId, socketedItems, itemId)
-		local maxSocketIndex = 0
-		for _, socketedItem in ipairs(socketedItems) do
-			maxSocketIndex = math.max(maxSocketIndex, socketedItem.socket + 1)
-		end
-		local sockets = {}
-		for index = 1, maxSocketIndex do
-			sockets[index] = { group = 0, sColour = DEFAULT_SOCKET_COLOR }
-		end
+	local function makeImportItem(itemTypeLine, inventoryId, itemId)
 		return {
 			id = itemId or TEST_IMPORT_ITEM_ID,
 			frameType = 0,
@@ -43,43 +33,41 @@ describe("TestImportReimport", function()
 			inventoryId = inventoryId,
 			ilvl = DEFAULT_ITEM_LEVEL,
 			properties = {},
-			sockets = sockets,
-			socketedItems = socketedItems,
 		}
 	end
 
 	-- Build a minimal import payload so the tests stay focused on state, not fixture noise.
-	local function buildImportPayload(items)
-		return dkjson.encode({
-			character = { level = DEFAULT_CHARACTER_LEVEL },
-			items = items,
-		})
+	local function buildImportPayload(items, skills)
+		return {
+			level = DEFAULT_CHARACTER_LEVEL,
+			equipment = items,
+			skills = skills,
+		}
 	end
 
-	local function reimportSocketedItemsWithOptions(itemTypeLine, inventoryId, socketedItems, clearItems)
+	local function reimportSkillsWithOptions(itemTypeLine, inventoryId, skills, clearItems)
 		build.importTab.controls.charImportItemsClearSkills.state = true
 		build.importTab.controls.charImportItemsClearItems.state = clearItems
 		build.importTab:ImportItemsAndSkills(buildImportPayload({
-			makeImportItem(itemTypeLine, inventoryId, socketedItems),
-		}))
+			makeImportItem(itemTypeLine, inventoryId),
+		}, skills))
 		runCallback("OnFrame")
 	end
 
-	local function reimportSingleSocketedGemWithOptions(itemTypeLine, inventoryId, gemName, clearItems)
-		reimportSocketedItemsWithOptions(itemTypeLine, inventoryId, {
-			makeSocketedGemEntry(0, false, gemName, 20),
+	local function reimportSingleGemWithOptions(itemTypeLine, inventoryId, gemName, clearItems)
+		reimportSkillsWithOptions(itemTypeLine, inventoryId, {
+			makeGemEntry(false, gemName, 20),
 		}, clearItems)
 	end
 
-	local function reimportSingleSocketedGem(itemTypeLine, inventoryId, gemName)
-		reimportSingleSocketedGemWithOptions(itemTypeLine, inventoryId, gemName, false)
+	local function reimportSingleGem(itemTypeLine, inventoryId, gemName)
+		reimportSingleGemWithOptions(itemTypeLine, inventoryId, gemName, false)
 	end
 
-	local function assertReimportPreservesSkillSubstate(slotName, itemTypeLine, inventoryId, gemName, fieldName, fieldValue)
+	local function assertReimportPreservesSkillSubstate(itemTypeLine, inventoryId, gemName, fieldName, fieldValue)
 		build.skillsTab:PasteSocketGroup(string.format([[
-Slot: %s
 %s 20/0  1
-]], slotName, gemName))
+]], gemName))
 		runCallback("OnFrame")
 
 		local socketGroup = build.skillsTab.socketGroupList[1]
@@ -90,7 +78,7 @@ Slot: %s
 		build.buildFlag = true
 		runCallback("OnFrame")
 
-		reimportSingleSocketedGem(itemTypeLine, inventoryId, gemName)
+		reimportSingleGem(itemTypeLine, inventoryId, gemName)
 
 		socketGroup = build.skillsTab.socketGroupList[1]
 		srcInstance = socketGroup.displaySkillList[1].activeEffect.srcInstance
@@ -100,10 +88,8 @@ Slot: %s
 
 	it("preserves full DPS state and manually disabled gems when reimporting items and skills", function()
 		build.skillsTab:PasteSocketGroup([[
-Slot: Helmet
-Cleave 1/0  1
-Heavy Strike 1/0  1
-Added Fire Damage 1/0 DISABLED 1
+Dark Effigy 1/0  1
+Controlled Destruction 1/0 DISABLED 1
 ]])
 		runCallback("OnFrame")
 
@@ -115,28 +101,25 @@ Added Fire Damage 1/0 DISABLED 1
 		build.importTab.controls.charImportItemsClearSkills.state = true
 		build.importTab.controls.charImportItemsClearItems.state = false
 		build.importTab:ImportItemsAndSkills(buildImportPayload({
-			makeImportItem("Iron Hat", "Helm", {
-				makeSocketedGemEntry(0, false, "Cleave", 1),
-				makeSocketedGemEntry(1, false, "Heavy Strike", 1),
-				makeSocketedGemEntry(2, true, "Added Fire Damage Support", 2),
+			makeImportItem("Wrapped Cap", "Helm"),
+		}, {
+			makeGemEntry(false, "Dark Effigy", 2, {
+				makeGemEntry(true, "Controlled Destruction", 1),
 			}),
 		}))
 		runCallback("OnFrame")
 
 		socketGroup = build.skillsTab.socketGroupList[1]
-		assert.are.equal("Helmet", socketGroup.slot)
 		assert.is_true(socketGroup.includeInFullDPS)
 		assert.are.equal(2, socketGroup.mainActiveSkill)
-		assert.are.equal(2, socketGroup.gemList[3].level)
-		assert.is_false(socketGroup.gemList[3].enabled)
+		assert.are.equal(2, socketGroup.gemList[1].level)
+		assert.is_false(socketGroup.gemList[2].enabled)
 	end)
 
 	it("preserves full DPS state and disabled gems when reimporting with deleted equipment", function()
 		build.skillsTab:PasteSocketGroup([[
-Slot: Helmet
-Cleave 1/0  1
-Heavy Strike 1/0  1
-Added Fire Damage 1/0 DISABLED 1
+Dark Effigy 1/0  1
+Controlled Destruction 1/0 DISABLED 1
 ]])
 		runCallback("OnFrame")
 
@@ -145,82 +128,73 @@ Added Fire Damage 1/0 DISABLED 1
 		socketGroup.mainActiveSkill = 2
 		runCallback("OnFrame")
 
-		reimportSocketedItemsWithOptions("Iron Hat", "Helm", {
-			makeSocketedGemEntry(0, false, "Cleave", 1),
-			makeSocketedGemEntry(1, false, "Heavy Strike", 1),
-			makeSocketedGemEntry(2, true, "Added Fire Damage Support", 2),
+		reimportSkillsWithOptions("Wrapped Cap", "Helm", {
+			makeGemEntry(false, "Dark Effigy", 2, {
+				makeGemEntry(true, "Controlled Destruction", 1),
+			}),
 		}, true)
 
 		socketGroup = build.skillsTab.socketGroupList[1]
-		assert.are.equal("Helmet", socketGroup.slot)
 		assert.is_true(socketGroup.includeInFullDPS)
 		assert.are.equal(2, socketGroup.mainActiveSkill)
-		assert.are.equal(2, socketGroup.gemList[3].level)
-		assert.is_false(socketGroup.gemList[3].enabled)
+		assert.are.equal(2, socketGroup.gemList[1].level)
+		assert.is_false(socketGroup.gemList[2].enabled)
 	end)
 
 	it("preserves two socket groups when reimporting items and skills", function()
 		build.skillsTab:PasteSocketGroup([[
-Slot: Helmet
-Cleave 1/0  1
-Heavy Strike 1/0  1
-Added Fire Damage 1/0 DISABLED 1
+Dark Effigy 1/0  1
+Controlled Destruction 1/0 DISABLED 1
 ]])
 		runCallback("OnFrame")
 
 		build.skillsTab:PasteSocketGroup([[
-Slot: Gloves
-Blight 20/0  1
+Fireball 20/0  1
 ]])
 		runCallback("OnFrame")
 
-		local helmetGroup = build.skillsTab.socketGroupList[1]
-		helmetGroup.includeInFullDPS = true
-		helmetGroup.mainActiveSkill = 2
-		local glovesGroup = build.skillsTab.socketGroupList[2]
-		glovesGroup.enabled = false
+		local darkEffigyGroup = build.skillsTab.socketGroupList[1]
+		darkEffigyGroup.includeInFullDPS = true
+		darkEffigyGroup.mainActiveSkill = 2
+		local fireballGroup = build.skillsTab.socketGroupList[2]
+		fireballGroup.enabled = false
 		runCallback("OnFrame")
 
 		build.importTab.controls.charImportItemsClearSkills.state = true
 		build.importTab.controls.charImportItemsClearItems.state = false
 		build.importTab:ImportItemsAndSkills(buildImportPayload({
-			makeImportItem("Iron Hat", "Helm", {
-				makeSocketedGemEntry(0, false, "Cleave", 1),
-				makeSocketedGemEntry(1, false, "Heavy Strike", 1),
-				makeSocketedGemEntry(2, true, "Added Fire Damage Support", 2),
-			}, "test-import-item-helmet"),
-			makeImportItem("Rawhide Gloves", "Gloves", {
-				makeSocketedGemEntry(0, false, "Blight", 20),
-			}, "test-import-item-gloves"),
+			makeImportItem("Wrapped Cap", "Helm", "test-import-item-helmet"),
+			makeImportItem("Linen Wraps", "Gloves", "test-import-item-gloves"),
+		}, {
+			makeGemEntry(false, "Dark Effigy", 1, {
+				makeGemEntry(true, "Controlled Destruction", 1),
+			}),
+			makeGemEntry(false, "Fireball", 20),
 		}))
 		runCallback("OnFrame")
 
-		local groupsBySlot = {}
+		local groupsByGem = {}
 		for _, socketGroup in ipairs(build.skillsTab.socketGroupList) do
-			groupsBySlot[socketGroup.slot] = socketGroup
+			groupsByGem[socketGroup.gemList[1].nameSpec] = socketGroup
 		end
 
 		assert.are.equal(2, #build.skillsTab.socketGroupList)
-		assert.is_not_nil(groupsBySlot.Helmet)
-		assert.is_not_nil(groupsBySlot.Gloves)
-		assert.is_true(groupsBySlot.Helmet.includeInFullDPS)
-		assert.are.equal(2, groupsBySlot.Helmet.mainActiveSkill)
-		assert.is_false(groupsBySlot.Gloves.enabled)
+		assert.is_not_nil(groupsByGem["Dark Effigy"])
+		assert.is_not_nil(groupsByGem.Fireball)
+		assert.is_true(groupsByGem["Dark Effigy"].includeInFullDPS)
+		assert.are.equal(2, groupsByGem["Dark Effigy"].mainActiveSkill)
+		assert.is_false(groupsByGem.Fireball.enabled)
 	end)
 
 	it("preserves skill part selection when reimporting items and skills", function()
-		assertReimportPreservesSkillSubstate("Helmet", "Iron Hat", "Helm", "Blight", "skillPart", 2)
+		assertReimportPreservesSkillSubstate("Twig Focus", "Offhand", "Dark Effigy", "skillPart", 2)
 	end)
 
 	it("preserves stage count when reimporting items and skills", function()
-		assertReimportPreservesSkillSubstate("Weapon 1", "Driftwood Wand", "Weapon", "Scorching Ray", "skillStageCount", 8)
+		assertReimportPreservesSkillSubstate("Withered Wand", "Weapon", "Flameblast", "skillStageCount", 8)
 	end)
 
-	it("preserves mine count when reimporting items and skills", function()
-		assertReimportPreservesSkillSubstate("Gloves", "Rawhide Gloves", "Gloves", "Pyroclast Mine", "skillMineCount", 12)
-	end)
-	
 	it("preserves minion skill when reimporting items and skills", function()
-		assertReimportPreservesSkillSubstate("Gloves", "Rawhide Gloves", "Gloves", "Summon Chaos Golem", "skillMinionSkill", 3)
+		assertReimportPreservesSkillSubstate("Linen Wraps", "Gloves", "Skeletal Sniper", "skillMinionSkill", 2)
 	end)
 end)

src/Classes/ImportTab.lua

@@ -5,6 +5,7 @@
 --
 local ipairs = ipairs
 local t_insert = table.insert
+local t_remove = table.remove
 local b_rshift = bit.rshift
 local band = bit.band
 local m_max = math.max