Переглянути джерело

Added bryan's junit tests

BMcGuffin 9 роки тому
батько
коміт
248aba6272
35 змінених файлів з 691 додано та 236 видалено
  1. BIN
      .gradle/3.3/taskArtifacts/fileHashes.bin
  2. BIN
      .gradle/3.3/taskArtifacts/fileSnapshots.bin
  3. BIN
      .gradle/3.3/taskArtifacts/taskArtifacts.bin
  4. BIN
      .gradle/3.3/taskArtifacts/taskArtifacts.lock
  5. 0 1
      .idea/.name
  6. 2 2
      .idea/libraries/android_about_page_1_2_1.xml
  7. 2 2
      .idea/libraries/animated_vector_drawable_25_3_1.xml
  8. 2 2
      .idea/libraries/appcompat_v7_25_3_1.xml
  9. 2 2
      .idea/libraries/constraint_layout_1_0_2.xml
  10. 1 1
      .idea/libraries/constraint_layout_solver_1_0_2.xml
  11. 2 2
      .idea/libraries/design_25_3_1.xml
  12. 2 2
      .idea/libraries/espresso_core_2_2_2.xml
  13. 2 2
      .idea/libraries/espresso_idling_resource_2_2_2.xml
  14. 2 2
      .idea/libraries/exposed_instrumentation_api_publish_0_5.xml
  15. 2 2
      .idea/libraries/recyclerview_v7_25_3_1.xml
  16. 2 2
      .idea/libraries/rules_0_5.xml
  17. 2 2
      .idea/libraries/runner_0_5.xml
  18. 1 1
      .idea/libraries/support_annotations_25_3_1.xml
  19. 2 2
      .idea/libraries/support_compat_25_3_1.xml
  20. 2 2
      .idea/libraries/support_core_ui_25_3_1.xml
  21. 2 2
      .idea/libraries/support_core_utils_25_3_1.xml
  22. 2 2
      .idea/libraries/support_fragment_25_3_1.xml
  23. 2 2
      .idea/libraries/support_media_compat_25_3_1.xml
  24. 2 2
      .idea/libraries/support_v4_25_3_1.xml
  25. 2 2
      .idea/libraries/support_vector_drawable_25_3_1.xml
  26. 2 2
      .idea/libraries/transition_25_3_1.xml
  27. 1 1
      .idea/misc.xml
  28. 1 0
      .idea/modules.xml
  29. 1 1
      .idea/vcs.xml
  30. 555 182
      .idea/workspace.xml
  31. 34 7
      app/app.iml
  32. 16 2
      app/src/main/java/com/example/yiupang/freefoodfinder/EventDetailsScreen.java
  33. 27 0
      app/src/test/java/com/example/yiupang/freefoodfinder/TestEventDetailsScreen.java
  34. 14 0
      app/src/test/java/com/example/yiupang/freefoodfinder/TestEventDetailsSuite.java
  35. 2 2
      local.properties

BIN
.gradle/3.3/taskArtifacts/fileHashes.bin


BIN
.gradle/3.3/taskArtifacts/fileSnapshots.bin


BIN
.gradle/3.3/taskArtifacts/taskArtifacts.bin


BIN
.gradle/3.3/taskArtifacts/taskArtifacts.lock


+ 0 - 1
.idea/.name

@@ -1 +0,0 @@
-FreeFoodFinder

+ 2 - 2
.idea/libraries/android_about_page_1_2_1.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="android-about-page-1.2.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/df96387f6fddcb50615fe4ab189ad9632000b4f5/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/df96387f6fddcb50615fe4ab189ad9632000b4f5/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/13b34541f5e21ed9a74d42fc8a52ddd9348d8605/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/13b34541f5e21ed9a74d42fc8a52ddd9348d8605/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

+ 2 - 2
.idea/libraries/animated_vector_drawable_25_3_1.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="animated-vector-drawable-25.3.1">
     <CLASSES>
-      <root url="file://$USER_HOME$/.android/build-cache/bd7cabad640334ec59ff8f652d4ad3be0cbc6ca2/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/bd7cabad640334ec59ff8f652d4ad3be0cbc6ca2/output/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.android/build-cache/9ef508617706f05a4a39df5a69388aa022a0f719/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/9ef508617706f05a4a39df5a69388aa022a0f719/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

