Next PR

arraz/.idea/workspace.xml

@@ -2,12 +2,6 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="81f99a04-35ff-49d0-a7a5-4ed795a161d6" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_0.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/arraz.iml" beforeDir="false" afterPath="$PROJECT_DIR$/arraz.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Arraz.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Arraz.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/test/java/ArrazTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/ArrazTest.java" afterDir="false" />
     </list>
@@ -33,7 +27,7 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="417" />
+          <entry key="JAVA" value="639" />
         </counts>
       </usages-collector>
     </session>
@@ -45,8 +39,8 @@
           <file pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/src/main/java/Arraz.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="255">
-                  <caret line="17" column="21" selection-start-line="17" selection-start-column="21" selection-end-line="17" selection-end-column="21" />
+                <state relative-caret-position="394">
+                  <caret line="32" column="32" selection-start-line="32" selection-start-column="32" selection-end-line="32" selection-end-column="32" />
                 </state>
               </provider>
             </entry>
@@ -58,8 +52,8 @@
           <file pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/src/test/java/ArrazTest.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="385">
-                  <caret line="44" column="24" lean-forward="true" selection-start-line="44" selection-start-column="24" selection-end-line="44" selection-end-column="24" />
+                <state relative-caret-position="244">
+                  <caret line="68" column="46" selection-start-line="68" selection-start-column="46" selection-end-line="68" selection-end-column="46" />
                   <folding>
                     <element signature="imports" expanded="true" />
                   </folding>
@@ -77,8 +71,8 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/test/java/ArrazTest.java" />
         <option value="$PROJECT_DIR$/src/main/java/Arraz.java" />
+        <option value="$PROJECT_DIR$/src/test/java/ArrazTest.java" />
       </list>
     </option>
   </component>
@@ -149,7 +143,7 @@
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1544047288090" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1544047793848" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/pom.xml" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -166,7 +160,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.ArrazTest.test2DoublesOfArray">
+  <component name="RunManager" selected="JUnit.ArrazTest.test1DoubleAverageOfArray">
     <configuration name="ArrazTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="arraz" />
       <option name="PACKAGE_NAME" value="" />
@@ -175,48 +169,60 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="ArrazTest.test1sumValuesOfArray" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="ArrazTest.test1AverageOfArray" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="arraz" />
       <option name="PACKAGE_NAME" value="" />
       <option name="MAIN_CLASS_NAME" value="ArrazTest" />
-      <option name="METHOD_NAME" value="test1sumValuesOfArray" />
+      <option name="METHOD_NAME" value="test1AverageOfArray" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="ArrazTest.test2DoublesOfArray" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="ArrazTest.test1DoubleAverageOfArray" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="arraz" />
       <option name="PACKAGE_NAME" value="" />
       <option name="MAIN_CLASS_NAME" value="ArrazTest" />
-      <option name="METHOD_NAME" value="test2DoublesOfArray" />
+      <option name="METHOD_NAME" value="test1DoubleAverageOfArray" />
+      <option name="TEST_OBJECT" value="method" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="ArrazTest.test2AverageOfArray" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="arraz" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="ArrazTest" />
+      <option name="METHOD_NAME" value="test2AverageOfArray" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="ArrazTest.test2sumValuesOfArray" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="ArrazTest.test2DoublesOfArray" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="arraz" />
       <option name="PACKAGE_NAME" value="" />
       <option name="MAIN_CLASS_NAME" value="ArrazTest" />
-      <option name="METHOD_NAME" value="test2sumValuesOfArray" />
+      <option name="METHOD_NAME" value="test2DoublesOfArray" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
     <list>
-      <item itemvalue="JUnit.ArrazTest.test1sumValuesOfArray" />
       <item itemvalue="JUnit.ArrazTest" />
-      <item itemvalue="JUnit.ArrazTest.test2sumValuesOfArray" />
       <item itemvalue="JUnit.ArrazTest.test2DoublesOfArray" />
+      <item itemvalue="JUnit.ArrazTest.test1AverageOfArray" />
+      <item itemvalue="JUnit.ArrazTest.test2AverageOfArray" />
+      <item itemvalue="JUnit.ArrazTest.test1DoubleAverageOfArray" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.ArrazTest.test1DoubleAverageOfArray" />
+        <item itemvalue="JUnit.ArrazTest.test2AverageOfArray" />
+        <item itemvalue="JUnit.ArrazTest.test1AverageOfArray" />
         <item itemvalue="JUnit.ArrazTest.test2DoublesOfArray" />
         <item itemvalue="JUnit.ArrazTest" />
