Skip to content

Commit 599381a

Browse files
jacomagojacomago
committed
Move aa processor tests into own package
1 parent de7db43 commit 599381a

8 files changed

+27
-36
lines changed

src/test/java/org/phoebus/channelfinder/processors/AAChannelProcessorIT.java renamed to src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.phoebus.channelfinder.processors;
1+
package org.phoebus.channelfinder.processors.aa;
22

33
import static org.junit.jupiter.api.Assertions.assertEquals;
44

@@ -21,7 +21,7 @@
2121
import org.junit.jupiter.params.provider.MethodSource;
2222
import org.phoebus.channelfinder.entity.Channel;
2323
import org.phoebus.channelfinder.entity.Property;
24-
import org.phoebus.channelfinder.processors.aa.AAChannelProcessor;
24+
import org.phoebus.channelfinder.processors.ChannelProcessor;
2525
import org.springframework.beans.factory.annotation.Autowired;
2626
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
2727
import org.springframework.test.context.TestPropertySource;

src/test/java/org/phoebus/channelfinder/processors/AAChannelProcessorMultiArchiverIT.java renamed to src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorMultiArchiverIT.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package org.phoebus.channelfinder.processors;
1+
package org.phoebus.channelfinder.processors.aa;
22

33
import static org.junit.jupiter.api.Assertions.assertEquals;
44
import static org.junit.jupiter.api.Assertions.assertTrue;
5-
import static org.phoebus.channelfinder.processors.AAChannelProcessorIT.activeProperty;
6-
import static org.phoebus.channelfinder.processors.AAChannelProcessorIT.archiveProperty;
7-
import static org.phoebus.channelfinder.processors.AAChannelProcessorIT.inactiveProperty;
5+
import static org.phoebus.channelfinder.processors.aa.AAChannelProcessorIT.activeProperty;
6+
import static org.phoebus.channelfinder.processors.aa.AAChannelProcessorIT.archiveProperty;
7+
import static org.phoebus.channelfinder.processors.aa.AAChannelProcessorIT.inactiveProperty;
88

99
import com.fasterxml.jackson.core.JsonProcessingException;
1010
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -25,8 +25,6 @@
2525
import org.junit.jupiter.params.provider.Arguments;
2626
import org.junit.jupiter.params.provider.MethodSource;
2727
import org.phoebus.channelfinder.entity.Channel;
28-
import org.phoebus.channelfinder.processors.aa.AAChannelProcessor;
29-
import org.phoebus.channelfinder.processors.aa.ArchiveAction;
3028
import org.springframework.beans.factory.annotation.Autowired;
3129
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
3230
import org.springframework.test.context.TestPropertySource;

src/test/java/org/phoebus/channelfinder/processors/AAChannelProcessorMultiIT.java renamed to src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorMultiIT.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package org.phoebus.channelfinder.processors;
1+
package org.phoebus.channelfinder.processors.aa;
22

33
import static org.junit.jupiter.api.Assertions.assertEquals;
44
import static org.junit.jupiter.api.Assertions.assertTrue;
5-
import static org.phoebus.channelfinder.processors.AAChannelProcessorIT.activeProperty;
6-
import static org.phoebus.channelfinder.processors.AAChannelProcessorIT.archiveProperty;
7-
import static org.phoebus.channelfinder.processors.AAChannelProcessorIT.inactiveProperty;
5+
import static org.phoebus.channelfinder.processors.aa.AAChannelProcessorIT.activeProperty;
6+
import static org.phoebus.channelfinder.processors.aa.AAChannelProcessorIT.archiveProperty;
7+
import static org.phoebus.channelfinder.processors.aa.AAChannelProcessorIT.inactiveProperty;
88

99
import com.fasterxml.jackson.core.JsonProcessingException;
1010
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -25,8 +25,6 @@
2525
import org.junit.jupiter.params.provider.Arguments;
2626
import org.junit.jupiter.params.provider.MethodSource;
2727
import org.phoebus.channelfinder.entity.Channel;
28-
import org.phoebus.channelfinder.processors.aa.AAChannelProcessor;
29-
import org.phoebus.channelfinder.processors.aa.ArchiveAction;
3028
import org.springframework.beans.factory.annotation.Autowired;
3129
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
3230
import org.springframework.test.context.TestPropertySource;

src/test/java/org/phoebus/channelfinder/processors/AAChannelProcessorNoDefaultIT.java renamed to src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorNoDefaultIT.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package org.phoebus.channelfinder.processors;
1+
package org.phoebus.channelfinder.processors.aa;
22

3-
import static org.phoebus.channelfinder.processors.AAChannelProcessorIT.activeProperty;
4-
import static org.phoebus.channelfinder.processors.AAChannelProcessorIT.archiveProperty;
5-
import static org.phoebus.channelfinder.processors.AAChannelProcessorIT.paramableAAChannelProcessorTest;
3+
import static org.phoebus.channelfinder.processors.aa.AAChannelProcessorIT.activeProperty;
4+
import static org.phoebus.channelfinder.processors.aa.AAChannelProcessorIT.archiveProperty;
5+
import static org.phoebus.channelfinder.processors.aa.AAChannelProcessorIT.paramableAAChannelProcessorTest;
66

