[go: nahoru, domu]

Move Room test sources to 'test-data'

This is so that ktlint ignores the files.
See: https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:buildSrc/private/src/main/kotlin/androidx/build/Ktlint.kt;l=92

Test: n/a
Change-Id: I28769282e41fce4a0f3858cf8524f86121bf85dc
diff --git a/room/integration-tests/incremental-annotation-processing/src/test/kotlin/androidx/room/gradle/RoomIncrementalAnnotationProcessingTest.kt b/room/integration-tests/incremental-annotation-processing/src/test/kotlin/androidx/room/gradle/RoomIncrementalAnnotationProcessingTest.kt
index ee639b9..54de55f 100644
--- a/room/integration-tests/incremental-annotation-processing/src/test/kotlin/androidx/room/gradle/RoomIncrementalAnnotationProcessingTest.kt
+++ b/room/integration-tests/incremental-annotation-processing/src/test/kotlin/androidx/room/gradle/RoomIncrementalAnnotationProcessingTest.kt
@@ -157,7 +157,7 @@
                 projectSetup.props.kspVersion
 
         // copy test project
-        File("src/test/data/simple-project").copyRecursively(projectRoot)
+        File("src/test/test-data/simple-project").copyRecursively(projectRoot)
 
         if (useKsp) {
             // add a kotlin file to trigger kotlin compilation
diff --git a/room/integration-tests/incremental-annotation-processing/src/test/data/simple-project/src/main/AndroidManifest.xml b/room/integration-tests/incremental-annotation-processing/src/test/test-data/simple-project/src/main/AndroidManifest.xml
similarity index 100%
rename from room/integration-tests/incremental-annotation-processing/src/test/data/simple-project/src/main/AndroidManifest.xml
rename to room/integration-tests/incremental-annotation-processing/src/test/test-data/simple-project/src/main/AndroidManifest.xml
diff --git a/room/integration-tests/incremental-annotation-processing/src/test/data/simple-project/src/main/java/room/testapp/Dao1.java b/room/integration-tests/incremental-annotation-processing/src/test/test-data/simple-project/src/main/java/room/testapp/Dao1.java
similarity index 100%
rename from room/integration-tests/incremental-annotation-processing/src/test/data/simple-project/src/main/java/room/testapp/Dao1.java
rename to room/integration-tests/incremental-annotation-processing/src/test/test-data/simple-project/src/main/java/room/testapp/Dao1.java
diff --git a/room/integration-tests/incremental-annotation-processing/src/test/data/simple-project/src/main/java/room/testapp/Dao2.java b/room/integration-tests/incremental-annotation-processing/src/test/test-data/simple-project/src/main/java/room/testapp/Dao2.java
similarity index 100%
rename from room/integration-tests/incremental-annotation-processing/src/test/data/simple-project/src/main/java/room/testapp/Dao2.java
rename to room/integration-tests/incremental-annotation-processing/src/test/test-data/simple-project/src/main/java/room/testapp/Dao2.java
diff --git a/room/integration-tests/incremental-annotation-processing/src/test/data/simple-project/src/main/java/room/testapp/Database1.java b/room/integration-tests/incremental-annotation-processing/src/test/test-data/simple-project/src/main/java/room/testapp/Database1.java
similarity index 100%
rename from room/integration-tests/incremental-annotation-processing/src/test/data/simple-project/src/main/java/room/testapp/Database1.java
rename to room/integration-tests/incremental-annotation-processing/src/test/test-data/simple-project/src/main/java/room/testapp/Database1.java
diff --git a/room/integration-tests/incremental-annotation-processing/src/test/data/simple-project/src/main/java/room/testapp/Database2.java b/room/integration-tests/incremental-annotation-processing/src/test/test-data/simple-project/src/main/java/room/testapp/Database2.java
similarity index 100%
rename from room/integration-tests/incremental-annotation-processing/src/test/data/simple-project/src/main/java/room/testapp/Database2.java
rename to room/integration-tests/incremental-annotation-processing/src/test/test-data/simple-project/src/main/java/room/testapp/Database2.java
diff --git a/room/integration-tests/incremental-annotation-processing/src/test/data/simple-project/src/main/java/room/testapp/Entity1.java b/room/integration-tests/incremental-annotation-processing/src/test/test-data/simple-project/src/main/java/room/testapp/Entity1.java
similarity index 100%
rename from room/integration-tests/incremental-annotation-processing/src/test/data/simple-project/src/main/java/room/testapp/Entity1.java
rename to room/integration-tests/incremental-annotation-processing/src/test/test-data/simple-project/src/main/java/room/testapp/Entity1.java
diff --git a/room/integration-tests/incremental-annotation-processing/src/test/data/simple-project/src/main/java/room/testapp/Entity2.java b/room/integration-tests/incremental-annotation-processing/src/test/test-data/simple-project/src/main/java/room/testapp/Entity2.java
similarity index 100%
rename from room/integration-tests/incremental-annotation-processing/src/test/data/simple-project/src/main/java/room/testapp/Entity2.java
rename to room/integration-tests/incremental-annotation-processing/src/test/test-data/simple-project/src/main/java/room/testapp/Entity2.java
diff --git a/room/room-compiler/src/test/kotlin/androidx/room/testing/test_util.kt b/room/room-compiler/src/test/kotlin/androidx/room/testing/test_util.kt
index 8f51609..3ddb247 100644
--- a/room/room-compiler/src/test/kotlin/androidx/room/testing/test_util.kt
+++ b/room/room-compiler/src/test/kotlin/androidx/room/testing/test_util.kt
@@ -318,12 +318,12 @@
 }
 
 fun loadJavaCode(fileName: String, qName: String): Source {
-    val contents = File("src/test/data/$fileName").readText(Charsets.UTF_8)
+    val contents = File("src/test/test-data/$fileName").readText(Charsets.UTF_8)
     return Source.java(qName, contents)
 }
 
 fun loadTestSource(fileName: String, qName: String): Source {
-    val contents = File("src/test/data/$fileName")
+    val contents = File("src/test/test-data/$fileName")
     return Source.load(contents, qName, fileName)
 }
 