-        <item itemvalue="JUnit.ArrazTest.test2sumValuesOfArray" />
-        <item itemvalue="JUnit.ArrazTest.test1sumValuesOfArray" />
       </list>
     </recent_temporary>
   </component>
@@ -230,7 +236,7 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1544046001151</updated>
-      <workItem from="1544046022231" duration="1271000" />
+      <workItem from="1544046022231" duration="1600000" />
     </task>
     <servers />
   </component>
@@ -267,7 +273,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1271000" />
+    <option name="totallyTimeSpent" value="1600000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-236" y="-893" width="1781" height="817" extended-state="0" />
@@ -283,11 +289,11 @@
       <window_info anchor="bottom" id="Messages" weight="0.32905984" />
       <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Terminal" />
+      <window_info active="true" anchor="bottom" id="Terminal" visible="true" weight="0.32905984" />
       <window_info anchor="bottom" id="Event Log" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.32905984" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.32905984" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -310,20 +316,20 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/test/java/ArrazTest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/Arraz.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="385">
-          <caret line="44" column="24" lean-forward="true" selection-start-line="44" selection-start-column="24" selection-end-line="44" selection-end-column="24" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="394">
+          <caret line="32" column="32" selection-start-line="32" selection-start-column="32" selection-end-line="32" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Arraz.java">
+    <entry file="file://$PROJECT_DIR$/src/test/java/ArrazTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="17" column="21" selection-start-line="17" selection-start-column="21" selection-end-line="17" selection-end-column="21" />
+        <state relative-caret-position="244">
+          <caret line="68" column="46" selection-start-line="68" selection-start-column="46" selection-end-line="68" selection-end-column="46" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

arraz/src/main/java/Arraz.java

@@ -3,7 +3,7 @@ public class Arraz {
     public int sumValuesOfArray(int[] arr) {
         int sum = 0;
 
-        for (int i : arr){
+        for (int i : arr) {
             sum += i;
         }
 
@@ -14,7 +14,7 @@ public class Arraz {
     public double sumDoublesOfArray(double[] arr) {
         double sum = 0;
 
-        for (double d : arr){
+        for (double d : arr) {
             sum += d;
         }
 
@@ -23,4 +23,28 @@ public class Arraz {
     }
 
 
+    public int averageOfArray(int[] arr) {
+        int sum = 0;
+
+        for (int i : arr) {
+            sum += i;
+        }
+
+        return (sum / arr.length);
+    }
+
+
+    public double doubleAverageOfArray(double[] arr3) {
+
+        double sum = 0;
+
+        for (double i : arr3) {
+            sum += i;
+        }
+
+        return (sum / arr3.length);
+
+    }
+
+
 }

arraz/src/test/java/ArrazTest.java

@@ -5,12 +5,13 @@ import static org.junit.Assert.*;
 
 public class ArrazTest {
 
+    Arraz arraz = new Arraz();
+
     int[] arr = {2,2,2,2,2};
     int[] arr2 = {1,2,3,4,5};
 
     @Test
     public void test1sumValuesOfArray(){
-        Arraz arraz = new Arraz();
 
         int expected = 10;
         int actual = arraz.sumValuesOfArray(arr);
@@ -21,7 +22,6 @@ public class ArrazTest {
 
     @Test
     public void test2sumValuesOfArray(){
-        Arraz arraz = new Arraz();
 
         int expected = 15;
         int actual = arraz.sumValuesOfArray(arr2);
@@ -34,7 +34,6 @@ public class ArrazTest {
 
     @Test
     public void test1DoublesOfArray(){
-        Arraz arraz = new Arraz();
 
         double expected = 10.0;
         double actual = arraz.sumDoublesOfArray(arr3);
@@ -46,7 +45,6 @@ public class ArrazTest {
 
     @Test
     public void test2DoublesOfArray(){
-        Arraz arraz = new Arraz();
 
         double expected = 17.0;
         double actual = arraz.sumDoublesOfArray(arr4);
@@ -54,4 +52,44 @@ public class ArrazTest {
         Assert.assertEquals(expected, actual);
     }
 
+    @Test
+    public void test1AverageOfArray(){
+
+        int expected = 2;
+        int actual = arraz.averageOfArray(arr);
+
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void test2AverageOfArray(){
+
+        int expected = 3;
+        int actual = arraz.averageOfArray(arr2);
+
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void test1DoubleAverageOfArray(){
+
+        double expected = 2.0;
+        double actual = arraz.doubleAverageOfArray(arr3);
+
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void test2DoubleAverageOfArray(){
+
+        double expected = (17 / 5);
+        double actual = arraz.doubleAverageOfArray(arr4);
+
+        Assert.assertEquals(expected, actual);
+
+    }
+
 }