added correct tests for only attribute in attribute binding (#39)

mariodavid · Apr 20, 2018 · d59e9b1 · d59e9b1
1 parent 19df8d0
commit d59e9b1
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 23 deletions.
diff --git a/build.gradle b/build.gradle
@@ -59,8 +59,8 @@ cuba {
             url = System.properties['uploadRepositoryRelease'] ?: System.env.UPLOAD_REPOSITORY_RELEASE ?: bintrayRepositoryUrl
         }
 
-        user = System.properties['uploadRepositoryUsername'] ?: System.env.UPLOAD_REPOSITORY_USERNAME
-        password = System.properties['uploadRepositoryPassword'] ?:System.env.UPLOAD_REPOSITORY_PASSWORD
+        user = System.env.UPLOAD_REPOSITORY_USERNAME
+        password = System.env.UPLOAD_REPOSITORY_PASSWORD
     }
     ide {
         vcs = 'Git'

diff --git a/...ore/test/de/diedavids/cuba/dataimport/binding/EntityBinderDatatypesIntegrationTest.groovy b/...ore/test/de/diedavids/cuba/dataimport/binding/EntityBinderDatatypesIntegrationTest.groovy
@@ -292,7 +292,7 @@ class EntityBinderDatatypesIntegrationTest extends AbstractEntityBinderIntegrati
         importConfiguration = new ImportConfiguration(
                 entityClass: 'ddcdi$MlbTeam',
                 importAttributeMappers: [
-                        new ImportAttributeMapper(entityAttribute: 'ddcdi$MlbTeam.state', fileColumnAlias: 'state'),
+                        new ImportAttributeMapper(entityAttribute: 'state', fileColumnAlias: 'state'),
                 ]
         )
         MlbTeam entity = sut.bindAttributes(importConfiguration, importData.rows[0], new MlbTeam()) as MlbTeam

diff --git a/...re/test/de/diedavids/cuba/dataimport/core/service/GenericDataImportServiceBeanTest.groovy b/...re/test/de/diedavids/cuba/dataimport/core/service/GenericDataImportServiceBeanTest.groovy
@@ -36,8 +36,8 @@ class GenericDataImportServiceBeanTest extends AbstractImpotrIntegrationTest {
         importConfiguration = new ImportConfiguration(
                 entityClass: 'ddcdi$MlbTeam',
                 importAttributeMappers: [
-                        new ImportAttributeMapper(entityAttribute: 'ddcdi$MlbTeam.name', fileColumnAlias: 'name', fileColumnNumber: 0),
-                        new ImportAttributeMapper(entityAttribute: 'ddcdi$MlbTeam.code', fileColumnAlias: 'code', fileColumnNumber: 2),
+                        new ImportAttributeMapper(entityAttribute: 'name', fileColumnAlias: 'name', fileColumnNumber: 0),
+                        new ImportAttributeMapper(entityAttribute: 'code', fileColumnAlias: 'code', fileColumnNumber: 2),
                 ],
                 uniqueConfigurations: [new UniqueConfiguration(
                         entityAttributes: [
@@ -74,9 +74,9 @@ class GenericDataImportServiceBeanTest extends AbstractImpotrIntegrationTest {
         importConfiguration = new ImportConfiguration(
                 entityClass: 'ddcdi$MlbTeam',
                 importAttributeMappers: [
-                        new ImportAttributeMapper(entityAttribute: 'ddcdi$MlbTeam.name', fileColumnAlias: 'name', fileColumnNumber: 0),
-                        new ImportAttributeMapper(entityAttribute: 'ddcdi$MlbTeam.code', fileColumnAlias: 'code', fileColumnNumber: 2),
-                        new ImportAttributeMapper(entityAttribute: 'ddcdi$MlbTeam.state', fileColumnAlias: 'state', fileColumnNumber: 2),
+                        new ImportAttributeMapper(entityAttribute: 'name', fileColumnAlias: 'name', fileColumnNumber: 0),
+                        new ImportAttributeMapper(entityAttribute: 'code', fileColumnAlias: 'code', fileColumnNumber: 2),
+                        new ImportAttributeMapper(entityAttribute: 'state', fileColumnAlias: 'state', fileColumnNumber: 2),
                 ],
                 uniqueConfigurations: [new UniqueConfiguration(
                         entityAttributes: [
@@ -112,9 +112,9 @@ class GenericDataImportServiceBeanTest extends AbstractImpotrIntegrationTest {
         importConfiguration = new ImportConfiguration(
                 entityClass: 'ddcdi$MlbTeam',
                 importAttributeMappers: [
-                        new ImportAttributeMapper(entityAttribute: 'ddcdi$MlbTeam.name', fileColumnAlias: 'name', fileColumnNumber: 0),
-                        new ImportAttributeMapper(entityAttribute: 'ddcdi$MlbTeam.code', fileColumnAlias: 'code', fileColumnNumber: 2),
-                        new ImportAttributeMapper(entityAttribute: 'ddcdi$MlbTeam.state', fileColumnAlias: 'state', fileColumnNumber: 2),
+                        new ImportAttributeMapper(entityAttribute: 'name', fileColumnAlias: 'name', fileColumnNumber: 0),
+                        new ImportAttributeMapper(entityAttribute: 'code', fileColumnAlias: 'code', fileColumnNumber: 2),
+                        new ImportAttributeMapper(entityAttribute: 'state', fileColumnAlias: 'state', fileColumnNumber: 2),
                 ],
                 uniqueConfigurations: [new UniqueConfiguration(
                         entityAttributes: [

diff --git a/run-check.sh b/run-check.sh
@@ -3,3 +3,4 @@
 ./gradlew startDb
 ./gradlew createTestDb
 ./gradlew check
+./gradlew assemble
diff --git a/start-for-check.sh b/start-for-check.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+./gradlew startDb
+./gradlew createTestDb
diff --git a/upload-to-repository.sh b/upload-to-repository.sh
@@ -1,16 +1,5 @@
 #!/usr/bin/env bash
 
-if [[ -z "$1" || -z "$2" ]]
-  then
-    echo "Define username, password and repository URL as parameters. Usage: ./upload-to-repository.sh myUser myPassword https://api.bintray.com/maven/balvi/..."
 
-  else
-    if [[ -z "$3" ]]
-      then
-        ./gradlew -DuploadRepositoryUsername=$1 -DuploadRepositoryPassword=$2 uploadArchives
-      else
-        ./gradlew -DuploadRepositoryUsername=$1 -DuploadRepositoryPassword=$2 -DuploadRepositoryRelease=$3 uploadArchives
+./gradlew uploadArchives
 
-    fi
-
-fi