From 34619956611388a8aca81021205f92a69df05057 Mon Sep 17 00:00:00 2001 From: Shane Goonasekera <46552619+shanerrr@users.noreply.github.com> Date: Tue, 10 Mar 2020 18:08:01 -0600 Subject: [PATCH 1/4] idk --- .gitignore | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++ .travis.yml | 2 +- 2 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 .gitignore 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/.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 56ec8e1f82bb7982fbad8b035114668fb2db9126 Mon Sep 17 00:00:00 2001 From: Shane Goonasekera <46552619+shanerrr@users.noreply.github.com> Date: Tue, 10 Mar 2020 18:25:10 -0600 Subject: [PATCH 2/4] fail --- .idea/.name | 1 + .idea/codeStyles/Project.xml | 116 ++++++++++++++++++ .idea/misc.xml | 9 ++ .idea/runConfigurations.xml | 12 ++ .../simpleparadox/listycity/CityListTest.java | 6 + 5 files changed, 144 insertions(+) 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/.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 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..eb0fee64 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,10 @@ void testCountCities() { assertEquals(1, cityList.countCities()); } + + @Test + void testCountCitiesL() { + CityList cityList = mockCityList(); + assertEquals(2, cityList.countCities()); + } } \ No newline at end of file From 56ca7c0ca221f0d913cc9d1345994257b16fc089 Mon Sep 17 00:00:00 2001 From: Shane Goonasekera <46552619+shanerrr@users.noreply.github.com> Date: Tue, 10 Mar 2020 20:35:52 -0600 Subject: [PATCH 3/4] should be ok --- .../com/example/simpleparadox/listycity/CityListTest.java | 6 ------ 1 file changed, 6 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 eb0fee64..787eab7e 100644 --- a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java +++ b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java @@ -93,10 +93,4 @@ void testCountCities() { assertEquals(1, cityList.countCities()); } - - @Test - void testCountCitiesL() { - CityList cityList = mockCityList(); - assertEquals(2, cityList.countCities()); - } } \ No newline at end of file From 7e8cdce98e02150132944ea2b205481d07f2f477 Mon Sep 17 00:00:00 2001 From: Shane Goonasekera <46552619+shanerrr@users.noreply.github.com> Date: Tue, 10 Mar 2020 20:40:28 -0600 Subject: [PATCH 4/4] ok --- .../java/com/example/simpleparadox/listycity/CityListTest.java | 1 - 1 file changed, 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 787eab7e..3e684a52 100644 --- a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java +++ b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java @@ -86,7 +86,6 @@ void testDeleteException() { cityList.delete(mockCity()); }); } - @Test void testCountCities() { CityList cityList = mockCityList();