77
import com.fasterxml.jackson.core.JsonProcessingException;
88
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -17,7 +17,6 @@
1717
import org.junit.jupiter.params.provider.MethodSource;
1818
import org.phoebus.channelfinder.entity.Channel;
1919
import org.phoebus.channelfinder.entity.Property;
20-
import org.phoebus.channelfinder.processors.aa.AAChannelProcessor;
2120
import org.springframework.beans.factory.annotation.Autowired;
2221
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
2322
import org.springframework.test.context.TestPropertySource;

src/test/java/org/phoebus/channelfinder/processors/AAChannelProcessorNoPauseIT.java renamed to src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorNoPauseIT.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package org.phoebus.channelfinder.processors;
1+
package org.phoebus.channelfinder.processors.aa;
22

3-
import static org.phoebus.channelfinder.processors.AAChannelProcessorIT.archiveProperty;
4-
import static org.phoebus.channelfinder.processors.AAChannelProcessorIT.inactiveProperty;
5-
import static org.phoebus.channelfinder.processors.AAChannelProcessorIT.paramableAAChannelProcessorTest;
3+
import static org.phoebus.channelfinder.processors.aa.AAChannelProcessorIT.archiveProperty;
4+
import static org.phoebus.channelfinder.processors.aa.AAChannelProcessorIT.inactiveProperty;
5+
import static org.phoebus.channelfinder.processors.aa.AAChannelProcessorIT.paramableAAChannelProcessorTest;
66

77
import com.fasterxml.jackson.core.JsonProcessingException;
88
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -16,7 +16,6 @@
1616
import org.junit.jupiter.params.provider.Arguments;
1717
import org.junit.jupiter.params.provider.MethodSource;
1818
import org.phoebus.channelfinder.entity.Channel;
19-
import org.phoebus.channelfinder.processors.aa.AAChannelProcessor;
2019
import org.springframework.beans.factory.annotation.Autowired;
2120
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
2221
import org.springframework.test.context.TestPropertySource;

src/test/java/org/phoebus/channelfinder/processors/AAChannelProcessorStatusPauseIT.java renamed to src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorStatusPauseIT.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package org.phoebus.channelfinder.processors;
1+
package org.phoebus.channelfinder.processors.aa;
22

3-
import static org.phoebus.channelfinder.processors.AAChannelProcessorIT.archiveProperty;
4-
import static org.phoebus.channelfinder.processors.AAChannelProcessorIT.inactiveProperty;
5-
import static org.phoebus.channelfinder.processors.AAChannelProcessorIT.paramableAAChannelProcessorTest;
3+
import static org.phoebus.channelfinder.processors.aa.AAChannelProcessorIT.archiveProperty;
4+
import static org.phoebus.channelfinder.processors.aa.AAChannelProcessorIT.inactiveProperty;
5+
import static org.phoebus.channelfinder.processors.aa.AAChannelProcessorIT.paramableAAChannelProcessorTest;
66

77
import com.fasterxml.jackson.core.JsonProcessingException;
88
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -16,7 +16,6 @@
1616
import org.junit.jupiter.params.provider.Arguments;
1717
import org.junit.jupiter.params.provider.MethodSource;
1818
import org.phoebus.channelfinder.entity.Channel;
19-
import org.phoebus.channelfinder.processors.aa.AAChannelProcessor;
2019
import org.springframework.beans.factory.annotation.Autowired;
2120
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
2221
import org.springframework.test.context.TestPropertySource;

src/test/java/org/phoebus/channelfinder/processors/AAChannelProcessorTagPauseIT.java renamed to src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorTagPauseIT.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package org.phoebus.channelfinder.processors;
1+
package org.phoebus.channelfinder.processors.aa;
22

3-
import static org.phoebus.channelfinder.processors.AAChannelProcessorIT.archiveProperty;
4-
import static org.phoebus.channelfinder.processors.AAChannelProcessorIT.inactiveProperty;
5-
import static org.phoebus.channelfinder.processors.AAChannelProcessorIT.paramableAAChannelProcessorTest;
3+
import static org.phoebus.channelfinder.processors.aa.AAChannelProcessorIT.archiveProperty;
4+
import static org.phoebus.channelfinder.processors.aa.AAChannelProcessorIT.inactiveProperty;
5+
import static org.phoebus.channelfinder.processors.aa.AAChannelProcessorIT.paramableAAChannelProcessorTest;
66

77
import com.fasterxml.jackson.core.JsonProcessingException;
88
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -16,7 +16,6 @@
1616
import org.junit.jupiter.params.provider.Arguments;
1717
import org.junit.jupiter.params.provider.MethodSource;
1818
import org.phoebus.channelfinder.entity.Channel;
19-
import org.phoebus.channelfinder.processors.aa.AAChannelProcessor;
2019
import org.springframework.beans.factory.annotation.Autowired;
2120
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
2221
import org.springframework.test.context.TestPropertySource;

src/test/java/org/phoebus/channelfinder/processors/AAChannelProcessorTest.java renamed to src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.phoebus.channelfinder.processors;
1+
package org.phoebus.channelfinder.processors.aa;
22

33
import com.fasterxml.jackson.core.JsonProcessingException;
44
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -11,7 +11,6 @@
1111
import org.junit.jupiter.params.ParameterizedTest;
1212
import org.junit.jupiter.params.provider.Arguments;
1313
import org.junit.jupiter.params.provider.MethodSource;
14-
import org.phoebus.channelfinder.processors.aa.ArchivePVOptions;
1514

1615
class AAChannelProcessorTest {
1716

0 commit comments

Comments
 (0)