Skip to content

Feature/38 split modules #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 41 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
4b64076
Create ui testing assertion module
corrado4eyes Sep 20, 2023
8e01f4c
Update strings structure and references
corrado4eyes Sep 20, 2023
261df5a
Update unit tests
corrado4eyes Sep 20, 2023
0c126d5
Update gradle files so that platforms can use the new module
corrado4eyes Sep 20, 2023
d0b1367
Update platforms tests and layout
corrado4eyes Sep 20, 2023
5052d8f
Add simple stub implementation for Node
corrado4eyes Sep 20, 2023
ea46cd7
Update tests
corrado4eyes Sep 20, 2023
9a8435d
Update TestCase class with sealed class and cases
corrado4eyes Sep 20, 2023
4fb3b11
Update assertion library
corrado4eyes Sep 20, 2023
bef8a79
Remove prints and update feature file
corrado4eyes Sep 20, 2023
8946885
Use identifier in android source set instead of Hardcoded string. Add…
corrado4eyes Sep 25, 2023
9f08e91
Add usage of application map for arguments
corrado4eyes Sep 25, 2023
157d5b5
Add doc for applicationArguments
corrado4eyes Sep 25, 2023
d928217
Rename exceptions removing prefix
corrado4eyes Sep 25, 2023
b3aced6
Update feature file
corrado4eyes Sep 26, 2023
ae07b35
Remove waitUntil from assertion method
corrado4eyes Sep 26, 2023
3eccea1
Rename files
corrado4eyes Sep 26, 2023
379c97f
Extract interface
corrado4eyes Sep 27, 2023
9f1a71a
Refactor so that TestCase interface is used. Also add platform specif…
corrado4eyes Sep 27, 2023
0f68652
Update view model and views created unit test
corrado4eyes Sep 27, 2023
1a51498
Update feature files
corrado4eyes Sep 27, 2023
32171a5
Update ui test files
corrado4eyes Sep 27, 2023
9109529
Update mock auth service and LoginVMTest
corrado4eyes Sep 27, 2023
223e289
Add `launchScreen` paramenter. Put arguments in different lines
corrado4eyes Sep 29, 2023
1d0af2c
Add APIs to scroll scroll views
corrado4eyes Sep 29, 2023
521bf85
Add SKIE to convert kotlin sealed classes into exhaustive enums in sw…
corrado4eyes Oct 2, 2023
dbfa64e
Remove empty lines
corrado4eyes Oct 2, 2023
9507f10
Add example for cross platform code
corrado4eyes Oct 2, 2023
57ffde9
Surround call by try/catches and add 25 retries on scrolls
corrado4eyes Oct 2, 2023
bd05f28
Update ui tests
corrado4eyes Oct 2, 2023
61b37da
Add logout call if the test configuration states that the user is log…
corrado4eyes Oct 2, 2023
da1690c
Add documentation
corrado4eyes Oct 2, 2023
4f606b3
Merge branch 'main' into feature/36-create-shared-button-finder
corrado4eyes Oct 2, 2023
1a57e8a
Remove pistakio and cucumber module and add them from mavenLocal
corrado4eyes Oct 3, 2023
e9010aa
Rename package id
corrado4eyes Oct 4, 2023
588b512
Add gradle property for composite builds
corrado4eyes Oct 6, 2023
1cfb049
Include module as a composite build
corrado4eyes Oct 6, 2023
a60f348
Add gitsubmodules
corrado4eyes Oct 6, 2023
9f6bad9
Update versions and create iOS framework in cucumberShared
corrado4eyes Oct 26, 2023
51bd2e9
Rename references from kilka to kaluga
corrado4eyes Oct 26, 2023
8fff267
Update ios files
corrado4eyes Oct 26, 2023
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
Prev Previous commit
Next Next commit
Rename package id
  • Loading branch information
