Voomra/trader
Archived
0
Fork 0
Code Activity

add new fields to store

Browse Source 
- add Power and Power state to the place
- add Station type and Economic type to the vendor
- add Modify time to the vendor
- add illegal Factions and Governments for items
This commit is contained in:
Mo
2016-02-12 13:30:34 +03:00
parent 9e0a170c25
commit 1370d9d4e2
22 changed files with 686 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/test/java/ru/trader/store/LoadTest.java
View File

@@ -12,6 +12,7 @@ import ru.trader.store.simple.Store;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.stream.XMLStreamException;
import java.io.*;
import java.time.LocalDateTime;
import java.util.Collection;
public class LoadTest extends Assert {
@@ -38,6 +39,8 @@ public class LoadTest extends Assert {
private void assertItem(Item item1, Item item2){
assertEquals(item1.getName(), item2.getName());
assertGroup(item1.getGroup(), item2.getGroup());
assertEquals(item1.getIllegalFactions(), item2.getIllegalFactions());
assertEquals(item1.getIllegalGovernments(), item2.getIllegalGovernments());
}
private void assertPlace(Place place1, Place place2){
@@ -47,13 +50,19 @@ public class LoadTest extends Assert {
assertEquals(place1.getZ(), place2.getZ(), 0.00001);
assertEquals(place1.getFaction(), place2.getFaction());
assertEquals(place1.getGovernment(), place2.getGovernment());
assertEquals(place1.getPower(), place2.getPower());
assertEquals(place1.getPowerState(), place2.getPowerState());
}
private void assertVendor(Vendor vendor1, Vendor vendor2){
assertEquals(vendor1.getName(), vendor2.getName());
assertEquals(vendor1.getType(), vendor2.getType());
assertEquals(vendor1.getDistance(), vendor2.getDistance(), 0.00001);
assertEquals(vendor1.getFaction(), vendor2.getFaction());
assertEquals(vendor1.getGovernment(), vendor2.getGovernment());
assertEquals(vendor1.getEconomic(), vendor2.getEconomic());
assertEquals(vendor1.getSubEconomic(), vendor2.getSubEconomic());
assertEquals(vendor1.getModifiedTime(), vendor2.getModifiedTime());
}
private void assertOffer(Offer offer1, Offer offer2){
@@ -76,17 +85,26 @@ public class LoadTest extends Assert {
Item item3 = market.addItem("Item 3", group2);
Item item4 = market.addItem("Item 4", group2);
Item item5 = market.addItem("Item 5", group3);
item1.setIllegal(FACTION.FEDERATION, true);
item2.setIllegal(FACTION.EMPIRE, true);
item2.setIllegal(GOVERNMENT.DEMOCRACY, true);
item3.setIllegal(GOVERNMENT.CORPORATE, true);
Place place1 = market.addPlace("Place 1", 0, 1, 3);
place1.setFaction(FACTION.ALLIANCE);
place1.setGovernment(GOVERNMENT.PRISON_COLONY);
place1.setPower(POWER.LAVIGNY_DUVAL, POWER_STATE.EXPLOITED);
Place place2 = market.addPlace("Place 2",4,0,5);
place2.setPower(POWER.DELAINE, POWER_STATE.CONTROL);
Place place3 = market.addPlace("Place 3",0,0,0);
Vendor vendor1 = place1.addVendor("Vendor 1");
Vendor vendor2 = place1.addVendor("Vendor 2");
Vendor vendor3 = place2.addVendor("Vendor 3");
vendor1.setType(STATION_TYPE.CORIOLIS_STARPORT);
vendor1.setDistance(10);
vendor1.setFaction(FACTION.ALLIANCE);
vendor1.setGovernment(GOVERNMENT.ANARCHY);
vendor1.setEconomic(ECONOMIC_TYPE.EXTRACTION);
vendor1.setSubEconomic(ECONOMIC_TYPE.REFINERY);
vendor1.add(SERVICE_TYPE.MARKET);
vendor1.add(SERVICE_TYPE.OUTFIT);
vendor1.add(SERVICE_TYPE.REFUEL);
@@ -98,9 +116,12 @@ public class LoadTest extends Assert {
Offer offer6 = vendor1.addOffer(OFFER_TYPE.BUY, item5, 11,10);
vendor2.setDistance(100.4);
vendor2.setGovernment(GOVERNMENT.NONE);
vendor2.setEconomic(ECONOMIC_TYPE.HIGH_TECH);
vendor2.setType(STATION_TYPE.PLANETARY_PORT);
vendor3.setDistance(200000.4);
vendor3.add(SERVICE_TYPE.OUTFIT);
vendor3.add(SERVICE_TYPE.REFUEL);
vendor3.setModifiedTime(LocalDateTime.of(2016,10,2,10,20,0));
LOG.info("save market");
File xml = new File("save_load_test.xml");