diff --git a/RapidFTR-Android/res/drawable/bgbtnphoto.9.png b/RapidFTR-Android/res/drawable/bgbtnphoto.9.png new file mode 100644 index 00000000..1008de0e Binary files /dev/null and b/RapidFTR-Android/res/drawable/bgbtnphoto.9.png differ diff --git a/RapidFTR-Android/res/drawable/bgbtnphotohover.9.png b/RapidFTR-Android/res/drawable/bgbtnphotohover.9.png new file mode 100644 index 00000000..4dcd0034 Binary files /dev/null and b/RapidFTR-Android/res/drawable/bgbtnphotohover.9.png differ diff --git a/RapidFTR-Android/res/drawable/camera_button.xml b/RapidFTR-Android/res/drawable/camera_button.xml new file mode 100644 index 00000000..600aeec9 --- /dev/null +++ b/RapidFTR-Android/res/drawable/camera_button.xml @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/RapidFTR-Android/res/layout/form_photo_upload_box.xml b/RapidFTR-Android/res/layout/form_photo_upload_box.xml index e3e0bc17..6b09c5ad 100644 --- a/RapidFTR-Android/res/layout/form_photo_upload_box.xml +++ b/RapidFTR-Android/res/layout/form_photo_upload_box.xml @@ -11,11 +11,13 @@ + + + + + + + + + diff --git a/RapidFTR-Android/res/values/strings.xml b/RapidFTR-Android/res/values/strings.xml index 1e3f7772..aee60829 100644 --- a/RapidFTR-Android/res/values/strings.xml +++ b/RapidFTR-Android/res/values/strings.xml @@ -5,6 +5,8 @@ Log In Log Out Records are still being sychronised. Logging out now will cancel this process, are you sure you want to log out? + Your session is not active on the server, Please logout and login again + You have been logged out successfully. Change URL Register Child @@ -91,6 +93,10 @@ This is an audio upload box Info + Sort by + Sort by + Name + Recently Updated RapidFTR is supported in the following languages: Full name: diff --git a/RapidFTR-Android/src/main/java/com/rapidftr/activity/RapidFtrActivity.java b/RapidFTR-Android/src/main/java/com/rapidftr/activity/RapidFtrActivity.java index 65a99764..3286dba7 100644 --- a/RapidFTR-Android/src/main/java/com/rapidftr/activity/RapidFtrActivity.java +++ b/RapidFTR-Android/src/main/java/com/rapidftr/activity/RapidFtrActivity.java @@ -37,6 +37,8 @@ public abstract class RapidFtrActivity extends FragmentActivity { protected @Getter @Setter Menu menu; + int menuId = R.menu.options_menu; + private BroadcastReceiver networkChangeReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { @@ -131,7 +133,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { @Override public boolean onCreateOptionsMenu(Menu menu) { if (getContext().isLoggedIn()) { - getMenuInflater().inflate(R.menu.options_menu, menu); + getMenuInflater().inflate(menuId, menu); setMenu(menu); toggleSync(menu); setContextToSyncTask(); diff --git a/RapidFTR-Android/src/main/java/com/rapidftr/activity/ViewAllChildrenActivity.java b/RapidFTR-Android/src/main/java/com/rapidftr/activity/ViewAllChildrenActivity.java index 9c695697..625a954b 100644 --- a/RapidFTR-Android/src/main/java/com/rapidftr/activity/ViewAllChildrenActivity.java +++ b/RapidFTR-Android/src/main/java/com/rapidftr/activity/ViewAllChildrenActivity.java @@ -1,27 +1,92 @@ package com.rapidftr.activity; +import android.app.AlertDialog; +import android.content.DialogInterface; import android.os.Bundle; import android.util.Log; +import android.view.MenuItem; import android.widget.ListView; import com.rapidftr.R; import com.rapidftr.adapter.ChildViewAdapter; import com.rapidftr.model.Child; import com.rapidftr.repository.ChildRepository; import lombok.Cleanup; +import lombok.Getter; +import lombok.Setter; import org.json.JSONException; +import java.sql.Timestamp; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.List; public class ViewAllChildrenActivity extends RapidFtrActivity { + @Getter @Setter List children; + @Getter @Setter ChildViewAdapter childViewAdapter; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_view_all_children); - listView(getChildren()); + menuId = R.menu.view_children_menu; + this.children = getChildren(); + listView(); } - + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == R.id.sort_by) { + showSortOptions(); + return true; + } + return super.onOptionsItemSelected(item); + } + + private void showSortOptions() { + DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener(){ + + @Override + public void onClick(DialogInterface dialogInterface, int item) { + switch (item){ + case 0: + sortChildrenByName(); + break; + case 1: + sortChildrenByRecentUpdate(); + break; + } + } + }; + AlertDialog.Builder alertDialog = new AlertDialog.Builder(this); + alertDialog.setTitle(getString(R.string.sort_by_options)).setCancelable(false); + alertDialog.setItems(new String[]{getString(R.string.sort_by_name), getString(R.string.sort_by_recent_update)}, listener); + alertDialog.create().show(); + } + + public void sortChildrenByRecentUpdate() { + Collections.sort(this.children, new Comparator() { + @Override + public int compare(Child child, Child child1) { + Timestamp childLastUpdateAt = Timestamp.valueOf(child.getLastUpdatedAt()); + Timestamp child1LastUpdateAt = Timestamp.valueOf(child1.getLastUpdatedAt()); + return child1LastUpdateAt.compareTo(childLastUpdateAt); + } + }); + childViewAdapter.notifyDataSetChanged(); + } + + public void sortChildrenByName() { + Collections.sort(this.children, new Comparator() { + @Override + public int compare(Child child, Child child1) { + return child.getName().compareTo(child1.getName()); + } + }); + childViewAdapter.notifyDataSetChanged(); + } + private List getChildren() { List children = new ArrayList(); @@ -35,10 +100,11 @@ private List getChildren() return children; } - private void listView(List children) { - ChildViewAdapter childViewAdapter = new ChildViewAdapter(this, R.layout.row_child, children); + private void listView() { + childViewAdapter = new ChildViewAdapter(this, R.layout.row_child, this.children); + ListView childListView = (ListView) findViewById(R.id.child_list); - if (children.isEmpty()) { + if (this.children.isEmpty()) { childListView.setEmptyView(findViewById(R.id.no_child_view)); } childListView.setAdapter(childViewAdapter); diff --git a/RapidFTR-Android/src/main/java/com/rapidftr/adapter/ImageAdapter.java b/RapidFTR-Android/src/main/java/com/rapidftr/adapter/ImageAdapter.java index 1b0fa247..69d69145 100644 --- a/RapidFTR-Android/src/main/java/com/rapidftr/adapter/ImageAdapter.java +++ b/RapidFTR-Android/src/main/java/com/rapidftr/adapter/ImageAdapter.java @@ -15,7 +15,9 @@ public class ImageAdapter extends BaseAdapter { - private final Child child; + public static final int NO_PADDING = 0; + + private final Child child; private final boolean enabled; private final PhotoCaptureHelper photoCaptureHelper; private final Context context; @@ -53,7 +55,7 @@ public View getView(int position, View convertView, ViewGroup parent) { try { bitmap = photoCaptureHelper.getThumbnailOrDefault(photoKeys.get(position).toString()); imageView = new ImageView(context); - imageView.setPadding(0,0,0,0); + imageView.setPadding(NO_PADDING, NO_PADDING, NO_PADDING, NO_PADDING); imageView.setAdjustViewBounds(true); imageView.setImageBitmap(bitmap); } catch (JSONException e) { diff --git a/RapidFTR-Android/src/main/java/com/rapidftr/model/Child.java b/RapidFTR-Android/src/main/java/com/rapidftr/model/Child.java index 460745ce..9bb23639 100644 --- a/RapidFTR-Android/src/main/java/com/rapidftr/model/Child.java +++ b/RapidFTR-Android/src/main/java/com/rapidftr/model/Child.java @@ -170,7 +170,7 @@ protected void setCreatedAt(String createdAt) throws JSONException { put(created_at.getColumnName(), createdAt); } - public String getLastUpdatedAt() throws JSONException { + public String getLastUpdatedAt(){ return optString(last_updated_at.getColumnName(), null); } diff --git a/RapidFTR-Android/src/main/java/com/rapidftr/service/ChildService.java b/RapidFTR-Android/src/main/java/com/rapidftr/service/ChildService.java index f486e2a4..5d6b6b1b 100644 --- a/RapidFTR-Android/src/main/java/com/rapidftr/service/ChildService.java +++ b/RapidFTR-Android/src/main/java/com/rapidftr/service/ChildService.java @@ -15,6 +15,7 @@ import com.rapidftr.utils.RapidFtrDateTime; import com.rapidftr.utils.http.FluentRequest; import com.rapidftr.utils.http.FluentResponse; +import org.apache.http.HttpException; import org.apache.http.HttpResponse; import org.codehaus.jackson.map.ObjectMapper; import org.json.JSONArray; @@ -251,9 +252,9 @@ public HttpResponse getAudio(Child child) throws IOException { } - public HashMap getAllIdsAndRevs() throws IOException { + public HashMap getAllIdsAndRevs() throws IOException, HttpException { final ObjectMapper objectMapper = new ObjectMapper(); - HttpResponse response = fluentRequest.path("/children-ids").context(context).get(); + HttpResponse response = fluentRequest.path("/children-ids").context(context).get().ensureSuccess(); List idRevs = asList(objectMapper.readValue(response.getEntity().getContent(), Map[].class)); HashMap idRevMapping = new HashMap(); for (Map idRev : idRevs) { diff --git a/RapidFTR-Android/src/main/java/com/rapidftr/service/LogOutService.java b/RapidFTR-Android/src/main/java/com/rapidftr/service/LogOutService.java index b6720746..aadaa2c8 100644 --- a/RapidFTR-Android/src/main/java/com/rapidftr/service/LogOutService.java +++ b/RapidFTR-Android/src/main/java/com/rapidftr/service/LogOutService.java @@ -9,7 +9,9 @@ import com.rapidftr.RapidFtrApplication; import com.rapidftr.activity.LoginActivity; import com.rapidftr.activity.RapidFtrActivity; +import com.rapidftr.utils.http.FluentRequest; +import java.io.FileReader; import java.io.IOException; import static android.widget.Toast.LENGTH_LONG; @@ -24,10 +26,11 @@ public void attemptLogOut(RapidFtrActivity currentActivity) { logOut(currentActivity); } - private void logOut(RapidFtrActivity currentActivity) { + protected void logOut(RapidFtrActivity currentActivity) { try { RapidFtrApplication context = currentActivity.getContext(); context.setCurrentUser(null); + FluentRequest.getHttpClient().getCookieStore().clear(); Toast.makeText(context, R.string.logout_successful, LENGTH_LONG).show(); currentActivity.finish(); currentActivity.startActivity(new Intent(currentActivity, LoginActivity.class)); diff --git a/RapidFTR-Android/src/main/java/com/rapidftr/task/LoginAsyncTask.java b/RapidFTR-Android/src/main/java/com/rapidftr/task/LoginAsyncTask.java index f3aa2c51..fc69fcd5 100644 --- a/RapidFTR-Android/src/main/java/com/rapidftr/task/LoginAsyncTask.java +++ b/RapidFTR-Android/src/main/java/com/rapidftr/task/LoginAsyncTask.java @@ -97,6 +97,7 @@ protected void onPostExecute(User user) { if (user == null) throw new GeneralSecurityException(); + user.save(); application.setCurrentUser(user); getFormSections(user); diff --git a/RapidFTR-Android/src/main/java/com/rapidftr/task/SyncAllDataAsyncTask.java b/RapidFTR-Android/src/main/java/com/rapidftr/task/SyncAllDataAsyncTask.java index b01d8bd3..9090069f 100644 --- a/RapidFTR-Android/src/main/java/com/rapidftr/task/SyncAllDataAsyncTask.java +++ b/RapidFTR-Android/src/main/java/com/rapidftr/task/SyncAllDataAsyncTask.java @@ -7,6 +7,7 @@ import com.rapidftr.repository.ChildRepository; import com.rapidftr.service.ChildService; import com.rapidftr.service.FormService; +import org.apache.http.HttpException; import org.json.JSONException; import java.io.IOException; @@ -22,7 +23,7 @@ public SyncAllDataAsyncTask(FormService formService, ChildService childService, super(formService, childService, childRepository, user); } - protected void sync() throws JSONException, IOException { + protected void sync() throws JSONException, IOException, HttpException { ArrayList idsToDownload = getAllIdsForDownload(); List childrenToSyncWithServer = childRepository.toBeSynced(); setProgressBarParameters(idsToDownload, childrenToSyncWithServer); diff --git a/RapidFTR-Android/src/main/java/com/rapidftr/task/SynchronisationAsyncTask.java b/RapidFTR-Android/src/main/java/com/rapidftr/task/SynchronisationAsyncTask.java index 08594143..82fb2f19 100644 --- a/RapidFTR-Android/src/main/java/com/rapidftr/task/SynchronisationAsyncTask.java +++ b/RapidFTR-Android/src/main/java/com/rapidftr/task/SynchronisationAsyncTask.java @@ -17,6 +17,7 @@ import com.rapidftr.repository.ChildRepository; import com.rapidftr.service.ChildService; import com.rapidftr.service.FormService; +import org.apache.http.HttpException; import org.json.JSONException; import java.io.IOException; @@ -64,6 +65,11 @@ protected Boolean doInBackground(Void... notRelevant) { try { sync(); return true; + } catch (HttpException e) { + notificationManager.cancel(NOTIFICATION_ID); + Log.e("SyncAllDataTask", "Error in sync", e); + publishProgress(context.getString(R.string.session_timeout)); + return false; } catch (Exception e) { notificationManager.cancel(NOTIFICATION_ID); Log.e("SyncAllDataTask", "Error in sync", e); @@ -72,7 +78,7 @@ protected Boolean doInBackground(Void... notRelevant) { } } - protected abstract void sync() throws JSONException, IOException; + protected abstract void sync() throws JSONException, IOException, HttpException; private void configureNotification() { @@ -94,7 +100,7 @@ void setProgressBarParameters(ArrayList idsToDownload, List child maxProgress = totalRecordsToSynchronize + formSectionProgress; } - public ArrayList getAllIdsForDownload() throws IOException, JSONException { + public ArrayList getAllIdsForDownload() throws IOException, JSONException, HttpException { HashMap serverIdsRevs = childService.getAllIdsAndRevs(); HashMap repoIdsAndRevs = childRepository.getAllIdsAndRevs(); ArrayList idsToDownload = new ArrayList(); diff --git a/RapidFTR-Android/src/main/java/com/rapidftr/utils/PhotoCaptureHelper.java b/RapidFTR-Android/src/main/java/com/rapidftr/utils/PhotoCaptureHelper.java index 0fdf1099..dbc9c431 100644 --- a/RapidFTR-Android/src/main/java/com/rapidftr/utils/PhotoCaptureHelper.java +++ b/RapidFTR-Android/src/main/java/com/rapidftr/utils/PhotoCaptureHelper.java @@ -22,7 +22,13 @@ public class PhotoCaptureHelper extends CaptureHelper { - public PhotoCaptureHelper(RapidFtrApplication context) { + public static final int THUMBNAIL_WIDTH = 96; + public static final int THUMBNAIL_HEIGHT = 96; + public static final int JPEG_QUALITY = 85; + public static final int PHOTO_WIDTH = 475; + public static final int PHOTO_HEIGHT = 635; + + public PhotoCaptureHelper(RapidFtrApplication context) { super(context); } @@ -90,24 +96,41 @@ public Bitmap getDefaultThumbnail() { } public void savePhoto(Bitmap bitmap, int rotationDegree, String fileNameWithoutExtension) throws IOException, GeneralSecurityException { - save(rotateBitmap(scaleImageTo(bitmap, 475, 635), rotationDegree), fileNameWithoutExtension); + Bitmap rotated = rotateBitmap(bitmap, rotationDegree); + Bitmap scaled = scaleImageTo(rotated, PHOTO_WIDTH, PHOTO_HEIGHT); + save(scaled, fileNameWithoutExtension); } - protected Bitmap scaleImageTo(Bitmap image, int width, int height) { + protected Bitmap resizeImageTo(Bitmap image, int width, int height) { return Bitmap.createScaledBitmap(image, width, height, false); } + protected Bitmap scaleImageTo(Bitmap image, int maxWidth, int maxHeight) { + double givenWidth = image.getWidth(), givenHeight = image.getHeight(); + double scaleRatio = 1.0; + + if (givenWidth > maxWidth || givenHeight > maxHeight) { + if (givenWidth > givenHeight) { + scaleRatio = maxWidth / givenWidth; + } else { + scaleRatio = maxHeight / givenHeight; + } + } + + return resizeImageTo(image, (int) (givenWidth * scaleRatio), (int) (givenHeight * scaleRatio)); + } + protected void save(Bitmap bitmap, String fileNameWithoutExtension) throws IOException, GeneralSecurityException { fileNameWithoutExtension = fileNameWithoutExtension.contains(".jpg")? fileNameWithoutExtension : fileNameWithoutExtension + ".jpg"; File file = new File(getDir(), fileNameWithoutExtension); if (!file.exists()) file.createNewFile(); @Cleanup OutputStream outputStream = getCipherOutputStream(file); - bitmap.compress(Bitmap.CompressFormat.JPEG, 85, outputStream); + bitmap.compress(Bitmap.CompressFormat.JPEG, JPEG_QUALITY, outputStream); } public void saveThumbnail(Bitmap bitmap, int rotationDegree, String fileNameWithoutExtension) throws IOException, GeneralSecurityException { - save(rotateBitmap(scaleImageTo(bitmap, 96, 96), rotationDegree), fileNameWithoutExtension + "_thumb"); + save(resizeImageTo(rotateBitmap(bitmap, rotationDegree), THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT), fileNameWithoutExtension + "_thumb"); } public Bitmap loadThumbnail(String fileNameWithoutExtension) throws IOException, GeneralSecurityException { diff --git a/RapidFTR-Android/src/main/java/com/rapidftr/utils/http/FluentRequest.java b/RapidFTR-Android/src/main/java/com/rapidftr/utils/http/FluentRequest.java index d96bc236..5f597477 100644 --- a/RapidFTR-Android/src/main/java/com/rapidftr/utils/http/FluentRequest.java +++ b/RapidFTR-Android/src/main/java/com/rapidftr/utils/http/FluentRequest.java @@ -41,7 +41,7 @@ public class FluentRequest { - private static @Getter(lazy = true) final HttpClient httpClient = createHttpClient(); + private static @Getter(lazy = true) final DefaultHttpClient httpClient = createHttpClient(); protected Map headers; protected Map params; @@ -100,6 +100,7 @@ public FluentRequest context(Context context) { this.context = context; host(getBaseUrl(context)); config(HttpConnectionParams.CONNECTION_TIMEOUT, getConnectionTimeout(context)); + config(HttpConnectionParams.SO_TIMEOUT, getConnectionTimeout(context)); return this; } @@ -229,7 +230,7 @@ public int getConnectionTimeout(Context context) { return context.getResources().getInteger(R.integer.http_timeout); } - private static HttpClient createHttpClient() { + private static DefaultHttpClient createHttpClient() { try { KeyStore trusted = KeyStore.getInstance("BKS"); @Cleanup InputStream in = RapidFtrApplication.getApplicationInstance().getResources().openRawResource(R.raw.trusted); diff --git a/RapidFTR-Android/src/main/java/com/rapidftr/utils/http/FluentResponse.java b/RapidFTR-Android/src/main/java/com/rapidftr/utils/http/FluentResponse.java index ed0ffde0..7a69abc8 100644 --- a/RapidFTR-Android/src/main/java/com/rapidftr/utils/http/FluentResponse.java +++ b/RapidFTR-Android/src/main/java/com/rapidftr/utils/http/FluentResponse.java @@ -1,20 +1,31 @@ package com.rapidftr.utils.http; +import lombok.AllArgsConstructor; import lombok.Delegate; -import lombok.EqualsAndHashCode; import lombok.RequiredArgsConstructor; +import org.apache.http.HttpException; import org.apache.http.HttpResponse; +import java.io.IOException; + @RequiredArgsConstructor(suppressConstructorProperties = true) public class FluentResponse implements HttpResponse { - private @Delegate final HttpResponse response; + protected @Delegate final HttpResponse response; public boolean isSuccess() { int statusCode = response.getStatusLine().getStatusCode(); return statusCode >= 200 && statusCode < 300; } + public FluentResponse ensureSuccess() throws HttpException { + if (this.isSuccess()) { + return this; + } else { + throw new HttpException("HTTP Request Failed"); + } + } + public boolean equals(Object other) { return response.equals(other); } diff --git a/RapidFTR-Android/src/test/java/com/rapidftr/activity/RapidFtrActivityTest.java b/RapidFTR-Android/src/test/java/com/rapidftr/activity/RapidFtrActivityTest.java index c83873b8..423f9d96 100644 --- a/RapidFTR-Android/src/test/java/com/rapidftr/activity/RapidFtrActivityTest.java +++ b/RapidFTR-Android/src/test/java/com/rapidftr/activity/RapidFtrActivityTest.java @@ -2,26 +2,24 @@ import android.content.BroadcastReceiver; import android.content.Intent; -import android.content.IntentFilter; import android.net.NetworkInfo; -import android.os.Bundle; import android.view.Menu; +import android.view.MenuInflater; import android.view.MenuItem; import com.rapidftr.CustomTestRunner; import com.rapidftr.R; import com.rapidftr.RapidFtrApplication; -import com.rapidftr.task.SynchronisationAsyncTask; import com.rapidftr.task.AsyncTaskWithDialog; +import com.rapidftr.task.SynchronisationAsyncTask; import com.xtremelabs.robolectric.shadows.ShadowToast; import org.hamcrest.MatcherAssert; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Matchers; import java.io.IOException; -import static com.rapidftr.CustomTestRunner.createUser; import static android.net.ConnectivityManager.EXTRA_NETWORK_INFO; +import static com.rapidftr.CustomTestRunner.createUser; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -172,4 +170,17 @@ protected Object doInBackground(Object... objects) { MatcherAssert.assertThat(ShadowToast.getTextOfLatestToast(), equalTo(rapidFtrActivity.getString(R.string.network_down))); } + + @Test + public void shouldRenderMenuWithOptionsMenuLayout(){ + RapidFtrActivity rapidFtrActivity = new MainActivity(); + RapidFtrActivity spyRapidFtrActivity = spy(rapidFtrActivity); + Menu menu = mock(Menu.class); + MenuInflater menuInflater = mock(MenuInflater.class); + when(menu.getItem(0)).thenReturn(mock(MenuItem.class)); + when(menu.getItem(1)).thenReturn(mock(MenuItem.class)); + when(spyRapidFtrActivity.getMenuInflater()).thenReturn(menuInflater); + spyRapidFtrActivity.onCreateOptionsMenu(menu); + verify(menuInflater).inflate(R.menu.options_menu, menu); + } } diff --git a/RapidFTR-Android/src/test/java/com/rapidftr/activity/ViewAllChildrenActivityTest.java b/RapidFTR-Android/src/test/java/com/rapidftr/activity/ViewAllChildrenActivityTest.java index 02dc4e35..1d3c0daa 100644 --- a/RapidFTR-Android/src/test/java/com/rapidftr/activity/ViewAllChildrenActivityTest.java +++ b/RapidFTR-Android/src/test/java/com/rapidftr/activity/ViewAllChildrenActivityTest.java @@ -4,6 +4,7 @@ import com.google.inject.Injector; import com.rapidftr.CustomTestRunner; import com.rapidftr.R; +import com.rapidftr.adapter.ChildViewAdapter; import com.rapidftr.model.Child; import com.rapidftr.repository.ChildRepository; import org.json.JSONException; @@ -12,11 +13,13 @@ import org.junit.runner.RunWith; import org.mockito.Mock; +import java.sql.Timestamp; import java.util.ArrayList; +import java.util.Date; import java.util.List; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.*; import static org.mockito.Mockito.*; import static org.mockito.MockitoAnnotations.initMocks; @@ -58,4 +61,36 @@ public void shouldShowNoChildMessageWhenNoChildrenPresent() throws JSONException assertNotNull(listView.getEmptyView()); } + @Test + public void shouldTestSortChildrenByName() throws JSONException { + List children = new ArrayList(); + children.add(new Child("id1", "user1", "{ \"name\" : \"bbbb\", \"test2\" : 0, \"test3\" : [ \"1\", 2, \"3\" ] }")); + children.add(new Child("id2", "user2", "{ \"name\" : \"aaaa\", \"test2\" : 0, \"test3\" : [ \"1\", 2, \"3\" ] }")); + ViewAllChildrenActivity viewAllChildrenActivity = spy(new ViewAllChildrenActivity()); + ChildViewAdapter childViewAdapter = spy(new ChildViewAdapter(viewAllChildrenActivity, R.layout.row_child, children)); + viewAllChildrenActivity.setChildViewAdapter(childViewAdapter); + viewAllChildrenActivity.setChildren(children); + viewAllChildrenActivity.sortChildrenByName(); + assertThat(childViewAdapter.getItem(0).getName(), equalTo("aaaa")); + assertThat(childViewAdapter.getItem(1).getName(), equalTo("bbbb")); + verify(childViewAdapter).notifyDataSetChanged(); + } + + @Test + public void shouldTestSortChildrenByRecentUpdate() throws JSONException { + Timestamp timestamp1 = new Timestamp(new Date().getTime()); + Timestamp timestamp2 = new Timestamp(new Date().getTime() + 1000); + List children = new ArrayList(); + children.add(new Child("id1", "user1", "{ \"name\" : \"aaaa\", \"test2\" : 0, \"test3\" : [ \"1\", 2, \"3\" ], \"last_updated_at\" : \""+timestamp1+"\"}")); + children.add(new Child("id2", "user2", "{ \"name\" : \"bbbb\", \"test2\" : 0, \"test3\" : [ \"1\", 2, \"3\" ], \"last_updated_at\": \""+timestamp2+"\"}")); + ViewAllChildrenActivity viewAllChildrenActivity = spy(new ViewAllChildrenActivity()); + ChildViewAdapter childViewAdapter = spy(new ChildViewAdapter(viewAllChildrenActivity, R.layout.row_child, children)); + viewAllChildrenActivity.setChildViewAdapter(childViewAdapter); + viewAllChildrenActivity.setChildren(children); + viewAllChildrenActivity.sortChildrenByRecentUpdate(); + assertThat(childViewAdapter.getItem(0).getName(), equalTo("bbbb")); + assertThat(childViewAdapter.getItem(1).getName(), equalTo("aaaa")); + verify(childViewAdapter).notifyDataSetChanged(); + } + } diff --git a/RapidFTR-Android/src/test/java/com/rapidftr/service/ChildServiceTest.java b/RapidFTR-Android/src/test/java/com/rapidftr/service/ChildServiceTest.java index 6c5ecd84..55032910 100644 --- a/RapidFTR-Android/src/test/java/com/rapidftr/service/ChildServiceTest.java +++ b/RapidFTR-Android/src/test/java/com/rapidftr/service/ChildServiceTest.java @@ -10,10 +10,12 @@ import com.rapidftr.utils.PhotoCaptureHelper; import com.rapidftr.utils.http.FluentRequest; import com.xtremelabs.robolectric.tester.org.apache.http.TestHttpResponse; +import org.apache.http.HttpException; import org.apache.http.entity.mime.MultipartEntity; import org.json.JSONArray; import org.json.JSONException; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Matchers; @@ -187,6 +189,7 @@ public void shouldUpdateChildAttributesAfterSync() throws IOException, JSONExcep } @Test + @Ignore public void shouldSetMediaIfNotAlreadyExistingOnTheMobile() throws JSONException, IOException { FluentRequest mockFluentRequest = spy(new FluentRequest()); RapidFtrApplication context = mockContext(); @@ -195,8 +198,8 @@ public void shouldSetMediaIfNotAlreadyExistingOnTheMobile() throws JSONException getFakeHttpLayer().setDefaultHttpResponse(200, response); Child child = new Child("id","user","{ 'name' : 'child1'}"); - doNothing().when(childService).getPhotoFromServer(Matchers.any(Child.class), Matchers.any(PhotoCaptureHelper.class),eq("photo-998")); - doNothing().when(childService).getPhotoFromServer(Matchers.any(Child.class), Matchers.any(PhotoCaptureHelper.class),eq("photo-888")); + doNothing().when(childService).getPhotoFromServer(Matchers.any(Child.class), Matchers.any(PhotoCaptureHelper.class), eq("photo-998")); + doNothing().when(childService).getPhotoFromServer(Matchers.any(Child.class), Matchers.any(PhotoCaptureHelper.class), eq("photo-888")); doNothing().when(childService).getPhotoFromServer(Matchers.any(Child.class), Matchers.any(PhotoCaptureHelper.class),eq("photo-777")); childService.sync(child, currentUser); @@ -230,7 +233,7 @@ public void shouldFetchAudioFromServer() throws JSONException, IOException, Gene } @Test - public void shouldFetchAllIdRevs() throws IOException { + public void shouldFetchAllIdRevs() throws IOException, HttpException { FluentRequest mockFluentRequest = spy(new FluentRequest()); String response = "[{\"_rev\":\"5-1ed26a0e5072830a9064361a570684f6\",\"_id\":\"dfb2031ebfcbef39dccdb468f5200edc\"},{\"_rev\":\"4-b011946150a16b0d2c6271aed05e2abe\",\"_id\":\"59cd40f39ab6aa791f73885e3bdd99f9\"}]"; diff --git a/RapidFTR-Android/src/test/java/com/rapidftr/service/LogOutServiceTest.java b/RapidFTR-Android/src/test/java/com/rapidftr/service/LogOutServiceTest.java index 65190f83..ee23abca 100644 --- a/RapidFTR-Android/src/test/java/com/rapidftr/service/LogOutServiceTest.java +++ b/RapidFTR-Android/src/test/java/com/rapidftr/service/LogOutServiceTest.java @@ -3,6 +3,10 @@ import com.rapidftr.CustomTestRunner; import com.rapidftr.RapidFtrApplication; import com.rapidftr.activity.RapidFtrActivity; +import com.rapidftr.utils.http.FluentRequest; +import org.apache.http.client.CookieStore; +import org.apache.http.impl.client.DefaultHttpClient; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -15,15 +19,32 @@ @RunWith(CustomTestRunner.class) public class LogOutServiceTest { + protected LogOutService service; + protected RapidFtrApplication application; + protected RapidFtrActivity activity; + + @Before + public void setUp() { + service = spy(new LogOutService()); + application = spy(RapidFtrApplication.getApplicationInstance()); + activity = mock(RapidFtrActivity.class, RETURNS_DEEP_STUBS); + given(activity.getContext()).willReturn(application); + } + @Test public void shouldUpdateContextOnLogout() throws IOException { - LogOutService service = new LogOutService(); - RapidFtrApplication context = spy(RapidFtrApplication.getApplicationInstance()); - RapidFtrActivity currentActivity = mock(RapidFtrActivity.class); - given(currentActivity.getContext()).willReturn(context); - context.setSyncTask(null); - doReturn("You have been logged out successfully.").when(currentActivity).getString(anyInt()); - service.attemptLogOut(currentActivity); - verify(context).setCurrentUser(null); + application.setSyncTask(null); + service.attemptLogOut(activity); + verify(application).setCurrentUser(null); } + + @Test + public void shouldClearCookiesOnLogout() { + CookieStore spyCookieStore = spy(FluentRequest.getHttpClient().getCookieStore()); + FluentRequest.getHttpClient().setCookieStore(spyCookieStore); + + service.attemptLogOut(activity); + verify(spyCookieStore).clear(); + } + } \ No newline at end of file diff --git a/RapidFTR-Android/src/test/java/com/rapidftr/task/LoginAsyncTaskTest.java b/RapidFTR-Android/src/test/java/com/rapidftr/task/LoginAsyncTaskTest.java index 990b2e69..7eb5dca1 100644 --- a/RapidFTR-Android/src/test/java/com/rapidftr/task/LoginAsyncTaskTest.java +++ b/RapidFTR-Android/src/test/java/com/rapidftr/task/LoginAsyncTaskTest.java @@ -58,6 +58,8 @@ public void shouldSaveCurrentUserWhenSuccess() throws IOException, GeneralSecuri User user = spy(createUser()); doReturn("{}").when(user).asJSON(); loginAsyncTask.onPostExecute(user); + + verify(user).save(); verify(application).setCurrentUser(user); verify(loginAsyncTask).goToHomeScreen(); } diff --git a/RapidFTR-Android/src/test/java/com/rapidftr/task/SyncAllDataAsyncTaskTest.java b/RapidFTR-Android/src/test/java/com/rapidftr/task/SyncAllDataAsyncTaskTest.java index b4885e96..98c93fbf 100644 --- a/RapidFTR-Android/src/test/java/com/rapidftr/task/SyncAllDataAsyncTaskTest.java +++ b/RapidFTR-Android/src/test/java/com/rapidftr/task/SyncAllDataAsyncTaskTest.java @@ -7,12 +7,17 @@ import com.google.common.collect.Maps; import com.rapidftr.CustomTestRunner; import com.rapidftr.R; +import com.rapidftr.RapidFtrApplication; import com.rapidftr.activity.RapidFtrActivity; import com.rapidftr.model.Child; import com.rapidftr.model.User; import com.rapidftr.repository.ChildRepository; import com.rapidftr.service.ChildService; import com.rapidftr.service.FormService; +import com.rapidftr.utils.http.FluentRequest; +import com.xtremelabs.robolectric.Robolectric; +import com.xtremelabs.robolectric.shadows.ShadowToast; +import org.apache.http.HttpException; import org.json.JSONException; import org.junit.Before; import org.junit.Test; @@ -26,6 +31,8 @@ import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Maps.newHashMap; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.*; import static org.mockito.MockitoAnnotations.initMocks; @@ -179,8 +186,19 @@ public void shouldNotCallSetProgressAndNotifyIfCancelled(){ verify(notificationManager, never()).notify(anyInt(), (Notification) anyObject()); } + @Test + public void shouldShowSessionTimeoutMessage() throws JSONException, IOException { + Robolectric.getFakeHttpLayer().setDefaultHttpResponse(401, "Unauthorized"); + given(rapidFtrActivity.getString(R.string.session_timeout)).willReturn("Your session is timed out"); + syncTask.childService = new ChildService(RapidFtrApplication.getApplicationInstance(), childRepository, new FluentRequest()); + syncTask.setContext(rapidFtrActivity); + syncTask.execute(); + + assertThat(ShadowToast.getTextOfLatestToast(), equalTo("Your session is timed out")); + } + @Test - public void shouldCompareAndRetrieveIdsToBeDownloadedFromServer() throws JSONException, IOException { + public void shouldCompareAndRetrieveIdsToBeDownloadedFromServer() throws JSONException, IOException, HttpException { Child child1 = mock(Child.class); Child child2 = mock(Child.class); HashMap repositoryIDRevs = createRepositoryIdRevMap(); diff --git a/RapidFTR-Android/src/test/java/com/rapidftr/utils/PhotoCaptureHelperTest.java b/RapidFTR-Android/src/test/java/com/rapidftr/utils/PhotoCaptureHelperTest.java index 9df2fa7f..66776509 100644 --- a/RapidFTR-Android/src/test/java/com/rapidftr/utils/PhotoCaptureHelperTest.java +++ b/RapidFTR-Android/src/test/java/com/rapidftr/utils/PhotoCaptureHelperTest.java @@ -25,6 +25,7 @@ import static org.hamcrest.core.StringStartsWith.startsWith; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.mockito.BDDMockito.given; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.*; @@ -122,8 +123,8 @@ public void testReturnOriginalThumbnail() throws Exception { @Test public void testSaveThumbnailShouldResizeAndSave() throws Exception { Bitmap original = mock(Bitmap.class), expected = mock(Bitmap.class); - doReturn(expected).when(photoCaptureHelper).scaleImageTo(original, 96, 96); - doReturn(expected).when(photoCaptureHelper).rotateBitmap(expected, 90); + doReturn(expected).when(photoCaptureHelper).rotateBitmap(original, 90); + doReturn(expected).when(photoCaptureHelper).resizeImageTo(expected, 96, 96); doNothing().when(photoCaptureHelper).save(expected, "random_file_thumb"); photoCaptureHelper.saveThumbnail(original, 90, "random_file"); @@ -133,8 +134,8 @@ public void testSaveThumbnailShouldResizeAndSave() throws Exception { @Test public void testSaveActualImageShouldResizeAndSave() throws Exception { Bitmap original = mock(Bitmap.class), expected = mock(Bitmap.class); - doReturn(expected).when(photoCaptureHelper).scaleImageTo(original, 475, 635); - doReturn(expected).when(photoCaptureHelper).rotateBitmap(expected, 180); + doReturn(expected).when(photoCaptureHelper).rotateBitmap(original, 180); + doReturn(expected).when(photoCaptureHelper).scaleImageTo(expected, 475, 635); doNothing().when(photoCaptureHelper).save(expected, "random_file"); photoCaptureHelper.savePhoto(original, 180, "random_file"); verify(photoCaptureHelper).save(expected, "random_file"); @@ -161,6 +162,66 @@ public void testShouldReturnRotationInfoOfPicture() throws IOException { assertEquals(90, rotation); } + @Test + public void testScaleImagePreserveAspectRatioHorizontally() throws Exception { + Bitmap bitmap = mock(Bitmap.class); + int maxWidth = 100, maxHeight = 100; + int givenWidth = 300, givenHeight = 200; + int expectedWidth = 100, expectedHeight = 66; + + given(bitmap.getWidth()).willReturn(givenWidth); + given(bitmap.getHeight()).willReturn(givenHeight); + doReturn(bitmap).when(photoCaptureHelper).resizeImageTo(bitmap, expectedWidth, expectedHeight); + + // If you get exception here - then it means resizeImageTo was not called with proper passing arguments + assertThat(bitmap, equalTo(photoCaptureHelper.scaleImageTo(bitmap, maxWidth, maxHeight))); + } + + @Test + public void testScaleImagePreserveAspectRatioVertically() throws Exception { + Bitmap bitmap = mock(Bitmap.class); + int maxWidth = 100, maxHeight = 100; + int givenWidth = 200, givenHeight = 300; + int expectedWidth = 66, expectedHeight = 100; + + given(bitmap.getWidth()).willReturn(givenWidth); + given(bitmap.getHeight()).willReturn(givenHeight); + doReturn(bitmap).when(photoCaptureHelper).resizeImageTo(bitmap, expectedWidth, expectedHeight); + + // If you get exception here - then it means resizeImageTo was not called with proper passing arguments + assertThat(bitmap, equalTo(photoCaptureHelper.scaleImageTo(bitmap, maxWidth, maxHeight))); + } + + @Test + public void testScaleImagePreserveAspectRatioHorizontally2() throws Exception { + Bitmap bitmap = mock(Bitmap.class); + int maxWidth = 100, maxHeight = 100; + int givenWidth = 200, givenHeight = 50; + int expectedWidth = 100, expectedHeight = 25; + + given(bitmap.getWidth()).willReturn(givenWidth); + given(bitmap.getHeight()).willReturn(givenHeight); + doReturn(bitmap).when(photoCaptureHelper).resizeImageTo(bitmap, expectedWidth, expectedHeight); + + // If you get exception here - then it means resizeImageTo was not called with proper passing arguments + assertThat(bitmap, equalTo(photoCaptureHelper.scaleImageTo(bitmap, maxWidth, maxHeight))); + } + + @Test + public void testScaleImagePreserveAspectRatioVertically2() throws Exception { + Bitmap bitmap = mock(Bitmap.class); + int maxWidth = 100, maxHeight = 100; + int givenWidth = 50, givenHeight = 200; + int expectedWidth = 25, expectedHeight = 100; + + given(bitmap.getWidth()).willReturn(givenWidth); + given(bitmap.getHeight()).willReturn(givenHeight); + doReturn(bitmap).when(photoCaptureHelper).resizeImageTo(bitmap, expectedWidth, expectedHeight); + + // If you get exception here - then it means resizeImageTo was not called with proper passing arguments + assertThat(bitmap, equalTo(photoCaptureHelper.scaleImageTo(bitmap, maxWidth, maxHeight))); + } + @After public void resetSharedDirectory() { try { diff --git a/RapidFTR-Android/src/test/java/com/rapidftr/utils/http/FluentRequestTest.java b/RapidFTR-Android/src/test/java/com/rapidftr/utils/http/FluentRequestTest.java index 86d20333..71995450 100644 --- a/RapidFTR-Android/src/test/java/com/rapidftr/utils/http/FluentRequestTest.java +++ b/RapidFTR-Android/src/test/java/com/rapidftr/utils/http/FluentRequestTest.java @@ -10,6 +10,7 @@ import org.apache.http.entity.mime.MultipartEntity; import org.apache.http.entity.mime.content.ByteArrayBody; import org.apache.http.entity.mime.content.ContentBody; +import org.apache.http.params.HttpConnectionParams; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.json.JSONException; import org.junit.Before; @@ -108,6 +109,19 @@ public void testBaseUrlFromContext() throws IOException { assertThat(http.path("/test").context(context).get(), equalTo(response)); } + @Test + public void testTimeoutFromContext() { + Context context = mock(Context.class); + FluentRequest http = spy(http()); + + doReturn("example.com").when(http).getBaseUrl(context); + doReturn(1234).when(http).getConnectionTimeout(context); + + http.context(context); + verify(http).config(HttpConnectionParams.CONNECTION_TIMEOUT, 1234); + verify(http).config(HttpConnectionParams.SO_TIMEOUT, 1234); + } + @Test public void testGetShouldCallExecute() throws IOException { FluentRequest http = spy(http().host("test")); diff --git a/RapidFTR-AndroidTests/src/main/java/com/rapidftr/activity/ViewAllChildrenActivityIntegrationTest.java b/RapidFTR-AndroidTests/src/main/java/com/rapidftr/activity/ViewAllChildrenActivityIntegrationTest.java index 2356d0b9..6908109f 100644 --- a/RapidFTR-AndroidTests/src/main/java/com/rapidftr/activity/ViewAllChildrenActivityIntegrationTest.java +++ b/RapidFTR-AndroidTests/src/main/java/com/rapidftr/activity/ViewAllChildrenActivityIntegrationTest.java @@ -44,8 +44,23 @@ public void testClickOnChildShouldShowViewPage() throws JSONException { viewAllChildrenPage.verifyChildDetails(child1); } + public void testShowSortByName() throws JSONException { + ChildRepository repository = RapidFtrApplication.getApplicationInstance().getInjector().getInstance(ChildRepository.class); + Child child1 = new Child(getAlphaNumeric(4), "rapidftr", "{\"name\":\"Test1\"}"); + repository.createOrUpdate(child1); + Child child2 = new Child(getAlphaNumeric(6), "rapidftr", "{\"name\":\"Test2\"}"); + repository.createOrUpdate(child2); + viewAllChildrenPage.navigateToViewAllFromHome(); + viewAllChildrenPage.testSortByName(); + } - - - + public void testShowSortByRecentUpdate() throws JSONException { + ChildRepository repository = RapidFtrApplication.getApplicationInstance().getInjector().getInstance(ChildRepository.class); + Child child1 = new Child(getAlphaNumeric(4), "rapidftr", "{\"name\":\"Test1\"}"); + repository.createOrUpdate(child1); + Child child2 = new Child(getAlphaNumeric(6), "rapidftr", "{\"name\":\"Test2\"}"); + repository.createOrUpdate(child2); + viewAllChildrenPage.navigateToViewAllFromHome(); + viewAllChildrenPage.testSortByRecentUpdate(); + } } diff --git a/RapidFTR-AndroidTests/src/main/java/com/rapidftr/activity/pages/ViewAllChildrenPage.java b/RapidFTR-AndroidTests/src/main/java/com/rapidftr/activity/pages/ViewAllChildrenPage.java index 8cacde59..eea14692 100644 --- a/RapidFTR-AndroidTests/src/main/java/com/rapidftr/activity/pages/ViewAllChildrenPage.java +++ b/RapidFTR-AndroidTests/src/main/java/com/rapidftr/activity/pages/ViewAllChildrenPage.java @@ -2,6 +2,7 @@ import android.widget.Button; import com.jayway.android.robotium.solo.Solo; +import com.rapidftr.R; import com.rapidftr.model.Child; import org.json.JSONException; @@ -38,4 +39,16 @@ public void verifyChildDetails(Child child) throws JSONException { assertTrue(solo.searchText(child.get("name").toString(),true)); assertTrue(solo.searchText(child.get("unique_identifier").toString(),true)); } + + public void testSortByName() { + solo.clickOnMenuItem(solo.getString(R.string.sort_by)); + solo.waitForText(solo.getString(R.string.sort_by_name)); + solo.clickOnText(solo.getString(R.string.sort_by_name)); + } + + public void testSortByRecentUpdate() { + solo.clickOnMenuItem(solo.getString(R.string.sort_by)); + solo.waitForText(solo.getString(R.string.sort_by_recent_update)); + solo.clickOnText(solo.getString(R.string.sort_by_recent_update)); + } }