chibenwa commented on code in PR #1699:
URL: https://github.com/apache/james-project/pull/1699#discussion_r1303974706
##########
server/data/data-jmap/src/test/java/org/apache/james/jmap/api/upload/UploadUsageRepositoryContract.scala:
##########
@@ -0,0 +1,48 @@
+package org.apache.james.jmap.api.upload
+
+import org.apache.james.core.Username
+import org.apache.james.core.quota.QuotaSizeUsage
+import org.apache.james.jmap.api.upload.UploadUsageRepositoryContract.USER_NAME
+import org.assertj.core.api.Assertions
+import org.junit.jupiter.api.Test
+import reactor.core.scala.publisher.SMono
+
+object UploadUsageRepositoryContract {
+ val USER_NAME = Username.of("[email protected]")
+}
+
+trait UploadUsageRepositoryContract {
+ def uploadUsageRepository: UploadUsageRepository
+
+ @Test
+ def increaseSpaceShouldIncreaseSuccessfully(): Unit = {
+
Assertions.assertThat(SMono.fromPublisher(uploadUsageRepository.getSpaceUsage(USER_NAME)).block().asLong()).isEqualTo(0);
+ SMono.fromPublisher(uploadUsageRepository.increaseSpace(USER_NAME,
QuotaSizeUsage.size(100))).block();
+ val expected =
SMono.fromPublisher(uploadUsageRepository.getSpaceUsage(USER_NAME)).block();
+ Assertions.assertThat(expected.asLong()).isEqualTo(100);
Review Comment:
One assertion per test.
If you put several assertions in one test that is a good sign you need 2
tests
##########
server/data/data-jmap/src/test/java/org/apache/james/jmap/memory/upload/InMemoryUploadUsageRepositoryTest.java:
##########
@@ -0,0 +1,55 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you 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.apache.james.jmap.memory.upload;
+
+import static
org.apache.james.jmap.api.upload.UploadUsageRepositoryContract.USER_NAME;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.apache.james.core.quota.QuotaSizeUsage;
+import org.apache.james.jmap.api.upload.UploadUsageRepository;
+import org.apache.james.jmap.api.upload.UploadUsageRepositoryContract;
+import org.junit.jupiter.api.BeforeEach;
+
+import reactor.core.publisher.Mono;
+
+public class InMemoryUploadUsageRepositoryTest implements
UploadUsageRepositoryContract {
+
+ private InMemoryUploadUsageRepository inMemoryUploadUsageRepository;
+
+ @BeforeEach
+ private void setup() {
+ inMemoryUploadUsageRepository = new InMemoryUploadUsageRepository();
+ resetCounterToZero();
+ }
+
+ private void resetCounterToZero() {
+ Mono.from(inMemoryUploadUsageRepository.increaseSpace(USER_NAME(),
QuotaSizeUsage.size(0))).block();
+ QuotaSizeUsage quotaSizeUsage =
Mono.from(inMemoryUploadUsageRepository.getSpaceUsage(USER_NAME())).block();
+ Mono.from(inMemoryUploadUsageRepository.decreaseSpace(USER_NAME(),
quotaSizeUsage)).block();
+ QuotaSizeUsage actual =
Mono.from(inMemoryUploadUsageRepository.getSpaceUsage(USER_NAME())).block();
+ assertThat(actual.asLong()).isEqualTo(0l);
+ }
Review Comment:
Not needed?
##########
server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/upload/CassandraUploadUsageRepositoryTest.java:
##########
@@ -0,0 +1,62 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you 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.apache.james.jmap.cassandra.upload;
+
+import static
org.apache.james.jmap.api.upload.UploadUsageRepositoryContract.USER_NAME;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.apache.james.backends.cassandra.CassandraClusterExtension;
+import org.apache.james.backends.cassandra.components.CassandraModule;
+import org.apache.james.core.quota.QuotaSizeUsage;
+import org.apache.james.jmap.api.upload.UploadUsageRepository;
+import org.apache.james.jmap.api.upload.UploadUsageRepositoryContract;
+import org.apache.james.mailbox.cassandra.modules.CassandraQuotaModule;
+import org.apache.james.mailbox.cassandra.quota.CassandraQuotaCurrentValueDao;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import reactor.core.publisher.Mono;
+
+public class CassandraUploadUsageRepositoryTest implements
UploadUsageRepositoryContract {
+
+ @RegisterExtension
+ static CassandraClusterExtension cassandraCluster = new
CassandraClusterExtension(CassandraModule.aggregateModules(CassandraQuotaModule.MODULE));
+
+ private CassandraUploadUsageRepository cassandraUploadUsageRepository;
+
+ @BeforeEach
+ private void setup() {
+ cassandraUploadUsageRepository = new
CassandraUploadUsageRepository(new
CassandraQuotaCurrentValueDao(cassandraCluster.getCassandraCluster().getConf()));
+ resetCounterToZero();
+ }
+
+ private void resetCounterToZero() {
+ Mono.from(cassandraUploadUsageRepository.increaseSpace(USER_NAME(),
QuotaSizeUsage.size(0))).block();
+ QuotaSizeUsage quotaSizeUsage =
Mono.from(cassandraUploadUsageRepository.getSpaceUsage(USER_NAME())).block();
+ Mono.from(cassandraUploadUsageRepository.decreaseSpace(USER_NAME(),
quotaSizeUsage)).block();
+ QuotaSizeUsage actual =
Mono.from(cassandraUploadUsageRepository.getSpaceUsage(USER_NAME())).block();
+ assertThat(actual.asLong()).isEqualTo(0l);
+ }
Review Comment:
Not needed
##########
server/data/data-jmap/src/test/java/org/apache/james/jmap/api/upload/UploadUsageRepositoryContract.scala:
##########
@@ -0,0 +1,48 @@
+package org.apache.james.jmap.api.upload
+
+import org.apache.james.core.Username
+import org.apache.james.core.quota.QuotaSizeUsage
+import org.apache.james.jmap.api.upload.UploadUsageRepositoryContract.USER_NAME
+import org.assertj.core.api.Assertions
+import org.junit.jupiter.api.Test
+import reactor.core.scala.publisher.SMono
+
+object UploadUsageRepositoryContract {
+ val USER_NAME = Username.of("[email protected]")
+}
+
+trait UploadUsageRepositoryContract {
+ def uploadUsageRepository: UploadUsageRepository
+
+ @Test
+ def increaseSpaceShouldIncreaseSuccessfully(): Unit = {
+
Assertions.assertThat(SMono.fromPublisher(uploadUsageRepository.getSpaceUsage(USER_NAME)).block().asLong()).isEqualTo(0);
Review Comment:
static import for assertThat
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