corrado4eyes committed Oct 4, 2023
commit e9010aad54d46e865e03cfc491ee6af7315c0406
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ While the Android implementation will be split into 2+ files. A test runner file
@RunWith(Cucumber::class)
@CucumberOptions(
features = ["features"],
glue = ["com.corrado4eyes.cucumberplayground.test"]
glue = ["com.splendo.cucumberplayground.test"]
)
class TestRunner : CucumberAndroidJUnitRunner()
```
Expand Down
8 changes: 4 additions & 4 deletions android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ plugins {
}

android {
namespace = "com.corrado4eyes.cucumberplayground.android"
namespace = "com.splendo.cucumberplayground.android"
compileSdk = 33
defaultConfig {
applicationId = "com.corrado4eyes.cucumberplayground.android"
applicationId = "com.splendo.cucumberplayground.android"
minSdk = 29
targetSdk = 33
versionCode = 1
versionName = "1.0"

testApplicationId = "com.corrado4eyes.cucumberplayground.test"
testInstrumentationRunner = "com.corrado4eyes.cucumberplayground.test.CucumberTests"
testApplicationId = "com.splendo.cucumberplayground.test"
testInstrumentationRunner = "com.splendo.cucumberplayground.test.CucumberTests"
}

buildFeatures {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.corrado4eyes.cucumberplayground.test
package com.splendo.cucumberplayground.test

import io.cucumber.android.runner.CucumberAndroidJUnitRunner
import io.cucumber.junit.Cucumber
Expand All @@ -8,6 +8,6 @@ import org.junit.runner.RunWith
@RunWith(Cucumber::class)
@CucumberOptions(
features = ["features"],
glue = ["com.corrado4eyes.cucumberplayground.test"]
glue = ["com.splendo.cucumberplayground.test"]
)
class CucumberTests : CucumberAndroidJUnitRunner()
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.corrado4eyes.cucumberplayground.test
package com.splendo.cucumberplayground.test

import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performScrollToIndex
import com.corrado4eyes.cucumberplayground.models.Strings
import com.corrado4eyes.cucumbershared.tests.AppDefinitions
import com.splendo.cucumberplayground.models.Strings
import com.splendo.cucumbershared.tests.AppDefinitions
import com.splendo.kilka.DefaultApplicationAdapter
import io.cucumber.java8.En
import io.cucumber.junit.WithJunitRule
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.corrado4eyes.cucumberplayground.android
package com.splendo.cucumberplayground.android

import android.app.Application
import com.corrado4eyes.cucumberplayground.di.initKoin
import com.splendo.cucumberplayground.di.initKoin
import com.splendo.kaluga.base.ApplicationHolder

class CucumberApp : Application() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.corrado4eyes.cucumberplayground.android
package com.splendo.cucumberplayground.android

import android.content.Intent
import android.os.Bundle
import androidx.activity.compose.setContent
import androidx.appcompat.app.AppCompatActivity
import com.corrado4eyes.cucumberplayground.models.DefaultTestConfiguration
import com.corrado4eyes.cucumberplayground.models.TestConfiguration
import com.splendo.cucumberplayground.models.DefaultTestConfiguration
import com.splendo.cucumberplayground.models.TestConfiguration

class MainActivity : AppCompatActivity() {
private lateinit var testConfiguration: TestConfiguration
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.corrado4eyes.cucumberplayground.android
package com.splendo.cucumberplayground.android

import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material.MaterialTheme
Expand All @@ -8,12 +8,12 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import com.corrado4eyes.cucumberplayground.android.home.HomeLayout
import com.corrado4eyes.cucumberplayground.android.login.LoginLayout
import com.corrado4eyes.cucumberplayground.models.DefaultTestConfiguration
import com.corrado4eyes.cucumberplayground.models.TestConfiguration
import com.corrado4eyes.cucumberplayground.viewModels.main.AppNavigator
import com.corrado4eyes.cucumberplayground.viewModels.main.MainViewModel
import com.splendo.cucumberplayground.android.home.HomeLayout
import com.splendo.cucumberplayground.android.login.LoginLayout
import com.splendo.cucumberplayground.models.DefaultTestConfiguration
import com.splendo.cucumberplayground.models.TestConfiguration
import com.splendo.cucumberplayground.viewModels.main.AppNavigator
import com.splendo.cucumberplayground.viewModels.main.MainViewModel
import com.splendo.kaluga.architecture.compose.state
import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
import org.koin.androidx.compose.koinViewModel
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.corrado4eyes.cucumberplayground.android
package com.splendo.cucumberplayground.android

import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.shape.RoundedCornerShape
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.corrado4eyes.cucumberplayground.android.home
package com.splendo.cucumberplayground.android.home

import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
Expand All @@ -14,8 +14,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.corrado4eyes.cucumberplayground.models.Strings
import com.corrado4eyes.cucumberplayground.viewModels.home.HomeViewModel
import com.splendo.cucumberplayground.models.Strings
import com.splendo.cucumberplayground.viewModels.home.HomeViewModel
import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
import org.koin.androidx.compose.koinViewModel

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.corrado4eyes.cucumberplayground.android.login
package com.splendo.cucumberplayground.android.login

import androidx.compose.foundation.layout.Column
import androidx.compose.material.Button
Expand All @@ -14,8 +14,8 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.tooling.preview.Preview
import com.corrado4eyes.cucumberplayground.models.Strings
import com.corrado4eyes.cucumberplayground.viewModels.login.LoginViewModel
import com.splendo.cucumberplayground.models.Strings
import com.splendo.cucumberplayground.viewModels.login.LoginViewModel
import com.splendo.kaluga.architecture.compose.state
import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
import com.splendo.kaluga.architecture.observable.StateFlowInitializedSubject
Expand Down
2 changes: 1 addition & 1 deletion cucumberShared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ kotlin {
}

android {
namespace = "com.corrado4eyes.cucumbershared"
namespace = "com.splendo.cucumbershared"
compileSdk = 33
defaultConfig {
minSdk = 29
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
package com.corrado4eyes.cucumbershared
package com.splendo.cucumbershared
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.corrado4eyes.cucumbershared.tests
package com.splendo.cucumbershared.tests

import co.touchlab.skie.configuration.annotations.SealedInterop
import com.corrado4eyes.cucumberplayground.models.Strings
import com.splendo.cucumberplayground.models.Strings
import com.splendo.cucumber.CucumberDefinition
import com.splendo.cucumber.Definition
import com.splendo.cucumber.EXPECT_VALUE_STRING
Expand Down
4 changes: 2 additions & 2 deletions ios/ios.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@
"-framework",
shared,
);
PRODUCT_BUNDLE_IDENTIFIER = com.corrado4eyes.CucumberTests;
PRODUCT_BUNDLE_IDENTIFIER = com.splendo.CucumberTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_OBJC_BRIDGING_HEADER = "CucumberTests/CucumberTests-Bridging-Header.h";
Expand Down Expand Up @@ -620,7 +620,7 @@
"-framework",
shared,
);
PRODUCT_BUNDLE_IDENTIFIER = com.corrado4eyes.CucumberTests;
PRODUCT_BUNDLE_IDENTIFIER = com.splendo.CucumberTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_OBJC_BRIDGING_HEADER = "CucumberTests/CucumberTests-Bridging-Header.h";
Expand Down
2 changes: 1 addition & 1 deletion shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ kotlin {
}

android {
namespace = "com.corrado4eyes.cucumberplayground"
namespace = "com.splendo.cucumberplayground"
compileSdk = 33
defaultConfig {
minSdk = 29
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@file:JvmName("AndroidDependencyInjection")

package com.corrado4eyes.cucumberplayground.di
package com.splendo.cucumberplayground.di

import com.corrado4eyes.cucumberplayground.models.TestConfiguration
import com.corrado4eyes.cucumberplayground.viewModels.home.HomeViewModel
import com.corrado4eyes.cucumberplayground.viewModels.login.LoginViewModel
import com.corrado4eyes.cucumberplayground.viewModels.main.MainViewModel
import com.splendo.cucumberplayground.models.TestConfiguration
import com.splendo.cucumberplayground.viewModels.home.HomeViewModel
import com.splendo.cucumberplayground.viewModels.login.LoginViewModel
import com.splendo.cucumberplayground.viewModels.main.MainViewModel
import com.splendo.kaluga.base.ApplicationHolder
import kotlinx.coroutines.Dispatchers
import org.koin.android.ext.koin.androidContext
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.corrado4eyes.cucumberplayground.di
package com.splendo.cucumberplayground.di

import com.corrado4eyes.cucumberplayground.services.AuthService
import com.corrado4eyes.cucumberplayground.services.AuthServiceImpl
import com.corrado4eyes.cucumberplayground.services.previewMocks.AuthServicePreviewMock
import com.splendo.cucumberplayground.services.AuthService
import com.splendo.cucumberplayground.services.AuthServiceImpl
import com.splendo.cucumberplayground.services.previewMocks.AuthServicePreviewMock
import org.koin.core.context.loadKoinModules
import org.koin.core.context.startKoin
import org.koin.core.module.Module
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.corrado4eyes.cucumberplayground.login.model
package com.splendo.cucumberplayground.login.model

sealed class AuthResponse {
object Success : AuthResponse()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.corrado4eyes.cucumberplayground.models
package com.splendo.cucumberplayground.models

object Strings {
object Screen {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.corrado4eyes.cucumberplayground.models
package com.splendo.cucumberplayground.models

typealias TestConfigurationMap = Map<String, String?>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package com.corrado4eyes.cucumberplayground.models
package com.splendo.cucumberplayground.models

data class User(val email: String, val pass: String)
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.corrado4eyes.cucumberplayground.services
package com.splendo.cucumberplayground.services

import com.corrado4eyes.cucumberplayground.models.User
import com.corrado4eyes.cucumberplayground.login.model.AuthResponse
import com.splendo.cucumberplayground.models.User
import com.splendo.cucumberplayground.login.model.AuthResponse
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.corrado4eyes.cucumberplayground.services.previewMocks
package com.splendo.cucumberplayground.services.previewMocks

import com.corrado4eyes.cucumberplayground.models.User
import com.corrado4eyes.cucumberplayground.login.model.AuthResponse
import com.corrado4eyes.cucumberplayground.services.AuthService
import com.splendo.cucumberplayground.models.User
import com.splendo.cucumberplayground.login.model.AuthResponse
import com.splendo.cucumberplayground.services.AuthService
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.corrado4eyes.cucumberplayground.viewModels.home
package com.splendo.cucumberplayground.viewModels.home

import com.corrado4eyes.cucumberplayground.models.Strings
import com.corrado4eyes.cucumberplayground.services.AuthService
import com.splendo.cucumberplayground.models.Strings
import com.splendo.cucumberplayground.services.AuthService
import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
import kotlinx.coroutines.launch
import org.koin.core.component.KoinComponent
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.corrado4eyes.cucumberplayground.viewModels.login
package com.splendo.cucumberplayground.viewModels.login

import com.corrado4eyes.cucumberplayground.login.model.AuthResponse
import com.corrado4eyes.cucumberplayground.models.Strings
import com.corrado4eyes.cucumberplayground.services.AuthService
import com.splendo.cucumberplayground.login.model.AuthResponse
import com.splendo.cucumberplayground.models.Strings
import com.splendo.cucumberplayground.services.AuthService
import com.splendo.kaluga.architecture.observable.toInitializedObservable
import com.splendo.kaluga.architecture.observable.toInitializedSubject
import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.corrado4eyes.cucumberplayground.viewModels.main
package com.splendo.cucumberplayground.viewModels.main

import com.corrado4eyes.cucumberplayground.models.TestConfiguration
import com.corrado4eyes.cucumberplayground.models.User
import com.corrado4eyes.cucumberplayground.services.AuthService
import com.splendo.cucumberplayground.models.TestConfiguration
import com.splendo.cucumberplayground.models.User
import com.splendo.cucumberplayground.services.AuthService
import com.splendo.kaluga.architecture.observable.toInitializedObservable
import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
import kotlinx.coroutines.flow.MutableStateFlow
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.corrado4eyes.cucumberplayground.cucumber.login
package com.splendo.cucumberplayground.cucumber.login

import com.corrado4eyes.cucumberplayground.cucumber.login.DummyUsers.defaultTestUser
import com.corrado4eyes.cucumberplayground.login.model.AuthResponse
import com.corrado4eyes.cucumberplayground.models.User
import com.corrado4eyes.cucumberplayground.services.AuthService
import com.splendo.cucumberplayground.cucumber.login.DummyUsers.defaultTestUser
import com.splendo.cucumberplayground.login.model.AuthResponse
import com.splendo.cucumberplayground.models.User
import com.splendo.cucumberplayground.services.AuthService
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.corrado4eyes.cucumberplayground.cucumber.viewModels
package com.splendo.cucumberplayground.cucumber.viewModels

import com.corrado4eyes.cucumberplayground.cucumber.login.AuthServiceMock
import com.corrado4eyes.cucumberplayground.cucumber.login.DummyUsers.defaultTestUser
import com.corrado4eyes.cucumberplayground.models.Strings
import com.corrado4eyes.cucumberplayground.services.AuthService
import com.corrado4eyes.cucumberplayground.viewModels.home.HomeViewModel
import com.splendo.cucumberplayground.cucumber.login.AuthServiceMock
import com.splendo.cucumberplayground.cucumber.login.DummyUsers.defaultTestUser
import com.splendo.cucumberplayground.models.Strings
import com.splendo.cucumberplayground.services.AuthService
import com.splendo.cucumberplayground.viewModels.home.HomeViewModel
import com.splendo.kaluga.test.base.yieldMultiple
import com.splendo.kaluga.test.koin.KoinUIThreadViewModelTest
import kotlin.test.Test
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.corrado4eyes.cucumberplayground.cucumber.viewModels
package com.splendo.cucumberplayground.cucumber.viewModels

import com.corrado4eyes.cucumberplayground.cucumber.login.AuthServiceMock
import com.corrado4eyes.cucumberplayground.services.AuthService
import com.corrado4eyes.cucumberplayground.viewModels.login.LoginViewModel
import com.splendo.cucumberplayground.cucumber.login.AuthServiceMock
import com.splendo.cucumberplayground.services.AuthService
import com.splendo.cucumberplayground.viewModels.login.LoginViewModel
import com.splendo.kaluga.test.koin.KoinUIThreadViewModelTest
import kotlin.test.Test
import kotlin.test.assertEquals
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.corrado4eyes.cucumberplayground.di
package com.splendo.cucumberplayground.di

import kotlinx.coroutines.newSingleThreadContext
import org.koin.core.scope.Scope
Expand Down