Remove sellable and effortValues from tests

4 files changed, 0 insertions, 50 deletions

diff --git a/sigmod/test/TestItem.cpp b/sigmod/test/TestItem.cpp
index f5cf12b3..9bdfc298 100644
--- a/sigmod/test/TestItem.cpp
+++ b/sigmod/test/TestItem.cpp
@@ -92,14 +92,6 @@ void TestItem::validation()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 6);
     
-    m_item1->setSellable(true);
-    
-    m_item1->setSellPrice(250);
-    m_item1->validate();
-    
-    QCOMPARE(m_warnings.size(), 0);
-    QCOMPARE(m_errors.size(), 6);
-    
     m_item1->setPrice(100);
     
     m_item1->validate();
@@ -156,7 +148,6 @@ void TestItem::loading()
     m_game->newItemType();
     
     m_item1->setName("Bar");
-    m_item1->setSellable(false);
     m_item1->setType(1);
     m_item1->setPrice(20);
     m_item1->setSellPrice(10);
@@ -169,7 +160,6 @@ void TestItem::loading()
     m_item1->load(xml.firstChildElement("Item"));
     
     QCOMPARE(m_item1->name(), QString("Foo"));
-    QCOMPARE(m_item1->sellable(), true);
     QCOMPARE(m_item1->type(), 0);
     QCOMPARE(m_item1->price(), 500);
     QCOMPARE(m_item1->sellPrice(), 250);
@@ -191,19 +181,6 @@ void TestItem::setName()
     QCOMPARE(m_errors.size(), 0);
 }
 
-void TestItem::setSellable()
-{
-    m_item2->setSellable(true);
-    m_item2->setSellable(true);
-    
-    QCOMPARE(m_item2->sellable(), true);
-    
-    QCOMPARE(m_changedCount, 1);
-    
-    QCOMPARE(m_warnings.size(), 0);
-    QCOMPARE(m_errors.size(), 0);
-}
-
 void TestItem::setType()
 {
     m_item2->setType(2);
@@ -326,7 +303,6 @@ void TestItem::assignment()
     *m_item3 = *m_item2;
     
     QCOMPARE(m_item3->name(), QString("Foo"));
-    QCOMPARE(m_item3->sellable(), true);
     QCOMPARE(m_item3->type(), 2);
     QCOMPARE(m_item3->price(), 100);
     QCOMPARE(m_item3->sellPrice(), 50);
diff --git a/sigmod/test/TestItem.h b/sigmod/test/TestItem.h
index 493aa863..231596f5 100644
--- a/sigmod/test/TestItem.h
+++ b/sigmod/test/TestItem.h
@@ -43,7 +43,6 @@ class TestItem : public TestSigmodObject
         void loading();
         
         void setName();
-        void setSellable();
         void setType();
         void setPrice();
         void setSellPrice();
diff --git a/sigmod/test/TestRules.cpp b/sigmod/test/TestRules.cpp
index d663e7ce..e33ecdde 100644
--- a/sigmod/test/TestRules.cpp
+++ b/sigmod/test/TestRules.cpp
@@ -117,7 +117,6 @@ void TestRules::loading()
     m_rules1->setMaxTotalWeight(100);
     m_rules1->setSpecialSplit(true);
     m_rules1->setSpecialDVSplit(true);
-    m_rules1->setEffortValuesAllowed(true);
     m_rules1->setMaxTotalEV(100);
     m_rules1->setMaxEVPerStat(25);
     
@@ -143,7 +142,6 @@ void TestRules::loading()
     QCOMPARE(m_rules1->maxTotalWeight(), 0);
     QCOMPARE(m_rules1->specialSplit(), false);
     QCOMPARE(m_rules1->specialDVSplit(), false);
-    QCOMPARE(m_rules1->effortValuesAllowed(), false);
     QCOMPARE(m_rules1->maxTotalEV(), 0);
     QCOMPARE(m_rules1->maxEVPerStat(), 0);
 }
@@ -478,19 +476,6 @@ void TestRules::setSpecialDVSplit()
     QCOMPARE(m_errors.size(), 1);
 }
 
-void TestRules::setEffortValuesAllowed()
-{
-    m_rules2->setEffortValuesAllowed(true);
-    m_rules2->setEffortValuesAllowed(true);
-    
-    QCOMPARE(m_rules2->effortValuesAllowed(), true);
-    
-    QCOMPARE(m_changedCount, 1);
-    
-    QCOMPARE(m_warnings.size(), 0);
-    QCOMPARE(m_errors.size(), 0);
-}
-
 void TestRules::setMaxTotalEV()
 {
     m_rules2->setMaxTotalEV(-1);
@@ -498,8 +483,6 @@ void TestRules::setMaxTotalEV()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 1);
     
-    m_rules2->setEffortValuesAllowed(false);
-    
     QCOMPARE(m_changedCount, 1);
     
     m_rules2->setMaxTotalEV(-1);
@@ -509,8 +492,6 @@ void TestRules::setMaxTotalEV()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 1);
     
-    m_rules2->setEffortValuesAllowed(true);
-    
     QCOMPARE(m_changedCount, 3);
     
     m_rules2->setMaxTotalEV(5);
@@ -536,8 +517,6 @@ void TestRules::setMaxEVPerStat()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 2);
     
-    m_rules2->setEffortValuesAllowed(false);
-    
     QCOMPARE(m_changedCount, 1);
     
     m_rules2->setMaxEVPerStat(-1);
@@ -554,8 +533,6 @@ void TestRules::setMaxEVPerStat()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 2);
     
-    m_rules2->setEffortValuesAllowed(true);
-    
     QCOMPARE(m_changedCount, 4);
     
     m_rules2->setMaxEVPerStat(3);
@@ -591,7 +568,6 @@ void TestRules::assignment()
     QCOMPARE(m_rules3->maxTotalWeight(), 5);
     QCOMPARE(m_rules3->specialSplit(), true);
     QCOMPARE(m_rules3->specialDVSplit(), true);
-    QCOMPARE(m_rules3->effortValuesAllowed(), true);
     QCOMPARE(m_rules3->maxTotalEV(), 5);
     QCOMPARE(m_rules3->maxEVPerStat(), 3);
 }
diff --git a/sigmod/test/TestRules.h b/sigmod/test/TestRules.h
index 1b4ef3ff..8813ab3d 100644
--- a/sigmod/test/TestRules.h
+++ b/sigmod/test/TestRules.h
@@ -61,7 +61,6 @@ class TestRules : public TestSigmodObject
         void setMaxTotalWeight();
         void setSpecialSplit();
         void setSpecialDVSplit();
-        void setEffortValuesAllowed();
         void setMaxTotalEV();
         void setMaxEVPerStat();