From 8b29189691054619084956113f0aa893398e3764 Mon Sep 17 00:00:00 2001
From: Jose <jogarcia809@yahoo.com>
Date: Tue, 19 May 2015 20:42:59 -0400
Subject: [PATCH 1/6] initial commit

---
 src/main/java/nyc/c4q/InitialActivity.java | 31 ++++++++++-
 src/main/res/layout/activity_initial.xml   | 62 +++++++++++++++++++---
 2 files changed, 84 insertions(+), 9 deletions(-)

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 2213b83..10348b2 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
@@ -29,10 +30,38 @@ public void saveState(){
     editor.commit();
   }
 
-  @Override
+    @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_initial);
     preferences = getPreferences(Context.MODE_PRIVATE);
+
+
+
+    Button plus = (Button) findViewById(R.id.buttonPlus);
+      plus.setOnClickListener(new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+              TextView tvCounter = (TextView) findViewById(R.id.tvCounter);
+              counter += 1;
+              tvCounter.setText(String.valueOf(counter));
+          }
+    });
+    Button minus = (Button) findViewById(R.id.buttonMinus);
+      minus.setOnClickListener(new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+              TextView tvCounter = (TextView) findViewById(R.id.tvCounter);
+              counter -= 1;
+              tvCounter.setText(String.valueOf(counter));
+          }
+    });
+    final Button tileActivity = (Button) findViewById(R.id.buttonTileActivity);
+        tileActivity.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent tileActivity;
+            }
+        });
   }
 }
diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 49e22b0..7a32869 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -3,16 +3,62 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+
+    android:id="@+id/activity_initial"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="nyc.c4q.InitialActivity"
-    android:id="@+id/activity_initial">
-
-    <TextView
-        android:id="@+id/text"
+    tools:context="nyc.c4q.InitialActivity">
+    <!-- activity_initial [0] -->
+    <LinearLayout
+        android:id="@+id/counterLayout"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="2">
+        <!-- counterLayout [0] -->
+        <LinearLayout
+            android:id="@+id/counterButtonsLayout"
+            android:orientation="vertical"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1">
+            <!-- counterButtonsLayout [0] -->
+            <Button
+                android:id="@+id/buttonPlus"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:text="+"/>
+            <!-- counterButtonsLayout [1] -->
+            <Button
+                android:id="@+id/buttonMinus"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:text="-"/>
+        </LinearLayout>
+    <!-- activity_initial [0][1] -->
+        <TextView
+            android:id="@+id/tvCounter"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:text="0">
+        </TextView>
+    </LinearLayout>
+    <!-- activity_initial[1] -->
+    <Button
+        android:id="@+id/buttonTileActivity"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:text="TileActivity"/>
+    <!-- activity_initial[2] -->
+    <Button
+        android:id="@+id/buttonEmpty"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="InitialActivity"
-        />
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:text="Empty"/>
 </LinearLayout>
\ No newline at end of file

From 7c9a7f986e3a8e51651f7eef2155fce7a03dffb9 Mon Sep 17 00:00:00 2001
From: Jose <jogarcia809@yahoo.com>
Date: Tue, 19 May 2015 21:59:16 -0400
Subject: [PATCH 2/6] 3 failed

---
 .../java/nyc/c4q/AbstractAwesomeClass.java    | 11 ++--
 src/main/java/nyc/c4q/AwesomeContainer.java   |  2 +
 .../java/nyc/c4q/ConcreteAwesomeClass.java    | 12 ++++-
 src/main/java/nyc/c4q/InitialActivity.java    |  5 +-
 src/main/java/nyc/c4q/SubFunClass.java        | 13 ++++-
 src/main/res/layout/activity_tile.xml         | 54 +++++++++++++++++--
 6 files changed, 83 insertions(+), 14 deletions(-)

diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index e3f9c21..3c259d7 100644
--- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java
+++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
@@ -3,15 +3,14 @@
 /**
  * Created by amyquispe on 5/19/15.
  */
