Skip to content

Commit 2e8b535

Browse files
committed
テストバグ修正。
1 parent 753e337 commit 2e8b535

10 files changed

Lines changed: 21 additions & 12 deletions

tests/bad/bad-android-plugin-003-already-selected.sh

100755100644
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
LANG="deviceConnectAndroidPlugin"
55

66
# プロファイル定義ファイル
7-
SPEC="../samples/sample-profile-specs/swagger-files"
7+
SPEC="../../samples/sample-profile-specs/swagger-files"
88

99
# プロファイル定義ファイル
10-
SPEC_DIR="../samples/sample-profile-specs/swagger-files"
10+
SPEC_DIR="../../samples/sample-profile-specs/swagger-files"
1111

1212
# スケルトンコード出力先
1313
OUTPUT_DIR="./output/Android/MyPlugin"
@@ -24,6 +24,6 @@ DISPLAY_NAME="MyPlugin"
2424
# スケルトンコード生成ツールのバイナリ
2525
JAR_FILE="../../bin/deviceconnect-codegen.jar"
2626

27-
ARGS="--input-spec $SPEC --input-spec $SPEC_DIR --lang $LANG --template-dir templates/deviceConnectAndroidPlugin --package-name $PACKAGE_NAME --connection-type $CONNECTION_TYPE --display-name $DISPLAY_NAME --output $OUTPUT_DIR"
27+
ARGS="--config ../good/configs/android-plugin.json --input-spec $SPEC --input-spec $SPEC_DIR --lang $LANG --template-dir templates/deviceConnectAndroidPlugin --package-name $PACKAGE_NAME --connection-type $CONNECTION_TYPE --display-name $DISPLAY_NAME --output $OUTPUT_DIR"
2828

2929
java -Dfile.encoding=UTF-8 -jar $JAR_FILE $ARGS

tests/good/good-android-plugin-001-input-spec-json.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ java -jar ../../bin/deviceconnect-codegen.jar \
66
--package-name com.mydomain.testplugin001 \
77
--display-name Test001 \
88
--input-spec profile-specs/swagger.json \
9-
--output output/android-plugin-001
9+
--output output/android-plugin-001 \
10+
--config configs/android-plugin.json

tests/good/good-android-plugin-002-input-spec-yaml.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ java -jar ../../bin/deviceconnect-codegen.jar \
66
--package-name com.mydomain.testplugin002 \
77
--display-name Test002 \
88
--input-spec profile-specs/swagger.yaml \
9-
--output output/android-plugin-002
9+
--output output/android-plugin-002 \
10+
--config configs/android-plugin.json

tests/good/good-android-plugin-003-input-specs-single.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ java -jar ../../bin/deviceconnect-codegen.jar \
66
--package-name com.mydomain.testplugin003 \
77
--display-name Test003 \
88
--input-spec profile-specs/swagger-files \
9-
--output output/android-plugin-003
9+
--output output/android-plugin-003 \
10+
--config configs/android-plugin.json

tests/good/good-android-plugin-004-input-specs-multiple.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ java -jar ../../bin/deviceconnect-codegen.jar \
66
--package-name com.mydomain.testplugin004 \
77
--display-name Test004 \
88
--input-spec profile-specs/swagger-files-multiple \
9-
--output output/android-plugin-004
9+
--output output/android-plugin-004 \
10+
--config configs/android-plugin.json

tests/good/good-android-plugin-005-option-names.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ java -jar ../../bin/deviceconnect-codegen.jar \
77
--display-name Test005 \
88
--input-spec profile-specs/swagger.json \
99
--output output/android-plugin-005 \
10-
--class-prefix Your
10+
--class-prefix Your \
11+
--config configs/android-plugin.json

tests/good/good-android-plugin-006-option-connection-type.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ java -jar ../../bin/deviceconnect-codegen.jar \
77
--display-name Test006 \
88
--input-spec profile-specs/swagger.json \
99
--output output/android-plugin-006 \
10-
--connection-type broadcast
10+
--connection-type broadcast \
11+
--config configs/android-plugin.json

tests/good/good-android-plugin-007-option-templates.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ java -jar ../../bin/deviceconnect-codegen.jar \
1010
--template-dir test-assets/007/templates/ \
1111
--sdk test-assets/007/sdk/ \
1212
--signing-configs test-assets/007/signingConfigs/ \
13-
--gradle-plugin-version 3.0.1
13+
--gradle-plugin-version 3.0.1 \
14+
--config configs/android-plugin.json

tests/good/good-android-plugin-008-event-without-interval.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ java -jar ../../bin/deviceconnect-codegen.jar \
77
--display-name Test008 \
88
--input-spec profile-specs/swagger-files-android-plugin-008/ \
99
--output output/android-plugin-008 \
10-
--gradle-plugin-version 3.3.2
10+
--gradle-plugin-version 3.3.2 \
11+
--config configs/android-plugin.json

tests/good/good-android-plugin-009-same-name-object-props.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ java -jar ../../bin/deviceconnect-codegen.jar \
77
--display-name Test009 \
88
--input-spec profile-specs/swagger-files-android-plugin-009/ \
99
--output output/android-plugin-009 \
10-
--gradle-plugin-version 3.3.2
10+
--gradle-plugin-version 3.3.2 \
11+
--config configs/android-plugin.json

0 commit comments

Comments
 (0)