Browse Source

Move test resources to test-res.

This breaks ant testing. I plan to change CI to use gradle then
remove the ant rules.

Change-Id: I38ca681b8742f316fc94ebfd8312b1bf4632354f
Reviewed-on: http://gerrit.dmdirc.com/3935
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager
pull/1/head
Chris Smith 9 years ago
parent
commit
bbfad60371

+ 1
- 0
.idea/parser.iml View File

@@ -12,6 +12,7 @@
12 12
       <sourceFolder url="file://$MODULE_DIR$/modules/parser/res" type="java-resource" />
13 13
       <sourceFolder url="file://$MODULE_DIR$/modules/parser/src/main/resources" type="java-resource" />
14 14
       <sourceFolder url="file://$MODULE_DIR$/modules/parser/src/test/resources" type="java-test-resource" />
15
+      <sourceFolder url="file://$MODULE_DIR$/modules/parser/test-res" type="java-test-resource" />
15 16
       <excludeFolder url="file://$MODULE_DIR$/modules/parser/.gradle" />
16 17
       <excludeFolder url="file://$MODULE_DIR$/modules/parser/build" />
17 18
     </content>

+ 13
- 10
build.gradle View File

@@ -24,18 +24,21 @@ allprojects {
24 24
 
25 25
     sourceSets {
26 26
         main {
27
-        java {
28
-            srcDir 'src'
27
+            java {
28
+                srcDir 'src'
29
+            }
30
+            resources {
31
+                srcDir 'res'
32
+            }
29 33
         }
30
-        resources {
31
-            srcDir 'res'
34
+        test {
35
+            java {
36
+                 srcDir 'test'
37
+            }
38
+            resources {
39
+                srcDir 'test-res'
40
+            }
32 41
         }
33
-       }
34
-       test {
35
-           java {
36
-           srcDir 'test'
37
-           }
38
-       }
39 42
     }
40 43
 
41 44
     sourceCompatibility = 1.7

+ 1
- 0
dmdirc.iml View File

@@ -12,6 +12,7 @@
12 12
       <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
13 13
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
14 14
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
15
+      <sourceFolder url="file://$MODULE_DIR$/test-res" type="java-test-resource" />
15 16
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
16 17
       <excludeFolder url="file://$MODULE_DIR$/build" />
17 18
     </content>

+ 1
- 0
modules/modules.iml View File

@@ -12,6 +12,7 @@
12 12
       <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
13 13
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
14 14
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
15
+      <sourceFolder url="file://$MODULE_DIR$/test-res" type="java-test-resource" />
15 16
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
16 17
       <excludeFolder url="file://$MODULE_DIR$/build" />
17 18
     </content>

test/com/dmdirc/actions/action1 → test-res/com/dmdirc/actions/action1 View File


test/com/dmdirc/actions/action_multisettings → test-res/com/dmdirc/actions/action_multisettings View File


test/com/dmdirc/config/identity1 → test-res/com/dmdirc/config/identity1 View File


test/com/dmdirc/config/identity2 → test-res/com/dmdirc/config/identity2 View File


test/com/dmdirc/config/identity3 → test-res/com/dmdirc/config/identity3 View File


test/com/dmdirc/config/prefs/reader/basic.yml → test-res/com/dmdirc/config/prefs/reader/basic.yml View File


Loading…
Cancel
Save