Skip to content

Commit b60334a

Browse files
committed
Fix tests
1 parent edb4ef3 commit b60334a

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

src/test/kotlin/eu/openanalytics/shinyproxyoperator/helpers/ShinyProxyTestInstance.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class ShinyProxyTestInstance(private val namespace: String,
106106

107107
assertEquals(mapOf(
108108
LabelFactory.APP_LABEL to LabelFactory.APP_LABEL_VALUE,
109-
LabelFactory.REALM_ID_LABEL to sp.metadata.name
109+
LabelFactory.REALM_ID_LABEL to sp.realmId
110110
), ingress.metadata.labels)
111111

112112
assertOwnerReferenceIsCorrect(ingress, sp)
@@ -131,7 +131,7 @@ class ShinyProxyTestInstance(private val namespace: String,
131131

132132
assertEquals(mapOf(
133133
LabelFactory.APP_LABEL to LabelFactory.APP_LABEL_VALUE,
134-
LabelFactory.REALM_ID_LABEL to sp.metadata.name,
134+
LabelFactory.REALM_ID_LABEL to sp.realmId,
135135
LabelFactory.LATEST_INSTANCE_LABEL to sp.status.latestInstance()!!.hashOfSpec
136136
), service.metadata.labels)
137137

@@ -143,7 +143,7 @@ class ShinyProxyTestInstance(private val namespace: String,
143143
assertEquals(IntOrString(8080), service.spec.ports[0].targetPort)
144144
assertEquals(mapOf(
145145
LabelFactory.APP_LABEL to LabelFactory.APP_LABEL_VALUE,
146-
LabelFactory.REALM_ID_LABEL to sp.metadata.name,
146+
LabelFactory.REALM_ID_LABEL to sp.realmId,
147147
LabelFactory.INSTANCE_LABEL to sp.status.latestInstance()!!.hashOfSpec // TODO
148148
), service.spec.selector)
149149

@@ -223,7 +223,7 @@ class ShinyProxyTestInstance(private val namespace: String,
223223
fun assertLabelsAreCorrect(resource: HasMetadata, sp: ShinyProxy) {
224224
assertEquals(mapOf(
225225
LabelFactory.APP_LABEL to LabelFactory.APP_LABEL_VALUE,
226-
LabelFactory.REALM_ID_LABEL to sp.metadata.name,
226+
LabelFactory.REALM_ID_LABEL to sp.realmId,
227227
LabelFactory.INSTANCE_LABEL to hash
228228
), resource.metadata.labels)
229229
}

0 commit comments

Comments
 (0)