From 71d35f93f41dc7c28ce7938fc7a18f9a55b26322 Mon Sep 17 00:00:00 2001 From: LiShang99 Date: Tue, 10 Mar 2020 17:35:24 -0600 Subject: [PATCH 1/6] fixed link --- .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 eca0f38a39964b27ee6cdf0400dd173903633e35 Mon Sep 17 00:00:00 2001 From: LiShang99 Date: Tue, 10 Mar 2020 17:41:27 -0600 Subject: [PATCH 2/6] added gitignore --- .gitignore | 85 +++++++++++++++++++++++++ .idea/.name | 1 + .idea/codeStyles/Project.xml | 116 +++++++++++++++++++++++++++++++++++ .idea/misc.xml | 9 +++ .idea/runConfigurations.xml | 12 ++++ 5 files changed, 223 insertions(+) create mode 100644 .gitignore create mode 100644 .idea/.name create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/runConfigurations.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..ec4c59d5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,85 @@ +# Built application files +*.apk +*.aar +*.ap_ +*.aab + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ +# Uncomment the following line in case you need and you don't have the release build type files in your app +# release/ + +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# IntelliJ +*.iml +.idea/workspace.xml +.idea/tasks.xml +.idea/gradle.xml +.idea/assetWizardSettings.xml +.idea/dictionaries +.idea/libraries +# Android Studio 3 in .gitignore file. +.idea/caches +.idea/modules.xml +# Comment next line if keeping position of elements in Navigation Editor is relevant for you +.idea/navEditor.xml + +# Keystore files +# Uncomment the following lines if you do not want to check your keystore files in. +#*.jks +#*.keystore + +# External native build folder generated in Android Studio 2.2 and later +.externalNativeBuild +.cxx/ + +# Google Services (e.g. APIs or Firebase) +# google-services.json + +# Freeline +freeline.py +freeline/ +freeline_project_description.json + +# fastlane +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots +fastlane/test_output +fastlane/readme.md + +# Version control +vcs.xml + +# lint +lint/intermediates/ +lint/generated/ +lint/outputs/ +lint/tmp/ +# lint/reports/ \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 00000000..cb67bab4 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +ListyCity \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 00000000..681f41ae --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,116 @@ + + + + + + + +
+ + + + 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/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..7bfef59d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ 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 From 76b79e27c590dd10b3a2ae95f707a22a80384fcc Mon Sep 17 00:00:00 2001 From: LiShang99 Date: Fri, 13 Mar 2020 02:42:34 -0600 Subject: [PATCH 3/6] added failing test --- .../com/example/simpleparadox/listycity/CityListTest.java | 5 +++++ 1 file changed, 5 insertions(+) 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..3d560bfc 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,9 @@ void testCountCities() { assertEquals(1, cityList.countCities()); } + + @Test + void testThatFail(){ + assertEquals(1, 2); + } } \ No newline at end of file From b640c312a1e6b57a6f4556ca564255a2873e955f Mon Sep 17 00:00:00 2001 From: LiShang99 Date: Fri, 13 Mar 2020 02:52:30 -0600 Subject: [PATCH 4/6] added test that will pass --- .../java/com/example/simpleparadox/listycity/CityListTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3d560bfc..8c9bf0e8 100644 --- a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java +++ b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java @@ -96,6 +96,6 @@ void testCountCities() { @Test void testThatFail(){ - assertEquals(1, 2); + assertEquals(1, 1); } } \ No newline at end of file From cdd2d668e9d392d346a6676e5623cce7132092de Mon Sep 17 00:00:00 2001 From: LiShang99 Date: Fri, 13 Mar 2020 03:05:39 -0600 Subject: [PATCH 5/6] added failing test --- .../java/com/example/simpleparadox/listycity/CityListTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8c9bf0e8..3d560bfc 100644 --- a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java +++ b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java @@ -96,6 +96,6 @@ void testCountCities() { @Test void testThatFail(){ - assertEquals(1, 1); + assertEquals(1, 2); } } \ No newline at end of file From e7001c895457ffa33f5843617cfca6e0e26d43d1 Mon Sep 17 00:00:00 2001 From: LiShang99 Date: Fri, 13 Mar 2020 03:17:13 -0600 Subject: [PATCH 6/6] added test that will pass --- .../java/com/example/simpleparadox/listycity/CityListTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3d560bfc..8c9bf0e8 100644 --- a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java +++ b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java @@ -96,6 +96,6 @@ void testCountCities() { @Test void testThatFail(){ - assertEquals(1, 2); + assertEquals(1, 1); } } \ No newline at end of file