@@ -55,7 +55,7 @@ class CoderProtocolHandlerTest {
5555 // Feed returns empty or irrelevant EAPs
5656 coEvery { feedService.fetchEapFeed() } returns emptyList()
5757
58- assertEquals(" RR- 241.1" , handler.resolveIdeIdentifier(" env-1" , " RR" , " latest_eap" ))
58+ assertEquals(" 241.1" , handler.resolveIdeIdentifier(" env-1" , " RR" , " latest_eap" ))
5959 }
6060
6161 @Test
@@ -68,7 +68,7 @@ class CoderProtocolHandlerTest {
6868 Ide (" RR" , " 243.1" , " 2024.3" , IdeType .EAP )
6969 )
7070
71- assertEquals(" RR- 243.1" , handler.resolveIdeIdentifier(" env-1" , " RR" , " latest_eap" ))
71+ assertEquals(" 243.1" , handler.resolveIdeIdentifier(" env-1" , " RR" , " latest_eap" ))
7272 }
7373
7474 @Test
@@ -84,7 +84,7 @@ class CoderProtocolHandlerTest {
8484 coEvery { remoteToolsHelper.getAvailableRemoteTools(" env-1" , " RR" ) } returns listOf (" RR-243.1" , " RR-242.1" )
8585 coEvery { feedService.fetchReleaseFeed() } returns emptyList()
8686
87- assertEquals(" RR- 243.1" , handler.resolveIdeIdentifier(" env-1" , " RR" , " latest_release" ))
87+ assertEquals(" 243.1" , handler.resolveIdeIdentifier(" env-1" , " RR" , " latest_release" ))
8888 }
8989
9090 @Test
@@ -97,15 +97,15 @@ class CoderProtocolHandlerTest {
9797 Ide (" RR" , " 242.1" , " 2024.2" , IdeType .RELEASE )
9898 )
9999
100- assertEquals(" RR- 242.1" , handler.resolveIdeIdentifier(" env-1" , " RR" , " latest_release" ))
100+ assertEquals(" 242.1" , handler.resolveIdeIdentifier(" env-1" , " RR" , " latest_release" ))
101101 }
102102
103103 @Test
104104 fun `given installed tools exist when resolving latest installed then returns max installed version` () =
105105 runTest(dispatcher) {
106106 coEvery { remoteToolsHelper.getInstalledRemoteTools(" env-1" , " RR" ) } returns listOf (" RR-240.1" , " RR-241.1" )
107107
108- assertEquals(" RR- 241.1" , handler.resolveIdeIdentifier(" env-1" , " RR" , " latest_installed" ))
108+ assertEquals(" 241.1" , handler.resolveIdeIdentifier(" env-1" , " RR" , " latest_installed" ))
109109 }
110110
111111 @Test
@@ -114,7 +114,7 @@ class CoderProtocolHandlerTest {
114114 coEvery { remoteToolsHelper.getInstalledRemoteTools(" env-1" , " RR" ) } returns emptyList()
115115 coEvery { remoteToolsHelper.getAvailableRemoteTools(" env-1" , " RR" ) } returns listOf (" RR-243.1" , " RR-242.1" )
116116
117- assertEquals(" RR- 243.1" , handler.resolveIdeIdentifier(" env-1" , " RR" , " latest_installed" ))
117+ assertEquals(" 243.1" , handler.resolveIdeIdentifier(" env-1" , " RR" , " latest_installed" ))
118118 }
119119
120120 @Test
@@ -127,25 +127,25 @@ class CoderProtocolHandlerTest {
127127 }
128128
129129 @Test
130- fun `given specific build exists in available tools but not in installed then expect the available match to be returned` () =
130+ fun `given specific build exists in installed tools but not in available then expect the installed match to be returned` () =
131131 runTest(dispatcher) {
132132 coEvery { remoteToolsHelper.getAvailableRemoteTools(" env-1" , " RR" ) } returns listOf (" RR-241.1" , " RR-242.1" )
133133 coEvery { remoteToolsHelper.getInstalledRemoteTools(" env-1" , " RR" ) } returns listOf (" RR-251.1" , " RR-252.1" )
134134
135- assertEquals(" RR-241 .1" , handler.resolveIdeIdentifier(" env-1" , " RR" , " 241 .1" ))
135+ assertEquals(" 251 .1" , handler.resolveIdeIdentifier(" env-1" , " RR" , " 251 .1" ))
136136 }
137137
138138 @Test
139- fun `given specific build exists in installed tools but not in available then expect the installed match to be returned` () =
139+ fun `given specific build exists in available tools but not in installed then expect the available match to be returned` () =
140140 runTest(dispatcher) {
141141 coEvery { remoteToolsHelper.getAvailableRemoteTools(" env-1" , " RR" ) } returns listOf (" RR-241.1" , " RR-242.1" )
142142 coEvery { remoteToolsHelper.getInstalledRemoteTools(" env-1" , " RR" ) } returns listOf (" RR-251.1" , " RR-252.1" )
143143
144- assertEquals(" RR-251 .1" , handler.resolveIdeIdentifier(" env-1" , " RR" , " 251 .1" ))
144+ assertEquals(" 241 .1" , handler.resolveIdeIdentifier(" env-1" , " RR" , " 241 .1" ))
145145 }
146146
147147 @Test
148- fun `given specific build does not exist in installed tools nor in the available tools then null should be returned` () =
148+ fun `given specific build does not exist in installed tools nor in the available tools then null should be returned` () =
149149 runTest(dispatcher) {
150150 coEvery { remoteToolsHelper.getAvailableRemoteTools(" env-1" , " RR" ) } returns listOf (" RR-241.1" , " RR-242.1" )
151151 coEvery { remoteToolsHelper.getInstalledRemoteTools(" env-1" , " RR" ) } returns listOf (" RR-251.1" , " RR-252.1" )
@@ -154,10 +154,19 @@ class CoderProtocolHandlerTest {
154154 }
155155
156156 @Test
157- fun `given specific build does not exist in available tools when resolving specific build then constructs identifier ` () =
157+ fun `installed build takes precedence over available tools when matching a build number ` () =
158158 runTest(dispatcher) {
159- coEvery { remoteToolsHelper.getAvailableRemoteTools(" env-1" , " RR" ) } returns listOf (" RR-242.1" )
159+ coEvery { remoteToolsHelper.getAvailableRemoteTools(" env-1" , " RR" ) } returns listOf (
160+ " RR-241.1.3" ,
161+ " RR-242.1"
162+ )
163+ coEvery { remoteToolsHelper.getInstalledRemoteTools(" env-1" , " RR" ) } returns listOf (
164+ " RR-241.1.2" ,
165+ " RR-252.1"
166+ )
160167
161- assertEquals(" RR-200.1 " , handler.resolveIdeIdentifier(" env-1" , " RR" , " 200 .1" ))
168+ assertEquals(" 241.1.2 " , handler.resolveIdeIdentifier(" env-1" , " RR" , " 241 .1" ))
162169 }
170+
171+
163172}
0 commit comments