Commit

.idea/ZCW-MesoLabs-Inheritance-ProductManager-BlueJ.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/ZCW-MesoLabs-Inheritance-ProductManager-BlueJ.iml" filepath="$PROJECT_DIR$/.idea/ZCW-MesoLabs-Inheritance-ProductManager-BlueJ.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

.idea/workspace.xml

@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="30c51471-80f1-4dbd-8f68-e9a785851e07" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/package.bluej" beforeDir="false" afterPath="$PROJECT_DIR$/package.bluej" afterDir="false" />
+    </list>
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file leaf-file-name="package.bluej" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/package.bluej">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file leaf-file-name="MainApplication.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/MainApplication.java">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file leaf-file-name="Product.class" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Product.class">
+          <provider selected="true" editor-type-id="text-editor">
+            <state>
+              <folding>
+                <element signature="e#0#160#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Product.ctxt" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Product.ctxt">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file leaf-file-name="Product.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Product.java">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file leaf-file-name="ProductTest.class" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/ProductTest.class">
+          <provider selected="true" editor-type-id="text-editor">
+            <state>
+              <folding>
+                <element signature="e#0#168#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ProductTest.ctxt" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/ProductTest.ctxt">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file leaf-file-name="ProductTest.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/ProductTest.java">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file leaf-file-name="README.TXT" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/README.TXT">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/README.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor />
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsGulpfileManager">
+    <detection-done>true</detection-done>
+    <sorting>DEFINITION_ORDER</sorting>
+  </component>
+  <component name="NodePackageJsonFileManager">
+    <packageJsonPaths />
+  </component>
+  <component name="ProjectFrameBounds">
+    <option name="y" value="22" />
+    <option name="width" value="1280" />
+    <option name="height" value="691" />
+  </component>
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="Scope" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="ZCW-MesoLabs-Inheritance-ProductManager-BlueJ" type="b2602c69:ProjectViewProjectNode" />
+              <item name="ZCW-MesoLabs-Inheritance-ProductManager-BlueJ" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="PackagesPane" />
+      <pane id="AndroidView" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="aspect.path.notification.shown" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="RunManager">
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit">
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <patterns />
+    </configuration>
+    <configuration default="true" type="TestNG" factoryName="TestNG">
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SUITE_NAME" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="GROUP_NAME" />
+      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="OUTPUT_DIRECTORY" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <option name="USE_DEFAULT_REPORTERS" value="false" />
+      <option name="PROPERTIES_FILE" />
+      <properties />
+      <listeners />
+    </configuration>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="30c51471-80f1-4dbd-8f68-e9a785851e07" name="Default" comment="" />
+      <created>1528743120219</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1528743120219</updated>
+      <workItem from="1528743122037" duration="62000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="62000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="0" y="22" width="1280" height="691" extended-state="0" />
+    <editor active="true" />
+    <layout>
+      <window_info anchor="right" id="Palette" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="right" id="Palette&#9;" />
+      <window_info id="Image Layers" />
+      <window_info anchor="right" id="Capture Analysis" />
+      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+      <window_info anchor="right" id="Maven Projects" />
+      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Version Control" />
+      <window_info anchor="bottom" id="Terminal" />
+      <window_info id="Capture Tool" />
+      <window_info id="Designer" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
+      <window_info anchor="right" id="Database" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info id="UI Designer" />
+      <window_info anchor="right" id="Theme Preview" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info id="Favorites" side_tool="true" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/MainApplication.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#0#176#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/MainApplication.ctxt">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/package.bluej">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/MainApplication.java">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Product.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#0#160#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Product.ctxt">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Product.java">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/ProductTest.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#0#168#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/ProductTest.ctxt">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/ProductTest.java">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.TXT">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor />
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+  </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>1.8</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
+</project>

Inventory.java

@@ -0,0 +1,26 @@
+import java.util.*;
+
+public class Inventory{
+    private List<Product> products;
+    
+    public Inventory(){
+        products = new ArrayList();
+    }
+    
+    public void add(Product product){
+        products.add(product);
+    }
+    
+    public List<Product> getProducts(){
+    
+    return products;
+    }
+    
+    public int getTotalQuantity(){
+        int total = 0;
+        for(Product p : products){
+            total = total + p.getQuantityOfItem();
+        }
+        return total;
+    }
+}

InventoryTest.java

@@ -0,0 +1,39 @@
+
+
+import static org.junit.Assert.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import java.util.List;
+/**
+ * The test class InventoryTest.
+ *
+ * @author  (your name)
+ * @version (a version number or a date)
+ */
+public class InventoryTest{
+    @Test
+    public void testAddinventory(){
+    Inventory inventory = new Inventory();
+    Product product = new Product();
+    
+    inventory.add(product);
+    
+    List<Product> products = inventory.getProducts();
+    Product actualProduct = products.get(0);
+    
+    assertEquals (product, actualProduct);
+    }
+    
+    @Test
+    public void testTotalQuantity(){
+    Inventory inventory  = new Inventory();
+    Product tea = new Product ("asdf", 44.43, 3);
+    Product coffee = new Product("kedk", 234.88, 5);
+    inventory.add(tea);
+    inventory.add(coffee);
+    int actualQuantity = inventory.getTotalQuantity();
+    int expectedQuantity = inventory.getTotalQuantity();
+    assertEquals(expectedQuantity, actualQuantity);
+    }
+}

MainApplication.java

