Skip to content
Open

pull #26

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@ public void delete(City city) {
}
}

/***
* This function has not been implemented yet
*/
public void clearAll(){

}


/**
* Return the size of the city list
* @return
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,20 @@ void testAdd() {
assertTrue(cityList.hasCity(new City("Regina", "Saskatchewan")));
}

@Test
void testClearAll() {
CityList cityList = mockCityList();

assertEquals(1, cityList.countCities());

cityList.add(new City("Regina", "Saskatchewan"));

assertEquals(2, cityList.countCities());
assertTrue(cityList.hasCity(new City("Regina", "Saskatchewan")));
cityList.clearAll();// Not implemented yet
assertEquals(0, cityList.countCities());
}

@Test
void testAddException() {
CityList cityList = mockCityList();
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {

}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.android.tools.build:gradle:3.5.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
61 changes: 61 additions & 0 deletions travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
language: android
jdk: oraclejdk8

env:
global:
- ANDROID_TARGET=android-22
- ANDROID_ABI=armeabi-v7a

android:
components:
# Uncomment the lines below if you want to
# use the latest revision of Android SDK Tools
- tools
- platform-tools

# The BuildTools version used by your project
- build-tools-23.0.3

# The SDK version used to compile your project
# TODO: why is this here explicitly in addition to $ANDROID_TARGET below
- android-23

# Additional components
- extra-google-google_play_services
- extra-google-m2repository
- extra-android-m2repository

# The SDK version used to compile your project
- $ANDROID_TARGET

# Specify at least one system image,
# if you need to run emulator(s) during your tests.
# The line should look like this after interpolation:
# - sys-img-armeabi-v7a-android-22
- sys-img-${ANDROID_ABI}-${ANDROID_TARGET}

licenses:
- 'android-sdk-license-.+'

before_install:
# Accept sdk licenses
- yes | sdkmanager "platforms;android-29"

# Get gradle
- chmod +x gradlew
- wget http://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

# Build the project
- gradle -v

# Start the emulator
- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
- emulator -avd test -no-skin -no-audio -no-window &
- android-wait-for-emulator
- adb shell input keyevent 82 &

# The app will now automatically be installed and tested via
# the command `gradle connectedCheck`