-public abstract class AbstractAwesomeClass implements AwesomeInterface {
-
+public abstract class AbstractAwesomeClass implements AwesomeInterface{
     @Override
-    public int getData() {
-        return 0;
+    public void setData(int someData) {
+
     }
 
     @Override
-    public void setData(int someData) {
-
+    public int getData() {
+        return 0;
     }
 }
diff --git a/src/main/java/nyc/c4q/AwesomeContainer.java b/src/main/java/nyc/c4q/AwesomeContainer.java
index 64e9fd9..3f70720 100644
--- a/src/main/java/nyc/c4q/AwesomeContainer.java
+++ b/src/main/java/nyc/c4q/AwesomeContainer.java
@@ -15,4 +15,6 @@ public static Collection createAwesomeContainer(){
     public static void addAwesomeObject(Collection awesomeContainer){
         return;
     }
+
+    Collection myList = AwesomeContainer.createAwesomeContainer();
 }
diff --git a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
index f39acca..3c9b1c2 100644
--- a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
+++ b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
@@ -3,9 +3,19 @@
 /**
  * Created by amyquispe on 5/19/15.
  */
-public class ConcreteAwesomeClass extends AbstractAwesomeClass {
+public class ConcreteAwesomeClass extends AbstractAwesomeClass  {
     public ConcreteAwesomeClass(){
     }
     public ConcreteAwesomeClass(int startData){
     }
+
+    @Override
+    public int getData() {
+        return 0;
+    }
+
+    @Override
+    public void setData(int someData) {
+
+    }
 }
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 10348b2..a7be241 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -56,11 +56,12 @@ public void onClick(View view) {
               tvCounter.setText(String.valueOf(counter));
           }
     });
-    final Button tileActivity = (Button) findViewById(R.id.buttonTileActivity);
+    Button tileActivity = (Button) findViewById(R.id.buttonTileActivity);
         tileActivity.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Intent tileActivity;
+                Intent ta = new Intent(getBaseContext(), TileActivity.class);
+                startActivity(ta);
             }
         });
   }
diff --git a/src/main/java/nyc/c4q/SubFunClass.java b/src/main/java/nyc/c4q/SubFunClass.java
index ef94dce..3ab57c8 100644
--- a/src/main/java/nyc/c4q/SubFunClass.java
+++ b/src/main/java/nyc/c4q/SubFunClass.java
@@ -3,7 +3,18 @@
 /**
  * Created by amyquispe on 5/19/15.
  */