+ 2 - 2
.idea/libraries/appcompat_v7_25_3_1.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="appcompat-v7-25.3.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/4ece9611f778a1e3ea5252b8a5bddf073db342eb/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/4ece9611f778a1e3ea5252b8a5bddf073db342eb/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/a29c9d3de6a3255b5a26f20e052d82a9013e8404/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/a29c9d3de6a3255b5a26f20e052d82a9013e8404/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

+ 2 - 2
.idea/libraries/constraint_layout_1_0_2.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="constraint-layout-1.0.2">
     <CLASSES>
-      <root url="file://$USER_HOME$/.android/build-cache/0e4e3ad1ead514d8aa3fc3786b8cb679b0b4b49d/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/0e4e3ad1ead514d8aa3fc3786b8cb679b0b4b49d/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/84d8b0acb3b99a15f3c692ebc0f0141b582f6aae/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/84d8b0acb3b99a15f3c692ebc0f0141b582f6aae/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

+ 1 - 1
.idea/libraries/constraint_layout_solver_1_0_2.xml

@@ -1,7 +1,7 @@
 <component name="libraryTable">
   <library name="constraint-layout-solver-1.0.2">
     <CLASSES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2/constraint-layout-solver-1.0.2.jar!/" />
+      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2/constraint-layout-solver-1.0.2.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

+ 2 - 2
.idea/libraries/design_25_3_1.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="design-25.3.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/a7da00b8be25a1038a8db3c4569ba3d9187454bf/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/a7da00b8be25a1038a8db3c4569ba3d9187454bf/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/4928cc90af4ce9eae6a56a5155256a75bc64192c/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/4928cc90af4ce9eae6a56a5155256a75bc64192c/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

+ 2 - 2
.idea/libraries/espresso_core_2_2_2.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="espresso-core-2.2.2">
     <CLASSES>
-      <root url="file://$USER_HOME$/.android/build-cache/6ac5863065920c83f915fe6f8adab4b617613476/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/6ac5863065920c83f915fe6f8adab4b617613476/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/581e34eb1ee5319fe3fff8ee3ba3882557c764a0/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/581e34eb1ee5319fe3fff8ee3ba3882557c764a0/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

+ 2 - 2
.idea/libraries/espresso_idling_resource_2_2_2.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="espresso-idling-resource-2.2.2">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/1efe6db008cf579ef575df71513738678946ac47/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/1efe6db008cf579ef575df71513738678946ac47/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/0532832cd7a84b5263b3eb19be1fd0477feca440/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/0532832cd7a84b5263b3eb19be1fd0477feca440/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

+ 2 - 2
.idea/libraries/exposed_instrumentation_api_publish_0_5.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="exposed-instrumentation-api-publish-0.5">
     <CLASSES>
-      <root url="file://$USER_HOME$/.android/build-cache/112ff42879fea98857a969b1b6da27587a65117c/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/112ff42879fea98857a969b1b6da27587a65117c/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/87289e24842179f3998ffc1ea1eb8aebfd5fc0e0/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/87289e24842179f3998ffc1ea1eb8aebfd5fc0e0/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

+ 2 - 2
.idea/libraries/recyclerview_v7_25_3_1.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="recyclerview-v7-25.3.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/817d26429fc89bd427d802305ccbfa3d61d93400/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/817d26429fc89bd427d802305ccbfa3d61d93400/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/4224ad7eb41271b9c3afefdebb61b08b578ed1e2/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/4224ad7eb41271b9c3afefdebb61b08b578ed1e2/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

+ 2 - 2
.idea/libraries/rules_0_5.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="rules-0.5">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/ec0f32b3073487eba04f5a64047ab5540d92c7e1/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/ec0f32b3073487eba04f5a64047ab5540d92c7e1/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/a50c16e8537e05868eb31a8deeb79499427c568e/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/a50c16e8537e05868eb31a8deeb79499427c568e/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

+ 2 - 2
.idea/libraries/runner_0_5.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="runner-0.5">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/01c7ae1d02f8e4520644a925423ff02ac9c5baf6/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/01c7ae1d02f8e4520644a925423ff02ac9c5baf6/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/dc7208c049b1eec62b41c20ece9920f097da95c5/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/dc7208c049b1eec62b41c20ece9920f097da95c5/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

+ 1 - 1
.idea/libraries/support_annotations_25_3_1.xml

@@ -1,7 +1,7 @@
 <component name="libraryTable">
   <library name="support-annotations-25.3.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/25.3.1/support-annotations-25.3.1.jar!/" />
+      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/25.3.1/support-annotations-25.3.1.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