@@ -3,4 +3,14 @@
  * Created by leon on 1/10/18.
  */
 public class MainApplication {
+    public static void main(String[] args){
+    Inventory inventory  = new Inventory();
+    Product tea = new Product ("asdf", 44.43, 3);
+    Product coffee = new Product("kedk", 234.88, 5);
+    inventory.add(tea);
+    inventory.add(coffee);
+    
+    int quantity = inventory.getTotalQuantity();
+    System.out.println("Total quantity is " + quantity);
+    }
 }

Product.java

@@ -4,4 +4,52 @@
  * Created by leon on 1/10/18.
  */
 public class Product {
+    private double price;
+    private String id;
+    private int x;
+    private int quantity;
+    private String name;
+    
+    //private Map<Integer, Product> productMap;
+    
+    public Product(){
+    
+    }
+    
+    public Product(String id, double price, int quantity){
+        this.id = id;
+        this.price = price;
+        this.quantity = quantity;
+    }
+    
+    public void setPrice(double newPrice){
+        price = newPrice;
+    }
+    
+    
+    public double getPrice(){
+        System.out.println(price);
+        return price;
+    }
+    
+    public String setId(String newId){
+        id = newId;
+        System.out.println(id);
+        return id;
+    }
+    
+    public String getId(){
+        System.out.println(id);
+        return id;
+    }
+    
+    public void setQuantityOfItem(int x){
+        this.x = x;
+        System.out.println(this.x);
+    }
+    
+    public int getQuantityOfItem(){
+        System.out.println("You have " + x + "of this item.");
+        return x;
+    }
 }

ProductTest.java

@@ -1,5 +1,59 @@
+import static org.junit.Assert.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
 /**
- * Created by leon on 1/10/18.
+ * The test class ProductTest.
+ *
+ * @author  (your name)
+ * @version (a version number or a date)
  */
-public class ProductTest {
+public class ProductTest{
+    @Test
+    public void testEmptyConstructor(){
+        Product product = new Product();
+    }
+    
+    @Test
+    public void testConstructorWithIdpriceQuantity(){
+        String id = "5349h8te";
+        double price = 55.55;
+        int quantity = 3;
+        
+        Product newProduct = new Product(id, price, quantity);
+    }
+    
+    @Test
+    public void testGetSetPrice(){
+        Product product = new Product();
+        double price = 88.67;
+        
+        product.setPrice(price);
+        double actualPrice = product.getPrice();
+        
+        assertEquals(price, actualPrice, 0.01);
+    }
+    
+    @Test
+    public void testGetProductId(){
+        Product product = new Product();
+        String id = "867_XX";
+        
+        product.setId(id);
+        String actualId = product.getId();
+        
+        assertEquals(id, actualId);
+    }
+    
+    @Test
+    public void testGetQuantityNumber(){
+        Product product = new Product();
+        int quantity = 12;
+        
+        product.setQuantityOfItem(quantity);
+        int actualQuantity = product.getQuantityOfItem();
+        
+        assertEquals(quantity, actualQuantity);
+    }
 }

package.bluej

@@ -1,20 +1,38 @@
 #BlueJ package file
-editor.fx.0.height=722
-editor.fx.0.width=800
-editor.fx.0.x=560
-editor.fx.0.y=117
-objectbench.height=101
-objectbench.width=461
+dependency1.from=ProductTest
+dependency1.to=Product
+dependency1.type=UsesDependency
+dependency2.from=Inventory
+dependency2.to=Product
+dependency2.type=UsesDependency
+dependency3.from=InventoryTest
+dependency3.to=Inventory
+dependency3.type=UsesDependency
+dependency4.from=InventoryTest
+dependency4.to=Product
+dependency4.type=UsesDependency
+dependency5.from=MainApplication
+dependency5.to=Inventory
+dependency5.type=UsesDependency
+dependency6.from=MainApplication
+dependency6.to=Product
+dependency6.type=UsesDependency
+editor.fx.0.height=0
+editor.fx.0.width=0
+editor.fx.0.x=0
+editor.fx.0.y=0
+objectbench.height=90
+objectbench.width=673
 package.divider.horizontal=0.6
-package.divider.vertical=0.8007380073800738
-package.editor.height=427
-package.editor.width=674
-package.editor.x=141
-package.editor.y=59
-package.frame.height=600
-package.frame.width=800
-package.numDependencies=0
-package.numTargets=0
+package.divider.vertical=0.8493788819875776
+package.editor.height=540
+package.editor.width=571
+package.editor.x=0
+package.editor.y=22
+package.frame.height=702
+package.frame.width=697
+package.numDependencies=6
+package.numTargets=5
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -23,3 +41,40 @@ readme.name=@README
 readme.width=47
 readme.x=10
 readme.y=10
+target1.height=50
+target1.name=ProductTest
+target1.showInterface=false
+target1.type=UnitTestTargetJunit4
+target1.width=80
+target1.x=80
+target1.y=110
+target2.association=ProductTest
+target2.height=50
+target2.name=Product
+target2.showInterface=false
+target2.type=ClassTarget
+target2.width=80
+target2.x=50
+target2.y=140
+target3.height=50
+target3.name=InventoryTest
+target3.showInterface=false
+target3.type=UnitTestTargetJunit4
+target3.width=80
+target3.x=460
+target3.y=70
+target4.association=InventoryTest
+target4.height=50
+target4.name=Inventory
+target4.showInterface=false
+target4.type=ClassTarget
+target4.width=80
+target4.x=430
+target4.y=100
+target5.height=50
+target5.name=MainApplication
+target5.showInterface=false
+target5.type=ClassTarget
+target5.width=120
+target5.x=160
+target5.y=70