From 696c5eceacfdd9a5eee9178c9822b59fe8dd451a Mon Sep 17 00:00:00 2001 From: Mustafa Khairullah <46543316+mustafakhairullah@users.noreply.github.com> Date: Tue, 10 Mar 2020 17:30:11 -0600 Subject: [PATCH 1/4] Updating Gradle --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e52c153e..d602da97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,7 @@ before_install: # Get gradle - chmod +x gradlew - - wget http://services.gradle.org/distributions/gradle-5.3-bin.zip + - wget https://services.gradle.org/distributions/gradle-5.3-bin.zip - unzip -qq gradle-5.3-bin.zip - export GRADLE_HOME=$PWD/gradle-5.3 - export PATH=$GRADLE_HOME/bin:$PATH From cf5cc59c3430ae1b24f594b14399ae6823f59c10 Mon Sep 17 00:00:00 2001 From: Mustafa Khairullah <46543316+mustafakhairullah@users.noreply.github.com> Date: Tue, 10 Mar 2020 17:38:33 -0600 Subject: [PATCH 2/4] Create .gitignore --- .gitignore | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..cd07bc5d --- /dev/null +++ b/.gitignore @@ -0,0 +1,37 @@ +# Built application files +/*/build/ + +# Crashlytics configuations +com_crashlytics_export_strings.xml + +# Local configuration file (sdk path, etc) +local.properties + +# Gradle generated files +.gradle/ + +# Signing files +.signing/ + +# User-specific configurations +.idea/libraries/ +.idea/workspace.xml +.idea/tasks.xml +.idea/.name +.idea/compiler.xml +.idea/copyright/profiles_settings.xml +.idea/encodings.xml +.idea/misc.xml +.idea/modules.xml +.idea/scopes/scope_settings.xml +.idea/vcs.xml +*.iml + +# OS-specific files +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db From 222072b0904906a014ef6570197b25e8f7c28d32 Mon Sep 17 00:00:00 2001 From: Mustafa Khairullah Date: Tue, 10 Mar 2020 17:54:42 -0600 Subject: [PATCH 3/4] Adding a test bound to fail --- .../com/example/simpleparadox/listycity/CityListTest.java | 8 ++++++++ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java index 787eab7e..2819a95e 100644 --- a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java +++ b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java @@ -93,4 +93,12 @@ void testCountCities() { assertEquals(1, cityList.countCities()); } + + //Failed Test + @Test + void testFailureBuild(){ + CityList cityList = mockCityList(); + + assertEquals(1, cityList.countCities() + 20); + } } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 5509623a..33656b1b 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:3.6.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 36854e58..890c44b0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Sep 13 11:31:05 MDT 2019 +#Tue Mar 10 17:47:55 MDT 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip From a561128ed8b8c589ff08317e2ff3e6cd27214a54 Mon Sep 17 00:00:00 2001 From: Mustafa Khairullah Date: Fri, 13 Mar 2020 13:43:44 -0600 Subject: [PATCH 4/4] Having test pass --- .idea/caches/build_file_checksums.ser | Bin 0 -> 537 bytes .idea/codeStyles/Project.xml | 116 ++++++++++++++++++ .idea/gradle.xml | 20 +++ .idea/markdown-navigator-enh.xml | 29 +++++ .idea/markdown-navigator.xml | 55 +++++++++ .idea/runConfigurations.xml | 12 ++ .project | 17 +++ .settings/org.eclipse.buildship.core.prefs | 2 + .../simpleparadox/listycity/CityListTest.java | 2 +- 9 files changed, 252 insertions(+), 1 deletion(-) create mode 100644 .idea/caches/build_file_checksums.ser create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/markdown-navigator-enh.xml create mode 100644 .idea/markdown-navigator.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 .project create mode 100644 .settings/org.eclipse.buildship.core.prefs diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000000000000000000000000000000000000..dc0723c562ae149c29a3c37bc53105755586b857 GIT binary patch literal 537 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}uGBYr_F>vMNC#JY1CYR(Fc`|U8WE7pz^ zFy~^{yZb=rAhoC@Gqt!Bu9# + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 00000000..5cd135a0 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/markdown-navigator-enh.xml b/.idea/markdown-navigator-enh.xml new file mode 100644 index 00000000..12fb99d1 --- /dev/null +++ b/.idea/markdown-navigator-enh.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml new file mode 100644 index 00000000..4463382e --- /dev/null +++ b/.idea/markdown-navigator.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 00000000..7f68460d --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/.project b/.project new file mode 100644 index 00000000..6af60b92 --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + Lab-8-Template-Tuesday + Project Lab-8-Template-Tuesday created by Buildship. + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 00000000..e8895216 --- /dev/null +++ b/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,2 @@ +connection.project.dir= +eclipse.preferences.version=1 diff --git a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java index 2819a95e..1ab22a9d 100644 --- a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java +++ b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java @@ -99,6 +99,6 @@ void testCountCities() { void testFailureBuild(){ CityList cityList = mockCityList(); - assertEquals(1, cityList.countCities() + 20); + assertEquals(1, cityList.countCities()); } } \ No newline at end of file