+ 2 - 2
.idea/libraries/support_compat_25_3_1.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="support-compat-25.3.1">
     <CLASSES>
-      <root url="file://$USER_HOME$/.android/build-cache/6d218a0d73795c309497535a81dca60f321f6006/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/6d218a0d73795c309497535a81dca60f321f6006/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/8123731923848cddedf740b3920f5393233d413b/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/8123731923848cddedf740b3920f5393233d413b/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

+ 2 - 2
.idea/libraries/support_core_ui_25_3_1.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="support-core-ui-25.3.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/8dca6055387462406e72ba31be40754b918572b9/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/8dca6055387462406e72ba31be40754b918572b9/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/d4fdf103f6e55daf7b5676b5014bc508c45b9f82/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/d4fdf103f6e55daf7b5676b5014bc508c45b9f82/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

+ 2 - 2
.idea/libraries/support_core_utils_25_3_1.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="support-core-utils-25.3.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/fb4e83f8c8f961f6942d7b994f1d99edc82a7e6a/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/fb4e83f8c8f961f6942d7b994f1d99edc82a7e6a/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/eaa44d38a8ef19954cbf78a8b8d5972c6d54fffe/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/eaa44d38a8ef19954cbf78a8b8d5972c6d54fffe/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

+ 2 - 2
.idea/libraries/support_fragment_25_3_1.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="support-fragment-25.3.1">
     <CLASSES>
-      <root url="file://$USER_HOME$/.android/build-cache/fe329dcb016429f3580381a4ab848a2a45d2d092/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/fe329dcb016429f3580381a4ab848a2a45d2d092/output/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.android/build-cache/7c84456c189812dd43c6494793a41441235dbc8f/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/7c84456c189812dd43c6494793a41441235dbc8f/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

+ 2 - 2
.idea/libraries/support_media_compat_25_3_1.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="support-media-compat-25.3.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/42536c67d4af45410351738f3895e74d6ad18e95/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/42536c67d4af45410351738f3895e74d6ad18e95/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/b828ab7fc7ea8d06486b6c7161fca8e30e7ae412/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/b828ab7fc7ea8d06486b6c7161fca8e30e7ae412/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

+ 2 - 2
.idea/libraries/support_v4_25_3_1.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="support-v4-25.3.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/b6d3707f44a12d18f5d9a0bfabf79fcdd0c42f50/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/b6d3707f44a12d18f5d9a0bfabf79fcdd0c42f50/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/e793779c2a6cdf245642d405a2ebfff42ab01a0a/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/e793779c2a6cdf245642d405a2ebfff42ab01a0a/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

+ 2 - 2
.idea/libraries/support_vector_drawable_25_3_1.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="support-vector-drawable-25.3.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/d8871c69ed5029093ae5ef349e7a8880196e0fad/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/d8871c69ed5029093ae5ef349e7a8880196e0fad/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/dc18df144373d02f631d73095c96596fd2ecd878/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/dc18df144373d02f631d73095c96596fd2ecd878/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

+ 2 - 2
.idea/libraries/transition_25_3_1.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="transition-25.3.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/fdb734aa57d88526ff807fcef3a5398989ab839a/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/fdb734aa57d88526ff807fcef3a5398989ab839a/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/1154836952d287f7f77e7c9f81a5da5291d7218f/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/1154836952d287f7f77e7c9f81a5da5291d7218f/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

+ 1 - 1
.idea/misc.xml

@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

+ 1 - 0
.idea/modules.xml

@@ -3,6 +3,7 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/FreeFoodFinder.iml" filepath="$PROJECT_DIR$/FreeFoodFinder.iml" />
+      <module fileurl="file://$PROJECT_DIR$/FreeFoodFinder_New.iml" filepath="$PROJECT_DIR$/FreeFoodFinder_New.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/trunk.iml" filepath="$PROJECT_DIR$/trunk.iml" />
     </modules>

+ 1 - 1
.idea/vcs.xml

@@ -2,6 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="svn" />
-    <mapping directory="$PROJECT_DIR$" vcs="svn" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

Різницю між файлами не показано, бо вона завелика
+ 555 - 182
.idea/workspace.xml


+ 34 - 7
app/app.iml

@@ -62,13 +62,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -76,7 +69,36 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/multi-dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
+      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -84,10 +106,14 @@
     <orderEntry type="library" exported="" scope="TEST" name="espresso-idling-resource-2.2.2" level="project" />
     <orderEntry type="library" exported="" name="constraint-layout-1.0.2" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.3" level="project" />
