Merge pull request #146 from Belberus/master

Fixed tests to make them work with the new GUI changes.
UNIZAR-30248-2017-GIMNASIO · Jan 7, 2018 · 9eedb0f · 9eedb0f
2 parents 7c044ad + f184cf5
commit 9eedb0f
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 56 deletions.
diff --git a/GimnasIO/app/src/androidTest/java/com/patan/gimnasio/DatabaseTest.java b/GimnasIO/app/src/androidTest/java/com/patan/gimnasio/DatabaseTest.java
@@ -1,81 +1,55 @@
 package com.patan.gimnasio;
 
-import android.content.Context;
 import android.database.Cursor;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
 
 import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
 import android.test.ActivityInstrumentationTestCase2;
-import android.util.Log;
 
-import com.patan.gimnasio.activities.ExerciseListActivity;
+import com.patan.gimnasio.activities.MainActivity;
 import com.patan.gimnasio.database.GymnasioDBAdapter;
 import com.patan.gimnasio.domain.ExFromRoutine;
 import com.patan.gimnasio.domain.Exercise;
 import com.patan.gimnasio.domain.Routine;
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
 
 @RunWith(AndroidJUnit4.class)
-public class DatabaseTest extends ActivityInstrumentationTestCase2<ExerciseListActivity> {
+public class DatabaseTest extends ActivityInstrumentationTestCase2<MainActivity> {
 
-    private ExerciseListActivity exerciseList;
+    private MainActivity mainAct;
     private GymnasioDBAdapter db;
     private long id1,id2,id3,idr1,idr2,idr3;
-    private ArrayList<Long> ExercisesList = new ArrayList<>();
+    private ArrayList<Long> exercisesList = new ArrayList<>();
 
     public DatabaseTest() {
-        super(ExerciseListActivity.class);
+        super(MainActivity.class);
     }
 
-    @Test
+    /*@Test
     public void useAppContext() throws Exception {
          //Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
         assertEquals("com.patan.gimnasio", appContext.getPackageName());
-    }
+    }*/
 
     @Before
     public void setUp() throws Exception{
         injectInstrumentation(InstrumentationRegistry.getInstrumentation());
-        exerciseList = getActivity();
-        db = exerciseList.getGymnasioDbAdapter();
-        ExercisesList.add((long)1);
+        mainAct = getActivity();
+        db = mainAct.getGymnasioDbAdapter();
+        exercisesList.add((long)1);
     }
 
-    /*Test que simula una actualización de la  BD*/
-    @Ignore
-    @Test
-    public void upgradeTest() throws Exception{
-
-        Cursor c = db.checkForUpdates();
-        c.moveToFirst();
-
-        int id = c.getCount();
-        String date =  c.getString(1);
-
-        Date currentTime = Calendar.getInstance().getTime();
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
-        String currentDateandTime = sdf.format(currentTime);
-
-        long after = db.updateLastUpdate(id,currentDateandTime);
-        assertTrue(after == id && currentDateandTime != date);
-
-    }
 
     /*Tests of exercises*/
     /*Test que comrpueba que la bd añade ejercicios correctamente*/

diff --git a/GimnasIO/app/src/androidTest/java/com/patan/gimnasio/EspressoTest.java b/GimnasIO/app/src/androidTest/java/com/patan/gimnasio/EspressoTest.java
@@ -17,6 +17,7 @@
 import static android.support.test.espresso.action.ViewActions.click;
 import static android.support.test.espresso.action.ViewActions.longClick;
 import static android.support.test.espresso.action.ViewActions.replaceText;
+import static android.support.test.espresso.action.ViewActions.swipeLeft;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
 import static org.hamcrest.Matchers.anything;
@@ -63,7 +64,8 @@ public void testCrearModificarEliminarRutinaFreemium() {
         onView(withId(R.id.nombreRutina)).perform(replaceText("Rutina Espresso Editada"));
         onView(withId(R.id.fab)).perform(click());
         onData(anything()).inAdapterView(withId(R.id.dbExercisesList)).atPosition(0).perform(longClick());
-        onView(withText("Añadir a rutina")).perform(click());
+        onView(withText("Añadir")).perform(click());
+        onView(withText("SI")).perform(click());
         onView(withId(R.id.seriesField)).perform(replaceText("2"));
         onView(withId(R.id.repeticionesField)).perform(replaceText("2"));
         onView(withId(R.id.relaxField)).perform(replaceText("2"));
@@ -73,6 +75,7 @@ public void testCrearModificarEliminarRutinaFreemium() {
         onView(withText("Rutina Espresso Editada")).perform(longClick());
         //onData(anything()).inAdapterView(withId(R.id.dbRoutinesList)).atPosition(0).perform(longClick());
         onView(withText("Eliminar")).perform(click());
+        onView(withText("SI")).perform(click());
     }
 
     @Test
@@ -113,7 +116,8 @@ public void testCrearModificiarEliminarRutinaPremium() {
         onView(withId(R.id.nombreRutina)).perform(replaceText("Rutina Espresso Premium Editada"));
         onView(withId(R.id.fab)).perform(click());
         onData(anything()).inAdapterView(withId(R.id.dbExercisesList)).atPosition(0).perform(longClick());
-        onView(withText("Añadir a rutina")).perform(click());
+        onView(withText("Añadir")).perform(click());
+        onView(withText("SI")).perform(click());
         onView(withId(R.id.seriesField)).perform(replaceText("2"));
         onView(withId(R.id.repeticionesField)).perform(replaceText("2"));
         onView(withId(R.id.relaxField)).perform(replaceText("2"));
@@ -123,8 +127,7 @@ public void testCrearModificiarEliminarRutinaPremium() {
         onView(withText("Rutina Espresso Premium Editada")).perform(longClick());
         //onData(anything()).inAdapterView(withId(R.id.dbRoutinesList)).atPosition(0).perform(longClick());
         onView(withText("Eliminar")).perform(click());
-        openActionBarOverflowOrOptionsMenu(getInstrumentation().getTargetContext());
-        onView(withText("Cerrar sesión")).perform(click());
+        onView(withText("SI")).perform(click());
     }
 
     @Test
@@ -134,10 +137,11 @@ public void testModificarEjercicioDentroDeRutina() {
         onView(withId(R.id.nombreRutina)).perform(replaceText("Rutina Espresso Testing"));
         onView(withId(R.id.objetivoRutina)).perform(replaceText("Test Espresso Testing"));
 
-        // Añadimos ejercicio
+        // Añadimos los ejercicios
         onView(withId(R.id.fab)).perform(click());
         onData(anything()).inAdapterView(withId(R.id.dbExercisesList)).atPosition(0).perform(longClick());
-        onView(withText("Añadir a rutina")).perform(click());
+        onView(withText("Añadir")).perform(click());
+        onView(withText("SI")).perform(click());
         onView(withId(R.id.seriesField)).perform(replaceText("2"));
         onView(withId(R.id.repeticionesField)).perform(replaceText("2"));
         onView(withId(R.id.relaxField)).perform(replaceText("2"));
@@ -157,6 +161,7 @@ public void testModificarEjercicioDentroDeRutina() {
         onView(withText("Rutina Espresso Testing")).perform(longClick());
         //onData(anything()).inAdapterView(withId(R.id.dbRoutinesList)).atPosition(0).perform(longClick());
         onView(withText("Eliminar")).perform(click());
+        onView(withText("SI")).perform(click());
     }
 
     @Test
@@ -166,28 +171,21 @@ public void testMoverEjerciciosDentroDeRutina() {
         onView(withId(R.id.nombreRutina)).perform(replaceText("Rutina Espresso Testing"));
         onView(withId(R.id.objetivoRutina)).perform(replaceText("Test Espresso Testing"));
 
-        // Añadimos ejercicio
+        // Añadimos los ejercicios
         onView(withId(R.id.fab)).perform(click());
         onData(anything()).inAdapterView(withId(R.id.dbExercisesList)).atPosition(0).perform(longClick());
-        onView(withText("Añadir a rutina")).perform(click());
+        onData(anything()).inAdapterView(withId(R.id.dbExercisesList)).atPosition(1).perform(click());
+        onData(anything()).inAdapterView(withId(R.id.dbExercisesList)).atPosition(2).perform(click());
+        onView(withText("Añadir")).perform(click());
+        onView(withText("SI")).perform(click());
         onView(withId(R.id.seriesField)).perform(replaceText("2"));
         onView(withId(R.id.repeticionesField)).perform(replaceText("2"));
         onView(withId(R.id.relaxField)).perform(replaceText("2"));
         onView(withId(R.id.buttonAdd)).perform(click());
-
-        // Añadimos ejercicio
-        onView(withId(R.id.fab)).perform(click());
-        onData(anything()).inAdapterView(withId(R.id.dbExercisesList)).atPosition(1).perform(longClick());
-        onView(withText("Añadir a rutina")).perform(click());
         onView(withId(R.id.seriesField)).perform(replaceText("2"));
         onView(withId(R.id.repeticionesField)).perform(replaceText("2"));
         onView(withId(R.id.relaxField)).perform(replaceText("2"));
         onView(withId(R.id.buttonAdd)).perform(click());
-
-        // Añadimos ejercicios
-        onView(withId(R.id.fab)).perform(click());
-        onData(anything()).inAdapterView(withId(R.id.dbExercisesList)).atPosition(3).perform(longClick());
-        onView(withText("Añadir a rutina")).perform(click());
         onView(withId(R.id.seriesField)).perform(replaceText("2"));
         onView(withId(R.id.repeticionesField)).perform(replaceText("2"));
         onView(withId(R.id.relaxField)).perform(replaceText("2"));
@@ -207,9 +205,9 @@ public void testMoverEjerciciosDentroDeRutina() {
         onView(withText("Rutina Espresso Testing")).perform(longClick());
         //onData(anything()).inAdapterView(withId(R.id.dbRoutinesList)).atPosition(0).perform(longClick());
         onView(withText("Eliminar")).perform(click());
+        onView(withText("SI")).perform(click());
     }
 
-
     /*Metodo que duerme al test durante 3 segundos para facilitar la visualizacion de las acciones
      realizadas */
     private void sleep() {

diff --git a/GimnasIO/app/src/main/java/com/patan/gimnasio/database/GymnasioDBAdapter.java b/GimnasIO/app/src/main/java/com/patan/gimnasio/database/GymnasioDBAdapter.java
@@ -24,7 +24,7 @@ public class GymnasioDBAdapter {
     private DatabaseHelper DbHelper;
     private SQLiteDatabase Db;
 
-    private static final int DATABASE_VERSION = 10002;
+    private static final int DATABASE_VERSION = 10003;
     private static final String DATABASE_NAME = "GymnasIOapp.db";
     private static final String Table_Routine = "Routine";
     private static final String Table_Exercise = "Exercise";

diff --git a/GimnasIO/app/src/main/res/layout/fragment_execute_routine_exercise.xml b/GimnasIO/app/src/main/res/layout/fragment_execute_routine_exercise.xml
@@ -11,6 +11,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
+        android:id="@+id/linearLayout8"
         android:layout_height="555dp"
         android:layout_marginTop="8dp"
         android:gravity="top|center"