Skip to content

Commit

Permalink
uncomment and enable tests, roll back playtika version upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
agrgr committed Jul 22, 2024
1 parent 3af1c54 commit 20839ea
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 19 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<aerospike-reactor-client>8.1.2</aerospike-reactor-client>
<aerospike-proxy-client>8.1.2</aerospike-proxy-client>
<reactor-test>3.6.1</reactor-test>
<embedded-aerospike>3.1.7</embedded-aerospike>
<embedded-aerospike>3.1.6</embedded-aerospike>
<jodatime>2.12.7</jodatime>
<lombok>1.18.32</lombok>
<awaitility>4.2.1</awaitility>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/*
* Copyright 2019 the original author or authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*//*
/*
* Copyright 2019 the original author or authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.springframework.data.aerospike.core;

Expand Down Expand Up @@ -429,4 +429,3 @@ public void deleteAll_VersionsMismatch() {
}
}
}
*/
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import com.aerospike.client.Record;
import com.aerospike.client.policy.Policy;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.springframework.dao.ConcurrencyFailureException;
Expand Down Expand Up @@ -367,7 +366,6 @@ public void shouldSaveAllAndSetVersionWithSetName() {
}

@Test
@Disabled
public void shouldSaveAllVersionedDocumentsAndSetVersionAndThrowExceptionIfDuplicatesWithinOneBatch() {
// batch write operations are supported starting with Server version 6.0+
if (serverVersionSupport.isBatchWriteSupported()) {
Expand All @@ -389,7 +387,13 @@ public void shouldSaveAllVersionedDocumentsAndSetVersionAndThrowExceptionIfDupli

template.delete(first); // cleanup
template.delete(second); // cleanup
}
}

@Test
public void shouldSaveAllVersionedDocumentsIfDuplicatesNotWithinOneBatch() {
// batch write operations are supported starting with Server version 6.0+
if (serverVersionSupport.isBatchWriteSupported()) {
// The same versioned documents can be saved if they are not in the same batch.
// This way, the generation counts of the corresponding database records can be used
// to update the documents’ versions each time.
Expand Down

0 comments on commit 20839ea

Please sign in to comment.