+    <orderEntry type="library" exported="" name="play-services-base-10.2.4" level="project" />
     <orderEntry type="library" exported="" name="transition-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-tasks-10.2.4" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="hamcrest-integration-1.3" level="project" />
     <orderEntry type="library" exported="" name="design-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-maps-10.2.4" level="project" />
+    <orderEntry type="library" exported="" name="mockito-all-1.10.19" level="project" />
     <orderEntry type="library" exported="" name="jackson-annotations-2.0.1" level="project" />
     <orderEntry type="library" exported="" name="bolts-android-1.1.4" level="project" />
     <orderEntry type="library" exported="" name="bottom-bar-1.3.3" level="project" />
@@ -103,6 +129,7 @@
     <orderEntry type="library" exported="" name="jackson-core-2.0.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="javax.annotation-api-1.2" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="javax.inject-1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-basement-10.2.4" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="javawriter-2.1.1" level="project" />
     <orderEntry type="library" exported="" name="multidex-1.0.1" level="project" />
     <orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />

+ 16 - 2
app/src/main/java/com/example/yiupang/freefoodfinder/EventDetailsScreen.java

@@ -11,6 +11,9 @@ import java.util.Locale;
 
 public class EventDetailsScreen extends AppCompatActivity
 {
+    String selectedEventName;
+    TextView nameText;
+    int success;
 
     @Override
     protected void onCreate(Bundle savedInstanceState)
@@ -20,7 +23,7 @@ public class EventDetailsScreen extends AppCompatActivity
 
         SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.US);
 
-        String selectedEventName = (String)getIntent().getExtras().getSerializable("selectedEventName");
+        selectedEventName = (String)getIntent().getExtras().getSerializable("selectedEventName");
         String selectedEventTime = (String)getIntent().getExtras().getSerializable("selectedEventTime");
         String selectedEventPlace = (String)getIntent().getExtras().getSerializable("selectedEventPlace");
         String selectedEventDesc = (String)getIntent().getExtras().getSerializable("selectedEventDesc");
@@ -31,7 +34,7 @@ public class EventDetailsScreen extends AppCompatActivity
         TextView dateText = (TextView) findViewById(R.id.datetext);
         dateText.setVisibility(View.GONE);
 
-        TextView nameText = (TextView) findViewById(R.id.nameText);
+        nameText = (TextView) findViewById(R.id.nameText);
         nameText.setText(selectedEventName);
 
         TextView timeText = (TextView) findViewById(R.id.timeText);
@@ -48,5 +51,16 @@ public class EventDetailsScreen extends AppCompatActivity
         TextView descText = (TextView) findViewById( R.id.descText);
         descText.setText(selectedEventDesc);
 
+        if(selectedEventDesc != null && selectedEventFoodType != null
+                && selectedEventPlace != null && selectedEventTime != null
+                && selectedEventName != null)
+        {
+            success = 1;
+        }
+        else
+        {
+            success = 0;
+        }
+
     }
 }

+ 27 - 0
app/src/test/java/com/example/yiupang/freefoodfinder/TestEventDetailsScreen.java

@@ -0,0 +1,27 @@
+package com.example.yiupang.freefoodfinder;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Created by bryanmcguffin on 6/6/17.
+ */
+
+public class TestEventDetailsScreen
+{
+    @Test
+    public void testName()
+    {
+        EventDetailsScreen test = new EventDetailsScreen();
+        test.selectedEventName = "hello";
+        assertEquals(test.selectedEventName,test.selectedEventName);
+    }
+
+    @Test
+    public void testMath()
+    {
+        EventDetailsScreen test = new EventDetailsScreen();
+        assertEquals(0,test.success);
+    }
+}

+ 14 - 0
app/src/test/java/com/example/yiupang/freefoodfinder/TestEventDetailsSuite.java

@@ -0,0 +1,14 @@
+package com.example.yiupang.freefoodfinder;
+
+/**
+ * Created by bryanmcguffin on 6/6/17.
+ */
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({TestEventDetailsScreen.class})
+
+public class TestEventDetailsSuite {
+}

+ 2 - 2
local.properties

@@ -7,5 +7,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Wed May 31 16:59:34 PDT 2017
-sdk.dir=/home/tom/Android/Sdk
+#Thu Jun 01 16:17:45 PDT 2017
+sdk.dir=/Users/bryanmcguffin/Library/Android/sdk

Деякі файли не було показано, через те що забагато файлів було змінено