Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
JAMES-1615 SieveMailet should use SieveRepository to retrieve user ac…
…tive Sieve script - contribued by Erwan Guyomarc'h git-svn-id: https://svn.apache.org/repos/asf/james/project/trunk@1720166 13f79535-47bb-0310-9956-ffa450edef68
- Loading branch information
Showing
8 changed files
with
137 additions
and
106 deletions.
There are no files selected for viewing
23 changes: 23 additions & 0 deletions
23
server/data/data-api/src/main/resources/sieverepository.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <?xml version="1.0"?> | ||
| <!-- | ||
| 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. | ||
| --> | ||
|
|
||
| <!-- See http://james.apache.org/server/3/config.html for usage --> | ||
| <sieverepository class="org.apache.james.sieverepository.file"> | ||
| </sieverepository> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
...let/mailets/src/test/java/org/apache/james/transport/mailets/ResourceLocatorImplTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /**************************************************************** | ||
| * 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.transport.mailets; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| import org.apache.james.sieverepository.api.SieveRepository; | ||
| import org.apache.james.sieverepository.api.exception.ScriptNotFoundException; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
|
|
||
| import java.io.ByteArrayInputStream; | ||
| import java.io.InputStream; | ||
|
|
||
| public class ResourceLocatorImplTest { | ||
|
|
||
| private SieveRepository sieveRepository; | ||
| private ResourceLocatorImpl resourceLocator; | ||
|
|
||
| @Before | ||
| public void setUp() { | ||
| sieveRepository = mock(SieveRepository.class); | ||
| resourceLocator = new ResourceLocatorImpl(true, sieveRepository); | ||
| } | ||
|
|
||
| @Test(expected = ScriptNotFoundException.class) | ||
| public void resourceLocatorImplShouldPropagateScriptNotFound() throws Exception { | ||
| when(sieveRepository.getActive("receiver@localhost")).thenThrow(new ScriptNotFoundException()); | ||
| resourceLocator.get("//receiver@localhost/sieve"); | ||
| } | ||
|
|
||
| @Test | ||
| public void resourceLocatorImplShouldWork() throws Exception { | ||
| InputStream inputStream = new ByteArrayInputStream(new byte[0]); | ||
| when(sieveRepository.getActive("receiver@localhost")).thenReturn(inputStream); | ||
| assertThat(resourceLocator.get("//receiver@localhost/sieve")).isEqualTo(inputStream); | ||
| } | ||
| } |
Oops, something went wrong.