diff --git a/room/room-compiler/src/test/data/IGNORE_CHECKSTYLE b/room/room-compiler/src/test/test-data/IGNORE_CHECKSTYLE
similarity index 100%
rename from room/room-compiler/src/test/data/IGNORE_CHECKSTYLE
rename to room/room-compiler/src/test/test-data/IGNORE_CHECKSTYLE
diff --git a/room/room-compiler/src/test/data/autoMigrationWriter/output/ValidAutoMigrationWithDefault.java b/room/room-compiler/src/test/test-data/autoMigrationWriter/output/ValidAutoMigrationWithDefault.java
similarity index 100%
rename from room/room-compiler/src/test/data/autoMigrationWriter/output/ValidAutoMigrationWithDefault.java
rename to room/room-compiler/src/test/test-data/autoMigrationWriter/output/ValidAutoMigrationWithDefault.java
diff --git a/room/room-compiler/src/test/data/autoMigrationWriter/output/ValidAutoMigrationWithoutDefault.java b/room/room-compiler/src/test/test-data/autoMigrationWriter/output/ValidAutoMigrationWithoutDefault.java
similarity index 100%
rename from room/room-compiler/src/test/data/autoMigrationWriter/output/ValidAutoMigrationWithoutDefault.java
rename to room/room-compiler/src/test/test-data/autoMigrationWriter/output/ValidAutoMigrationWithoutDefault.java
diff --git a/room/room-compiler/src/test/data/autoMigrationWriter/output/ValidMultiColumnRename.java b/room/room-compiler/src/test/test-data/autoMigrationWriter/output/ValidMultiColumnRename.java
similarity index 100%
rename from room/room-compiler/src/test/data/autoMigrationWriter/output/ValidMultiColumnRename.java
rename to room/room-compiler/src/test/test-data/autoMigrationWriter/output/ValidMultiColumnRename.java
diff --git a/room/room-compiler/src/test/data/common/input/Artist.java b/room/room-compiler/src/test/test-data/common/input/Artist.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/Artist.java
rename to room/room-compiler/src/test/test-data/common/input/Artist.java
diff --git a/room/room-compiler/src/test/data/common/input/Book.java b/room/room-compiler/src/test/test-data/common/input/Book.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/Book.java
rename to room/room-compiler/src/test/test-data/common/input/Book.java
diff --git a/room/room-compiler/src/test/data/common/input/Child1.java b/room/room-compiler/src/test/test-data/common/input/Child1.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/Child1.java
rename to room/room-compiler/src/test/test-data/common/input/Child1.java
diff --git a/room/room-compiler/src/test/data/common/input/Child2.java b/room/room-compiler/src/test/test-data/common/input/Child2.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/Child2.java
rename to room/room-compiler/src/test/test-data/common/input/Child2.java
diff --git a/room/room-compiler/src/test/data/common/input/ComputableLiveData.java b/room/room-compiler/src/test/test-data/common/input/ComputableLiveData.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/ComputableLiveData.java
rename to room/room-compiler/src/test/test-data/common/input/ComputableLiveData.java
diff --git a/room/room-compiler/src/test/data/common/input/CoroutinesRoom.java b/room/room-compiler/src/test/test-data/common/input/CoroutinesRoom.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/CoroutinesRoom.java
rename to room/room-compiler/src/test/test-data/common/input/CoroutinesRoom.java
diff --git a/room/room-compiler/src/test/data/common/input/DataSource.java b/room/room-compiler/src/test/test-data/common/input/DataSource.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/DataSource.java
rename to room/room-compiler/src/test/test-data/common/input/DataSource.java
diff --git a/room/room-compiler/src/test/data/common/input/DateConverter.java b/room/room-compiler/src/test/test-data/common/input/DateConverter.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/DateConverter.java
rename to room/room-compiler/src/test/test-data/common/input/DateConverter.java
diff --git a/room/room-compiler/src/test/data/common/input/Flow.java b/room/room-compiler/src/test/test-data/common/input/Flow.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/Flow.java
rename to room/room-compiler/src/test/test-data/common/input/Flow.java
diff --git a/room/room-compiler/src/test/data/common/input/GuavaRoom.java b/room/room-compiler/src/test/test-data/common/input/GuavaRoom.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/GuavaRoom.java
rename to room/room-compiler/src/test/test-data/common/input/GuavaRoom.java
diff --git a/room/room-compiler/src/test/data/common/input/Image.java b/room/room-compiler/src/test/test-data/common/input/Image.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/Image.java
rename to room/room-compiler/src/test/test-data/common/input/Image.java
diff --git a/room/room-compiler/src/test/data/common/input/ImageFormat.java b/room/room-compiler/src/test/test-data/common/input/ImageFormat.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/ImageFormat.java
rename to room/room-compiler/src/test/test-data/common/input/ImageFormat.java
diff --git a/room/room-compiler/src/test/data/common/input/Info.java b/room/room-compiler/src/test/test-data/common/input/Info.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/Info.java
rename to room/room-compiler/src/test/test-data/common/input/Info.java
diff --git a/room/room-compiler/src/test/data/common/input/LimitOffsetListenableFuturePagingSource.java b/room/room-compiler/src/test/test-data/common/input/LimitOffsetListenableFuturePagingSource.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/LimitOffsetListenableFuturePagingSource.java
rename to room/room-compiler/src/test/test-data/common/input/LimitOffsetListenableFuturePagingSource.java
diff --git a/room/room-compiler/src/test/data/common/input/LimitOffsetPagingSource.java b/room/room-compiler/src/test/test-data/common/input/LimitOffsetPagingSource.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/LimitOffsetPagingSource.java
rename to room/room-compiler/src/test/test-data/common/input/LimitOffsetPagingSource.java
diff --git a/room/room-compiler/src/test/data/common/input/LimitOffsetRx2PagingSource.java b/room/room-compiler/src/test/test-data/common/input/LimitOffsetRx2PagingSource.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/LimitOffsetRx2PagingSource.java
rename to room/room-compiler/src/test/test-data/common/input/LimitOffsetRx2PagingSource.java
diff --git a/room/room-compiler/src/test/data/common/input/LimitOffsetRx3PagingSource.java b/room/room-compiler/src/test/test-data/common/input/LimitOffsetRx3PagingSource.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/LimitOffsetRx3PagingSource.java
rename to room/room-compiler/src/test/test-data/common/input/LimitOffsetRx3PagingSource.java
diff --git a/room/room-compiler/src/test/data/common/input/ListenableFuturePagingSource.java b/room/room-compiler/src/test/test-data/common/input/ListenableFuturePagingSource.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/ListenableFuturePagingSource.java
rename to room/room-compiler/src/test/test-data/common/input/ListenableFuturePagingSource.java
diff --git a/room/room-compiler/src/test/data/common/input/LiveData.java b/room/room-compiler/src/test/test-data/common/input/LiveData.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/LiveData.java
rename to room/room-compiler/src/test/test-data/common/input/LiveData.java
diff --git a/room/room-compiler/src/test/data/common/input/MultiPKeyEntity.java b/room/room-compiler/src/test/test-data/common/input/MultiPKeyEntity.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/MultiPKeyEntity.java
rename to room/room-compiler/src/test/test-data/common/input/MultiPKeyEntity.java
diff --git a/room/room-compiler/src/test/data/common/input/NotAnEntity.java b/room/room-compiler/src/test/test-data/common/input/NotAnEntity.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/NotAnEntity.java
rename to room/room-compiler/src/test/test-data/common/input/NotAnEntity.java
diff --git a/room/room-compiler/src/test/data/common/input/PagingSource.java b/room/room-compiler/src/test/test-data/common/input/PagingSource.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/PagingSource.java
rename to room/room-compiler/src/test/test-data/common/input/PagingSource.java
diff --git a/room/room-compiler/src/test/data/common/input/Parent.java b/room/room-compiler/src/test/test-data/common/input/Parent.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/Parent.java
rename to room/room-compiler/src/test/test-data/common/input/Parent.java
diff --git a/room/room-compiler/src/test/data/common/input/PositionalDataSource.java b/room/room-compiler/src/test/test-data/common/input/PositionalDataSource.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/PositionalDataSource.java
rename to room/room-compiler/src/test/test-data/common/input/PositionalDataSource.java
diff --git a/room/room-compiler/src/test/data/common/input/RoomDatabaseKt.java b/room/room-compiler/src/test/test-data/common/input/RoomDatabaseKt.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/RoomDatabaseKt.java
rename to room/room-compiler/src/test/test-data/common/input/RoomDatabaseKt.java
diff --git a/room/room-compiler/src/test/data/common/input/Rx2PagingSource.java b/room/room-compiler/src/test/test-data/common/input/Rx2PagingSource.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/Rx2PagingSource.java
rename to room/room-compiler/src/test/test-data/common/input/Rx2PagingSource.java
diff --git a/room/room-compiler/src/test/data/common/input/Rx2Room.java b/room/room-compiler/src/test/test-data/common/input/Rx2Room.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/Rx2Room.java
rename to room/room-compiler/src/test/test-data/common/input/Rx2Room.java
diff --git a/room/room-compiler/src/test/data/common/input/Rx3PagingSource.java b/room/room-compiler/src/test/test-data/common/input/Rx3PagingSource.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/Rx3PagingSource.java
rename to room/room-compiler/src/test/test-data/common/input/Rx3PagingSource.java
diff --git a/room/room-compiler/src/test/data/common/input/Rx3Room.java b/room/room-compiler/src/test/test-data/common/input/Rx3Room.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/Rx3Room.java
rename to room/room-compiler/src/test/test-data/common/input/Rx3Room.java
diff --git a/room/room-compiler/src/test/data/common/input/Song.java b/room/room-compiler/src/test/test-data/common/input/Song.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/Song.java
rename to room/room-compiler/src/test/test-data/common/input/Song.java
diff --git a/room/room-compiler/src/test/data/common/input/User.java b/room/room-compiler/src/test/test-data/common/input/User.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/User.java
rename to room/room-compiler/src/test/test-data/common/input/User.java
diff --git a/room/room-compiler/src/test/data/common/input/UserSummary.java b/room/room-compiler/src/test/test-data/common/input/UserSummary.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/UserSummary.java
rename to room/room-compiler/src/test/test-data/common/input/UserSummary.java
diff --git a/room/room-compiler/src/test/data/common/input/coroutines/Channel.java b/room/room-compiler/src/test/test-data/common/input/coroutines/Channel.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/coroutines/Channel.java
rename to room/room-compiler/src/test/test-data/common/input/coroutines/Channel.java
diff --git a/room/room-compiler/src/test/data/common/input/coroutines/ReceiveChannel.java b/room/room-compiler/src/test/test-data/common/input/coroutines/ReceiveChannel.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/coroutines/ReceiveChannel.java
rename to room/room-compiler/src/test/test-data/common/input/coroutines/ReceiveChannel.java
diff --git a/room/room-compiler/src/test/data/common/input/coroutines/SendChannel.java b/room/room-compiler/src/test/test-data/common/input/coroutines/SendChannel.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/coroutines/SendChannel.java
rename to room/room-compiler/src/test/test-data/common/input/coroutines/SendChannel.java
diff --git a/room/room-compiler/src/test/data/common/input/guava/ListenableFuture.java b/room/room-compiler/src/test/test-data/common/input/guava/ListenableFuture.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/guava/ListenableFuture.java
rename to room/room-compiler/src/test/test-data/common/input/guava/ListenableFuture.java
diff --git a/room/room-compiler/src/test/data/common/input/reactivestreams/Publisher.java b/room/room-compiler/src/test/test-data/common/input/reactivestreams/Publisher.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/reactivestreams/Publisher.java
rename to room/room-compiler/src/test/test-data/common/input/reactivestreams/Publisher.java
diff --git a/room/room-compiler/src/test/data/common/input/rxjava2/Completable.java b/room/room-compiler/src/test/test-data/common/input/rxjava2/Completable.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/rxjava2/Completable.java
rename to room/room-compiler/src/test/test-data/common/input/rxjava2/Completable.java
diff --git a/room/room-compiler/src/test/data/common/input/rxjava2/Flowable.java b/room/room-compiler/src/test/test-data/common/input/rxjava2/Flowable.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/rxjava2/Flowable.java
rename to room/room-compiler/src/test/test-data/common/input/rxjava2/Flowable.java
diff --git a/room/room-compiler/src/test/data/common/input/rxjava2/Maybe.java b/room/room-compiler/src/test/test-data/common/input/rxjava2/Maybe.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/rxjava2/Maybe.java
rename to room/room-compiler/src/test/test-data/common/input/rxjava2/Maybe.java
diff --git a/room/room-compiler/src/test/data/common/input/rxjava2/Observable.java b/room/room-compiler/src/test/test-data/common/input/rxjava2/Observable.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/rxjava2/Observable.java
rename to room/room-compiler/src/test/test-data/common/input/rxjava2/Observable.java
diff --git a/room/room-compiler/src/test/data/common/input/rxjava2/Single.java b/room/room-compiler/src/test/test-data/common/input/rxjava2/Single.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/rxjava2/Single.java
rename to room/room-compiler/src/test/test-data/common/input/rxjava2/Single.java
diff --git a/room/room-compiler/src/test/data/common/input/rxjava3/Completable.java b/room/room-compiler/src/test/test-data/common/input/rxjava3/Completable.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/rxjava3/Completable.java
rename to room/room-compiler/src/test/test-data/common/input/rxjava3/Completable.java
diff --git a/room/room-compiler/src/test/data/common/input/rxjava3/Flowable.java b/room/room-compiler/src/test/test-data/common/input/rxjava3/Flowable.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/rxjava3/Flowable.java
rename to room/room-compiler/src/test/test-data/common/input/rxjava3/Flowable.java
diff --git a/room/room-compiler/src/test/data/common/input/rxjava3/Maybe.java b/room/room-compiler/src/test/test-data/common/input/rxjava3/Maybe.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/rxjava3/Maybe.java
rename to room/room-compiler/src/test/test-data/common/input/rxjava3/Maybe.java
diff --git a/room/room-compiler/src/test/data/common/input/rxjava3/Observable.java b/room/room-compiler/src/test/test-data/common/input/rxjava3/Observable.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/rxjava3/Observable.java
rename to room/room-compiler/src/test/test-data/common/input/rxjava3/Observable.java
diff --git a/room/room-compiler/src/test/data/common/input/rxjava3/Single.java b/room/room-compiler/src/test/test-data/common/input/rxjava3/Single.java
similarity index 100%
rename from room/room-compiler/src/test/data/common/input/rxjava3/Single.java
rename to room/room-compiler/src/test/test-data/common/input/rxjava3/Single.java
diff --git a/room/room-compiler/src/test/data/daoWriter/input/ComplexDao.java b/room/room-compiler/src/test/test-data/daoWriter/input/ComplexDao.java
similarity index 100%
rename from room/room-compiler/src/test/data/daoWriter/input/ComplexDao.java
rename to room/room-compiler/src/test/test-data/daoWriter/input/ComplexDao.java
diff --git a/room/room-compiler/src/test/data/daoWriter/input/DeletionDao.java b/room/room-compiler/src/test/test-data/daoWriter/input/DeletionDao.java
similarity index 100%
rename from room/room-compiler/src/test/data/daoWriter/input/DeletionDao.java
rename to room/room-compiler/src/test/test-data/daoWriter/input/DeletionDao.java
diff --git a/room/room-compiler/src/test/data/daoWriter/input/UpdateDao.java b/room/room-compiler/src/test/test-data/daoWriter/input/UpdateDao.java
similarity index 100%
rename from room/room-compiler/src/test/data/daoWriter/input/UpdateDao.java
rename to room/room-compiler/src/test/test-data/daoWriter/input/UpdateDao.java
diff --git a/room/room-compiler/src/test/data/daoWriter/input/UpsertDao.java b/room/room-compiler/src/test/test-data/daoWriter/input/UpsertDao.java
similarity index 100%
rename from room/room-compiler/src/test/data/daoWriter/input/UpsertDao.java
rename to room/room-compiler/src/test/test-data/daoWriter/input/UpsertDao.java
diff --git a/room/room-compiler/src/test/data/daoWriter/input/WriterDao.java b/room/room-compiler/src/test/test-data/daoWriter/input/WriterDao.java
similarity index 100%
rename from room/room-compiler/src/test/data/daoWriter/input/WriterDao.java
rename to room/room-compiler/src/test/test-data/daoWriter/input/WriterDao.java
diff --git a/room/room-compiler/src/test/data/daoWriter/output/ComplexDao.java b/room/room-compiler/src/test/test-data/daoWriter/output/ComplexDao.java
similarity index 100%
rename from room/room-compiler/src/test/data/daoWriter/output/ComplexDao.java
rename to room/room-compiler/src/test/test-data/daoWriter/output/ComplexDao.java
diff --git a/room/room-compiler/src/test/data/daoWriter/output/DeletionDao.java b/room/room-compiler/src/test/test-data/daoWriter/output/DeletionDao.java
similarity index 100%
rename from room/room-compiler/src/test/data/daoWriter/output/DeletionDao.java
rename to room/room-compiler/src/test/test-data/daoWriter/output/DeletionDao.java
diff --git a/room/room-compiler/src/test/data/daoWriter/output/UpdateDao.java b/room/room-compiler/src/test/test-data/daoWriter/output/UpdateDao.java
similarity index 100%
rename from room/room-compiler/src/test/data/daoWriter/output/UpdateDao.java
rename to room/room-compiler/src/test/test-data/daoWriter/output/UpdateDao.java
diff --git a/room/room-compiler/src/test/data/daoWriter/output/UpsertDao.java b/room/room-compiler/src/test/test-data/daoWriter/output/UpsertDao.java
similarity index 100%
rename from room/room-compiler/src/test/data/daoWriter/output/UpsertDao.java
rename to room/room-compiler/src/test/test-data/daoWriter/output/UpsertDao.java
diff --git a/room/room-compiler/src/test/data/daoWriter/output/WriterDao.java b/room/room-compiler/src/test/test-data/daoWriter/output/WriterDao.java
similarity index 100%
rename from room/room-compiler/src/test/data/daoWriter/output/WriterDao.java
rename to room/room-compiler/src/test/test-data/daoWriter/output/WriterDao.java
diff --git a/room/room-compiler/src/test/data/databasewriter/input/ComplexDatabase.java b/room/room-compiler/src/test/test-data/databasewriter/input/ComplexDatabase.java
similarity index 100%
rename from room/room-compiler/src/test/data/databasewriter/input/ComplexDatabase.java
rename to room/room-compiler/src/test/test-data/databasewriter/input/ComplexDatabase.java
diff --git a/room/room-compiler/src/test/data/databasewriter/output/ComplexDatabase.java b/room/room-compiler/src/test/test-data/databasewriter/output/ComplexDatabase.java
similarity index 100%
rename from room/room-compiler/src/test/data/databasewriter/output/ComplexDatabase.java
rename to room/room-compiler/src/test/test-data/databasewriter/output/ComplexDatabase.java