Skip to content

Commit 28e1862

Browse files
Revert the test:
- It requires an active supervisor in testkit: ECR-3873 - It requires the supervisor proto-definitions (which are not currently included in exonum-proto-sources)
1 parent 015d820 commit 28e1862

File tree

4 files changed

+1
-138
lines changed

4 files changed

+1
-138
lines changed

exonum-java-binding/qa-service/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@
172172
<execution>
173173
<goals>
174174
<goal>compile</goal>
175-
<goal>test-compile</goal>
176175
</goals>
177176
<configuration>
178177
<protocArtifact>

exonum-java-binding/qa-service/src/test/java/com/exonum/binding/qaservice/QaServiceImplTest.java

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import static org.assertj.core.api.Assertions.assertThat;
3939
import static org.junit.jupiter.api.Assertions.assertThrows;
4040

41-
import com.exonum.binding.common.blockchain.ExecutionStatuses;
4241
import com.exonum.binding.common.crypto.KeyPair;
4342
import com.exonum.binding.common.crypto.PublicKey;
4443
import com.exonum.binding.common.hash.HashCode;
@@ -47,16 +46,12 @@
4746
import com.exonum.binding.core.storage.database.Snapshot;
4847
import com.exonum.binding.core.storage.indices.MapIndex;
4948
import com.exonum.binding.qaservice.Config.InitialConfiguration;
50-
import com.exonum.binding.qaservice.Service.ConfigChange;
51-
import com.exonum.binding.qaservice.Service.ConfigPropose;
52-
import com.exonum.binding.qaservice.Service.ServiceConfig;
5349
import com.exonum.binding.testkit.EmulatedNode;
5450
import com.exonum.binding.testkit.FakeTimeProvider;
5551
import com.exonum.binding.testkit.TestKit;
5652
import com.exonum.binding.testkit.TestKitExtension;
5753
import com.exonum.binding.testkit.TimeProvider;
5854
import com.exonum.core.messages.Blockchain.Config;
59-
import com.exonum.core.messages.Runtime.ExecutionStatus;
6055
import com.google.common.collect.ImmutableMap;
6156
import com.google.gson.reflect.TypeToken;
6257
import io.vertx.core.MultiMap;
@@ -142,47 +137,6 @@ void initializeBadConfig() {
142137
assertThrows(RuntimeException.class, testKitBuilder::build);
143138
}
144139

145-
@Test
146-
void reconfigureService(TestKit testKit) {
147-
KeyPair serviceKeyPair = testKit.getEmulatedNode().getServiceKeyPair();
148-
// Determine the config application height
149-
long nextHeight = 1 + testKit.applySnapshot(s -> Blockchain.newInstance(s)
150-
.getHeight());
151-
152-
// Propose the config change
153-
String newTimeOracleName = "mars-time";
154-
ConfigPropose propose = ConfigPropose.newBuilder()
155-
.setActualFrom(nextHeight)
156-
.addChanges(ConfigChange.newBuilder()
157-
.setService(ServiceConfig.newBuilder()
158-
.setInstanceId(QA_SERVICE_ID)
159-
.setParams(InitialConfiguration.newBuilder()
160-
.setTimeOracleName(newTimeOracleName)
161-
.build()
162-
.toByteString())
163-
.build())
164-
.build())
165-
.build();
166-
TransactionMessage proposeTx = TransactionMessage.builder()
167-
// fixme: constants
168-
.serviceId(0)
169-
.transactionId(2)
170-
.payload(propose.toByteArray())
171-
.sign(serviceKeyPair);
172-
testKit.createBlockWithTransactions(proposeTx);
173-
174-
// Check the proposal status
175-
Snapshot s = testKit.getSnapshot();
176-
Optional<ExecutionStatus> proposalStatus = Blockchain.newInstance(s)
177-
.getTxResult(proposeTx.hash());
178-
assertThat(proposalStatus).hasValue(ExecutionStatuses.success());
179-
180-
// Check the application status
181-
QaSchema qaSchema = new QaSchema(s, QA_SERVICE_NAME);
182-
Optional<String> actualTimeOracle = qaSchema.timeOracleName().toOptional();
183-
assertThat(actualTimeOracle).hasValue(newTimeOracleName);
184-
}
185-
186140
@Test
187141
void afterCommit(TestKit testKit) {
188142
// Create a block so that the transaction, submitted in after commit handler,

exonum-java-binding/qa-service/src/test/proto/service.proto

Lines changed: 0 additions & 90 deletions
This file was deleted.

exonum-java-binding/testkit/src/main/java/com/exonum/binding/testkit/TestKit.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ private void checkTransaction(TransactionMessage transactionMessage) {
238238
// As transactions of time service might be submitted in TestKit that has this service
239239
// activated, those transactions should be considered valid, as time service is not
240240
// contained in Java runtime
241-
if (serviceId.equals(timeServiceId) || serviceId == 0 /* fixme */) {
241+
if (serviceId.equals(timeServiceId)) {
242242
return;
243243
}
244244
try {

0 commit comments

Comments
 (0)