-public class SubFunClass {
+public class SubFunClass extends SuperFunClass implements AwesomeInterface{
     public SubFunClass(){
+
+    }
+
+    @Override
+    public int getData() {
+        return 0;
+    }
+
+    @Override
+    public void setData(int someData) {
+
     }
 }
diff --git a/src/main/res/layout/activity_tile.xml b/src/main/res/layout/activity_tile.xml
index 4e36a11..5ac1d80 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -5,11 +5,57 @@
     android:layout_height="match_parent"
     tools:context="nyc.c4q.TileActivity"
     android:id="@+id/activity_tile"
-    >
-
-    <TextView
+    android:orientation="horizontal">
+    <!-- activity_tile [0] -->
+    <LinearLayout
+        android:id="@+id/leftSide"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_weight="1">
+        <!-- leftSide [0] -->
+        <View
+            android:id="@+id/redView"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="40"
+            android:background="#ffff0000"/>
+        <!-- leftSide [1] -->
+        <View
+            android:id="@+id/greenView"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="60"
+            android:background="#ff00ff00"/>
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/rightSide"
+        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:text="TileActivity"/>
+        android:layout_height="match_parent"
+        android:layout_weight="1">
+        <!-- rightSide [0] -->
+        <View
+            android:id="@+id/yellowView"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="33"
+            android:background="#ffffff00"/>
+        <!-- rightSide [1] -->
+        <View
+            android:id="@+id/whiteView"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="44"
+            android:background="#ffffffff"/>
+        <!-- rightSide [2] -->
+        <View
+            android:id="@+id/blueView"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="22"
+            android:background="#ff0000ff"/>
+    </LinearLayout>
+
 
 </LinearLayout>

From 81d6280c80201c2113ceeddac4fb0f722dd9aab5 Mon Sep 17 00:00:00 2001
From: Ehtesh Choudhury <ehtesh.choudhury@gmail.com>
Date: Wed, 20 May 2015 08:48:47 -0400
Subject: [PATCH 3/6] fixed typos

---
 .../java/nyc/c4q/Unit1AssessmentTestsAndroid.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java b/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java
index bae0f78..30f43d7 100644
--- a/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java
+++ b/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java
@@ -100,7 +100,7 @@ public void test02ButtonPlusShouldIncreaseTvCounter() throws Exception {
         Button buttonPlus = (Button) Helpers.findViewByIdString(activity, "buttonPlus");
         TextView tvCounter = (TextView) Helpers.findViewByIdString(activity, "tvCounter");
 
-        assertNotNull("TextView(@+id/buttonPlus) should not be null", buttonPlus);
+        assertNotNull("Button(@+id/buttonPlus) should not be null", buttonPlus);
         assertNotNull("TextView(@+id/tvCounter) should not be null", tvCounter);
 
         assertEquals(0, Integer.parseInt((String) tvCounter.getText()));
@@ -116,7 +116,7 @@ public void test03ButtonMinusShouldDecreaseTvCounter() throws Exception {
         Button buttonMinus = (Button) Helpers.findViewByIdString(activity, "buttonMinus");
         TextView tvCounter = (TextView) Helpers.findViewByIdString(activity, "tvCounter");
 
-        assertNotNull("TextView(@+id/buttonMinus) should not be null", buttonMinus);
+        assertNotNull("Button(@+id/buttonMinus) should not be null", buttonMinus);
         assertNotNull("TextView(@+id/tvCounter) should not be null", tvCounter);
 
         assertEquals(0, Integer.parseInt((String) tvCounter.getText()));
@@ -133,8 +133,8 @@ public void test04ButtonPlusAndButtonMinusShouldWork() throws Exception {
         Button buttonMinus = (Button) Helpers.findViewByIdString(activity, "buttonMinus");
         TextView tvCounter = (TextView) Helpers.findViewByIdString(activity, "tvCounter");
 
-        assertNotNull("TextView(@+id/buttonPlus) should not be null", buttonPlus);
-        assertNotNull("TextView(@+id/buttonMinus) should not be null", buttonMinus);
+        assertNotNull("Button(@+id/buttonPlus) should not be null", buttonPlus);
+        assertNotNull("Button(@+id/buttonMinus) should not be null", buttonMinus);
         assertNotNull("TextView(@+id/tvCounter) should not be null", tvCounter);
 
         Random r = new Random(3680);
@@ -163,8 +163,8 @@ public void test05TvCounterStateShouldBeSavedThroughActivityLifeCycle(){
         Button buttonMinus = (Button) Helpers.findViewByIdString(activity, "buttonMinus");
         TextView tvCounter = (TextView) Helpers.findViewByIdString(activity, "tvCounter");
 
-        assertNotNull("TextView(@+id/buttonPlus) should not be null", buttonPlus);
-        assertNotNull("TextView(@+id/buttonMinus) should not be null", buttonMinus);
+        assertNotNull("Button(@+id/buttonPlus) should not be null", buttonPlus);
+        assertNotNull("Button(@+id/buttonMinus) should not be null", buttonMinus);
         assertNotNull("TextView(@+id/tvCounter) should not be null", tvCounter);
 
         assertEquals(0, Integer.parseInt((String) tvCounter.getText()));

From bf0b81ecff92d9dfaaeb9913b88b5afb7270abe2 Mon Sep 17 00:00:00 2001
From: Ehtesh Choudhury <ehtesh.choudhury@gmail.com>
Date: Wed, 20 May 2015 10:46:38 -0400
Subject: [PATCH 4/6] added more constraints on layout_width/layout_height

---
 .../nyc/c4q/Unit1AssessmentTestsAndroid.java  | 43 ++++++++++++-------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java b/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java
index 30f43d7..f3688ec 100644
--- a/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java
+++ b/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java
@@ -4,6 +4,7 @@
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.view.View;
+import android.view.ViewGroup.LayoutParams;
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -36,6 +37,7 @@ public void test01FixInitialActivityLayout() throws Exception {
         InitialActivity activity = Robolectric.buildActivity(InitialActivity.class).setup().get();
         LinearLayout layout = (LinearLayout) activity.findViewById(R.id.activity_initial);
 
+        assertTrue("LinearLayout(@+id/activity_initial) should have a vertical orientation", layout.getOrientation() == LinearLayout.VERTICAL);
         assertTrue("LinearLayout(@+id/activity_initial)[0] should be a LinearLayout", layout.getChildAt(0) instanceof LinearLayout);
         LinearLayout counterLayout = (LinearLayout) layout.getChildAt(0);
         assertTrue("LinearLayout(@+id/activity_initial)[0] should have R.id.counterLayout", Helpers.getResourceId(counterLayout).equals("counterLayout"));
@@ -61,7 +63,7 @@ public void test01FixInitialActivityLayout() throws Exception {
         assertEquals("-", buttonMinus.getText());
 
         View tvCounter = counterLayout.getChildAt(1);
-        assertTrue("LinearLayout(@+id/activity_initial)[0][1] should be equal to TextView(@+id/tvCounter)",
+        assertTrue("LinearLayout(@+id/counterLayout)[1] should be equal to TextView(@+id/tvCounter)",
                 tvCounter instanceof TextView && Helpers.getResourceId(tvCounter).equals("tvCounter"));
         assertEquals("0", ((TextView) tvCounter).getText());
 
@@ -75,23 +77,28 @@ public void test01FixInitialActivityLayout() throws Exception {
                 buttonEmpty instanceof Button && Helpers.getResourceId(buttonEmpty).equals("buttonEmpty"));
         assertEquals("Empty", ((Button) buttonEmpty).getText());
 
+        assertEquals("LinearLayout(@+id/counterLayout) should have layout_height='0dp'", 0, counterLayout.getLayoutParams().height);
+        assertEquals("LinearLayout(@+id/counterLayout) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, counterLayout.getLayoutParams().width);
         assertEquals("LinearLayout(@+id/counterLayout) should have layout_weight='2'", 2, ((LinearLayout.LayoutParams) counterLayout.getLayoutParams()).weight, 0.01);
+        assertEquals("Button      (@+id/buttonTileActivity) should have layout_height='0dp'", 0, buttonTileActivity.getLayoutParams().height);
+        assertEquals("Button      (@+id/buttonTileActivity) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, buttonTileActivity.getLayoutParams().width);
         assertEquals("Button      (@+id/buttonTileActivity) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) buttonTileActivity.getLayoutParams()).weight, 0.01);
+        assertEquals("Button      (@+id/buttonEmpty) should have layout_height='0dp'", 0, buttonEmpty.getLayoutParams().height);
+        assertEquals("Button      (@+id/buttonEmpty) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, buttonEmpty.getLayoutParams().width);
         assertEquals("Button      (@+id/buttonEmpty) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) buttonEmpty.getLayoutParams()).weight, 0.01);
+        assertEquals("LinearLayout(@+id/counterButtonsLayout) should have layout_height='match_parent'", LayoutParams.MATCH_PARENT, counterButtonsLayout.getLayoutParams().height);
+        assertEquals("LinearLayout(@+id/counterButtonsLayout) should have layout_width='0dp'", 0, counterButtonsLayout.getLayoutParams().width);
         assertEquals("LinearLayout(@+id/counterButtonsLayout) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) counterButtonsLayout.getLayoutParams()).weight, 0.01);
+        assertEquals("TextView    (@+id/tvCounter) should have layout_height='match_parent'", LayoutParams.MATCH_PARENT, tvCounter.getLayoutParams().height);
+        assertEquals("TextView    (@+id/tvCounter) should have layout_width='0dp'", 0, tvCounter.getLayoutParams().width);
         assertEquals("TextView    (@+id/tvCounter) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) tvCounter.getLayoutParams()).weight, 0.01);
+        assertEquals("Button      (@+id/buttonPlus) should have layout_height='0dp'", 0, buttonPlus.getLayoutParams().height);
+        assertEquals("Button      (@+id/buttonPlus) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, buttonPlus.getLayoutParams().width);
         assertEquals("Button      (@+id/buttonPlus) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) buttonPlus.getLayoutParams()).weight, 0.01);
+        assertEquals("Button      (@+id/buttonMinus) should have layout_height='0dp'", 0, buttonMinus.getLayoutParams().height);
+        assertEquals("Button      (@+id/buttonMinus) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, buttonMinus.getLayoutParams().width);
         assertEquals("Button      (@+id/buttonMinus) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) buttonMinus.getLayoutParams()).weight, 0.01);
 
-
-        assertEquals("LinearLayout(@+id/counterLayout) should have layout_height='0dp'", 0, ((LinearLayout.LayoutParams) counterLayout.getLayoutParams()).height);
-        assertEquals("Button      (@+id/buttonTileActivity) should have layout_height='0dp'", 0, ((LinearLayout.LayoutParams) buttonTileActivity.getLayoutParams()).height);
-        assertEquals("Button      (@+i/buttonEmpty) should have layout_height='0dp'", 0, ((LinearLayout.LayoutParams) buttonEmpty.getLayoutParams()).height);
-        assertEquals("LinearLayout(@+id/counterButtonsLayout) should have layout_width='0dp'", 0, ((LinearLayout.LayoutParams) counterButtonsLayout.getLayoutParams()).width);
-        assertEquals("TextView    (@+id/tvCounter) should have layout_width='0dp'", 0, ((LinearLayout.LayoutParams) tvCounter.getLayoutParams()).width);
-        assertEquals("Button      (@+id/buttonPlus) should have layout_height='0dp'", 0, ((LinearLayout.LayoutParams) buttonPlus.getLayoutParams()).height);
-        assertEquals("Button      (@+id/buttonMinus) should have layout_height='0dp'", 0, ((LinearLayout.LayoutParams) buttonMinus.getLayoutParams()).height);
-
     }
 
     @Test
@@ -258,17 +265,21 @@ public void test07FixTileActivityLayout() throws Exception {
         assertThat(blueViewBackground, instanceOf(ColorDrawable.class));
         assertEquals(0xff0000ff, ((ColorDrawable) blueViewBackground).getColor());
 
+        assertEquals("View(@+id/redView) should have layout_height='0dp'", 0, redView.getLayoutParams().height);
+        assertEquals("View(@+id/redView) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, redView.getLayoutParams().width);
         assertEquals("View(@+id/redView) should have layout_weight='40'", 40, ((LinearLayout.LayoutParams) redView.getLayoutParams()).weight, 0.01);
+        assertEquals("View(@+id/greenView) should have layout_height='0dp'", 0, greenView.getLayoutParams().height);
+        assertEquals("View(@+id/greenView) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, greenView.getLayoutParams().width);
         assertEquals("View(@+id/greenView) should have layout_weight='60'", 60, ((LinearLayout.LayoutParams) greenView.getLayoutParams()).weight, 0.01);
+        assertEquals("View(@+id/yellowView) should have layout_height='0dp'", 0, yellowView.getLayoutParams().height);
+        assertEquals("View(@+id/yellowView) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, yellowView.getLayoutParams().width);
         assertEquals("View(@+id/yellowView) should have layout_weight='33'", 33, ((LinearLayout.LayoutParams) yellowView.getLayoutParams()).weight, 0.01);
+        assertEquals("View(@+id/whiteView) should have layout_height='0dp'", 0, whiteView.getLayoutParams().height);
+        assertEquals("View(@+id/whiteView) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, whiteView.getLayoutParams().width);
         assertEquals("View(@+id/whiteView) should have layout_weight='44'", 44, ((LinearLayout.LayoutParams) whiteView.getLayoutParams()).weight, 0.01);
+        assertEquals("View(@+id/blueView) should have layout_height='0dp'", 0, blueView.getLayoutParams().height);
+        assertEquals("View(@+id/blueView) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, blueView.getLayoutParams().width);
         assertEquals("View(@+id/blueView) should have layout_weight='22'", 22, ((LinearLayout.LayoutParams) blueView.getLayoutParams()).weight, 0.01);
 
-        assertEquals("View(@+id/redView) should have layout_height='0dp'", 0, ((LinearLayout.LayoutParams) redView.getLayoutParams()).height);
-        assertEquals("View(@+id/greenView) should have layout_height='0dp'", 0, ((LinearLayout.LayoutParams) greenView.getLayoutParams()).height);
-        assertEquals("View(@+id/yellowView) should have layout_height='0dp'", 0, ((LinearLayout.LayoutParams) yellowView.getLayoutParams()).height);
-        assertEquals("View(@+id/whiteView) should have layout_height='0dp'", 0, ((LinearLayout.LayoutParams) whiteView.getLayoutParams()).height);
-        assertEquals("View(@+id/blueView) should have layout_height='0dp'", 0, ((LinearLayout.LayoutParams) blueView.getLayoutParams()).height);
-
     }
 }

From 858b783c93cf68aed783d7ba447dd3c25f99d024 Mon Sep 17 00:00:00 2001
From: Ehtesh Choudhury <ehtesh.choudhury@gmail.com>
Date: Tue, 26 May 2015 19:44:00 -0400
Subject: [PATCH 5/6] fix layout changes

---
 .../nyc/c4q/Unit1AssessmentTestsAndroid.java  | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java b/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java
index f3688ec..8d78d66 100644
--- a/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java
+++ b/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java
@@ -111,7 +111,7 @@ public void test02ButtonPlusShouldIncreaseTvCounter() throws Exception {
         assertNotNull("TextView(@+id/tvCounter) should not be null", tvCounter);
 
         assertEquals(0, Integer.parseInt((String) tvCounter.getText()));
-        for (int i=1; i<10; i++){
+        for (int i = 1; i < 10; i++) {
             buttonPlus.callOnClick();
             assertEquals(i, Integer.parseInt((String) tvCounter.getText()));
         }
@@ -127,7 +127,7 @@ public void test03ButtonMinusShouldDecreaseTvCounter() throws Exception {
         assertNotNull("TextView(@+id/tvCounter) should not be null", tvCounter);
 
         assertEquals(0, Integer.parseInt((String) tvCounter.getText()));
-        for (int i=-1; i>-10; i--){
+        for (int i = -1; i > -10; i--) {
             buttonMinus.callOnClick();
             assertEquals(i, Integer.parseInt((String) tvCounter.getText()));
         }
@@ -148,12 +148,11 @@ public void test04ButtonPlusAndButtonMinusShouldWork() throws Exception {
 
         assertEquals(0, Integer.parseInt((String) tvCounter.getText()));
         int internalCount = 0;
-        for (int i=0; i<10000; i++){
-            if (r.nextBoolean()){
+        for (int i = 0; i < 10000; i++) {
+            if (r.nextBoolean()) {
                 internalCount++;
                 buttonPlus.callOnClick();
-            }
-            else {
+            } else {
                 internalCount--;
                 buttonMinus.callOnClick();
             }
@@ -162,7 +161,7 @@ public void test04ButtonPlusAndButtonMinusShouldWork() throws Exception {
     }
 
     @Test
-    public void test05TvCounterStateShouldBeSavedThroughActivityLifeCycle(){
+    public void test05TvCounterStateShouldBeSavedThroughActivityLifeCycle() {
         // use InitialActivity.saveState() and InitialActivity.loadState() methods
         ActivityController<InitialActivity> controller = Robolectric.buildActivity(InitialActivity.class).setup();
         InitialActivity activity = controller.get();
@@ -210,55 +209,52 @@ public void test07FixTileActivityLayout() throws Exception {
         TileActivity ta = Robolectric.buildActivity(TileActivity.class).setup().get();
         LinearLayout taLayout = (LinearLayout) ta.findViewById(R.id.activity_tile);
 
-        assertTrue("LinearLayout(@+id/activity_tile) should have a horizontal orientation",
-                taLayout.getOrientation() == LinearLayout.HORIZONTAL);
+        assertTrue("LinearLayout(@+id/activity_tile) should have a horizontal orientation", taLayout.getOrientation() == LinearLayout.HORIZONTAL);
 
         assertTrue("LinearLayout(@+id/activity_tile)[0] should be a LinearLayout", taLayout.getChildAt(0) instanceof LinearLayout);
         LinearLayout leftSide = (LinearLayout) taLayout.getChildAt(0);
         assertTrue("LinearLayout(@+id/activity_tile)[0] should have R.id.leftSide", Helpers.getResourceId(leftSide).equals("leftSide"));
         assertTrue("LinearLayout(@+id/activity_tile)[0] should be equal to LinearLayout(@+id/leftSide)", leftSide == Helpers.findViewByIdString(ta, "leftSide"));
-        assertTrue("LinearLayout(@+id/activity_tile)[0] should have a vertical orientation",
-                leftSide.getOrientation() == LinearLayout.VERTICAL);
+        assertTrue("LinearLayout(@+id/activity_tile)[0] should have a vertical orientation", leftSide.getOrientation() == LinearLayout.VERTICAL);
         assertEquals("View(@+id/leftSide) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) leftSide.getLayoutParams()).weight, 0.01);
 
         assertTrue("LinearLayout(@+id/activity_tile)[1] should be a LinearLayout", taLayout.getChildAt(1) instanceof LinearLayout);
         LinearLayout rightSide = (LinearLayout) taLayout.getChildAt(1);
         assertTrue("LinearLayout(@+id/activity_tile)[1] should have R.id.rightSide", Helpers.getResourceId(rightSide).equals("rightSide"));
         assertTrue("LinearLayout(@+id/activity_tile)[1] should be equal to LinearLayout(@+id/rightSide)", rightSide == Helpers.findViewByIdString(ta, "rightSide"));
-        assertTrue("LinearLayout(@+id/activity_tile)[1] should have a vertical orientation",
-                rightSide.getOrientation() == LinearLayout.VERTICAL);
+        assertTrue("LinearLayout(@+id/activity_tile)[1] should have a vertical orientation", rightSide.getOrientation() == LinearLayout.VERTICAL);
         assertEquals("View(@+id/rightSide) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) rightSide.getLayoutParams()).weight, 0.01);
 
 
-        View redView  = leftSide.getChildAt(0);
+        View redView = leftSide.getChildAt(0);
         assertTrue("LinearLayout(@+id/leftSide)[0] should have R.id.redView", Helpers.getResourceId(redView).equals("redView"));
         assertTrue("LinearLayout(@+id/leftSide)[0] should be equal to View(@+id/redView)", redView == Helpers.findViewByIdString(ta, "redView"));
         Drawable redViewBackground = redView.getBackground();
         assertThat(redViewBackground, instanceOf(ColorDrawable.class));
         assertEquals(0xffff0000, ((ColorDrawable) redViewBackground).getColor());
 
-        View greenView  = leftSide.getChildAt(1);
+        View greenView = leftSide.getChildAt(1);
         assertTrue("LinearLayout(@+id/leftSide)[1] should have R.id.greenView", Helpers.getResourceId(greenView).equals("greenView"));
         assertTrue("LinearLayout(@+id/leftSide)[1] should be equal to View(@+id/greenView)", greenView == Helpers.findViewByIdString(ta, "greenView"));
         Drawable greenViewBackground = greenView.getBackground();
         assertThat(greenViewBackground, instanceOf(ColorDrawable.class));
         assertEquals(0xff00ff00, ((ColorDrawable) greenViewBackground).getColor());
 
-        View yellowView  = rightSide.getChildAt(0);
+        View yellowView = rightSide.getChildAt(0);
         assertTrue("LinearLayout(@+id/rightSide)[0] should have R.id.yellowView", Helpers.getResourceId(yellowView).equals("yellowView"));
         assertTrue("LinearLayout(@+id/rightSide)[0] should be equal to View(@+id/yellowView)", yellowView == Helpers.findViewByIdString(ta, "yellowView"));
         Drawable yellowViewBackground = yellowView.getBackground();
         assertThat(yellowViewBackground, instanceOf(ColorDrawable.class));
         assertEquals(0xffffff00, ((ColorDrawable) yellowViewBackground).getColor());
 
-        View whiteView  = rightSide.getChildAt(1);
+        View whiteView = rightSide.getChildAt(1);
         assertTrue("LinearLayout(@+id/rightSide)[1] should have R.id.whiteView", Helpers.getResourceId(whiteView).equals("whiteView"));
         assertTrue("LinearLayout(@+id/rightSide)[1] should be equal to View(@+id/whiteView)", whiteView == Helpers.findViewByIdString(ta, "whiteView"));
         Drawable whiteViewBackground = whiteView.getBackground();
         assertThat(whiteViewBackground, instanceOf(ColorDrawable.class));
         assertEquals(0xffffffff, ((ColorDrawable) whiteViewBackground).getColor());
 
-        View blueView  = rightSide.getChildAt(2);
+        View blueView = rightSide.getChildAt(2);
         assertTrue("LinearLayout(@+id/rightSide)[2] should have R.id.blueView", Helpers.getResourceId(blueView).equals("blueView"));
         assertTrue("LinearLayout(@+id/rightSide)[2] should be equal to View(@+id/blueView)", blueView == Helpers.findViewByIdString(ta, "blueView"));
         Drawable blueViewBackground = blueView.getBackground();

From ce056a8701c4bec98970bee70ed7473fa9a40320 Mon Sep 17 00:00:00 2001
From: Jose <jogarcia809@yahoo.com>
Date: Tue, 26 May 2015 21:53:03 -0400
Subject: [PATCH 6/6] Assessment update

---
 .../java/nyc/c4q/AbstractAwesomeClass.java    |  6 +++++-
 src/main/java/nyc/c4q/AwesomeContainer.java   |  4 ++--
 .../java/nyc/c4q/ConcreteAwesomeClass.java    |  2 ++
 src/main/java/nyc/c4q/InitialActivity.java    | 21 +++++++++++++++++--
 .../nyc/c4q/Unit1AssessmentTestsJava.java     |  4 ++--
 5 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index 3c259d7..fdd7412 100644
--- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java
+++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
@@ -4,13 +4,17 @@
  * Created by amyquispe on 5/19/15.
  */
 public abstract class AbstractAwesomeClass implements AwesomeInterface{
+
+    private int someData = 4;
+
     @Override
     public void setData(int someData) {
+         this.someData = someData;
 
     }
 
     @Override
     public int getData() {
-        return 0;
+        return someData;
     }
 }
diff --git a/src/main/java/nyc/c4q/AwesomeContainer.java b/src/main/java/nyc/c4q/AwesomeContainer.java
index 3f70720..71cfa71 100644
--- a/src/main/java/nyc/c4q/AwesomeContainer.java
+++ b/src/main/java/nyc/c4q/AwesomeContainer.java
@@ -1,15 +1,15 @@
 package nyc.c4q;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 
 /**
  * Created by amyquispe on 5/19/15.
  */
 public class AwesomeContainer {
     public static Collection createAwesomeContainer(){
+        
         return null;
+
     }
 
     public static void addAwesomeObject(Collection awesomeContainer){
diff --git a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
index 3c9b1c2..ad24ab0 100644
--- a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
+++ b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
@@ -18,4 +18,6 @@ public int getData() {
     public void setData(int someData) {
 
     }
+
+
 }
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index a7be241..3d1a445 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -30,14 +30,30 @@ public void saveState(){
     editor.commit();
   }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        loadState();
+    }
+
+    @Override
+    protected void onRestart() {
+        super.onRestart();
+        loadState();
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        saveState();
+    }
+
     @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_initial);
     preferences = getPreferences(Context.MODE_PRIVATE);
 
-
-
     Button plus = (Button) findViewById(R.id.buttonPlus);
       plus.setOnClickListener(new View.OnClickListener() {
           @Override
@@ -65,4 +81,5 @@ public void onClick(View view) {
             }
         });
   }
+
 }
diff --git a/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java b/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
index de10077..d45c221 100644
--- a/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
+++ b/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
@@ -7,10 +7,10 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;