You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ad...@apache.org on 2017/07/07 08:24:16 UTC
[02/21] james-project git commit: MPT-39 finally remove this crazy
static injection with onami
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectMockObjectTestCase.java
----------------------------------------------------------------------
diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectMockObjectTestCase.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectMockObjectTestCase.java
deleted file mode 100644
index 46956a6..0000000
--- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectMockObjectTestCase.java
+++ /dev/null
@@ -1,92 +0,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. *
- ****************************************************************/
-
-package org.apache.james.mpt.onami.test;
-
-import javax.inject.Inject;
-
-import org.apache.james.mpt.onami.test.annotation.GuiceModules;
-import org.apache.james.mpt.onami.test.annotation.Mock;
-import org.apache.james.mpt.onami.test.data.HelloWorld;
-import org.apache.james.mpt.onami.test.data.SimpleModule;
-import org.apache.james.mpt.onami.test.data.TelephonService;
-import org.easymock.EasyMock;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import com.google.inject.Injector;
-
-@RunWith(OnamiRunner.class)
-@GuiceModules(SimpleModule.class)
-public class InjectMockObjectTestCase extends AbstractMockTestCase {
-
- // Create and inject a simple EasyMock Strict mock
- @Mock
- private TelephonService telephonServiceMock;
-
- @Inject
- Injector injector;
-
- @Inject
- private HelloWorld helloWorld;
-
- @Test
- public void testMock() {
- EasyMock.expect(providedMock.go()).andReturn("Ciao");
- EasyMock.replay(providedMock);
-
- Assert.assertNotNull(this.providedMock);
- Assert.assertEquals("Ciao", helloWorld.sayHalloByService());
- EasyMock.verify(providedMock);
- }
-
- @Test
- public void testMock2() {
- EasyMock.expect(providedMock.go()).andReturn("Ciao");
- EasyMock.replay(providedMock);
-
- Assert.assertNotNull(this.providedMock);
- Assert.assertEquals("Ciao", helloWorld.sayHalloByService());
- EasyMock.verify(providedMock);
- }
-
- @Test
- public void testStrickMock() {
- EasyMock.expect(telephonServiceMock.getTelephonNumber()).andReturn("1234567890");
- providedMock.call("1234567890");
- EasyMock.expectLastCall().once();
- EasyMock.replay(telephonServiceMock);
- EasyMock.replay(providedMock);
-
- helloWorld.callHelloWorldTelephon();
-
- EasyMock.verify(telephonServiceMock);
- EasyMock.verify(providedMock);
-
- // reset manually the mock object. Flag resettable is false!!!
- EasyMock.reset(telephonServiceMock);
- }
-
- @Test
- public void testStrickMock2() {
- Assert.assertNotNull(telephonServiceMock);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectModuleClassTestCase.java
----------------------------------------------------------------------
diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectModuleClassTestCase.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectModuleClassTestCase.java
deleted file mode 100644
index 9fc92bb..0000000
--- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectModuleClassTestCase.java
+++ /dev/null
@@ -1,50 +0,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. *
- ****************************************************************/
-
-package org.apache.james.mpt.onami.test;
-
-import javax.inject.Inject;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.name.Named;
-import com.google.inject.name.Names;
-
-@RunWith(OnamiRunner.class)
-public class InjectModuleClassTestCase extends AbstractModule {
-
- @Override
- public void configure() {
- bind(Integer.class).annotatedWith(Names.named("numeber.version")).toInstance(10);
- }
-
- @Inject
- @Named("numeber.version")
- private Integer version;
-
- @Test
- public void testInjectModuleClass() {
- Assert.assertNotNull(version);
- Assert.assertEquals(10, version.intValue());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectStaticSimpleTestCase.java
----------------------------------------------------------------------
diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectStaticSimpleTestCase.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectStaticSimpleTestCase.java
deleted file mode 100644
index 1541581..0000000
--- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectStaticSimpleTestCase.java
+++ /dev/null
@@ -1,67 +0,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. *
- ****************************************************************/
-
-package org.apache.james.mpt.onami.test;
-
-
-import javax.inject.Inject;
-
-import org.apache.james.mpt.onami.test.annotation.GuiceModules;
-import org.apache.james.mpt.onami.test.annotation.GuiceProvidedModules;
-import org.apache.james.mpt.onami.test.data.ComplexModule;
-import org.apache.james.mpt.onami.test.data.HelloWorld;
-import org.apache.james.mpt.onami.test.data.SimpleModule;
-import org.apache.james.mpt.onami.test.data.WhoIm;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import com.google.inject.Module;
-
-@RunWith(OnamiRunner.class)
-@GuiceModules(SimpleModule.class)
-public class InjectStaticSimpleTestCase {
-
- /*
- * Any static filed will be injecteded once before creation of SimpleTest Class
- */
- @Inject
- public static HelloWorld helloWorld;
-
- @Inject
- public static WhoIm whoIm;
-
- @GuiceProvidedModules
- public static Module createComplexModule() {
- return new ComplexModule("Marco Speranza");
- }
-
- @Test
- public void testHelloWorld() {
- Assert.assertNotNull(helloWorld);
- Assert.assertEquals("Hello World!!!!", helloWorld.sayHallo());
- }
-
- @Test
- public void testWhoIm() {
- Assert.assertNotNull(whoIm);
- Assert.assertEquals("Marco Speranza", whoIm.sayWhoIm());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/MockTypeTestCase.java
----------------------------------------------------------------------
diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/MockTypeTestCase.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/MockTypeTestCase.java
deleted file mode 100644
index 262bb02..0000000
--- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/MockTypeTestCase.java
+++ /dev/null
@@ -1,41 +0,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. *
- ****************************************************************/
-
-package org.apache.james.mpt.onami.test;
-
-import org.apache.james.mpt.onami.test.annotation.Mock;
-import org.apache.james.mpt.onami.test.annotation.MockObjType;
-import org.apache.james.mpt.onami.test.data.Service;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-
-@RunWith(OnamiRunner.class)
-public class MockTypeTestCase {
-
- @Mock(type = MockObjType.EASY_MOCK_STRICT)
- Service service;
-
- @Test
- public void test() {
- Assert.assertNotNull(service);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/MockitoFrameworkTestCase.java
----------------------------------------------------------------------
diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/MockitoFrameworkTestCase.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/MockitoFrameworkTestCase.java
deleted file mode 100644
index 0e42713..0000000
--- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/MockitoFrameworkTestCase.java
+++ /dev/null
@@ -1,56 +0,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. *
- ****************************************************************/
-
-package org.apache.james.mpt.onami.test;
-
-import javax.inject.Inject;
-
-import org.apache.james.mpt.onami.test.annotation.Mock;
-import org.apache.james.mpt.onami.test.data.HelloWorld;
-import org.apache.james.mpt.onami.test.data.TelephonService;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(OnamiRunner.class)
-public class MockitoFrameworkTestCase extends AbstractMockitoTestCase {
-
- /*
- * Any NON-static filed will be injected before run each tests.
- */
- @Inject
- private HelloWorld helloWorldNotStatic;
-
- @Mock
- private TelephonService service;
-
- @BeforeClass
- public static void setUpClass() {
- }
-
- @Test
- public void testInjectNotStatic() {
- Assert.assertNotNull(helloWorldNotStatic);
- Assert.assertEquals("Hello World!!!!", helloWorldNotStatic.sayHallo());
- Assert.assertNotNull(service);
- Assert.assertNotNull(providedMock);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/OnamiSuiteTest.java
----------------------------------------------------------------------
diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/OnamiSuiteTest.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/OnamiSuiteTest.java
deleted file mode 100644
index 9f7cfd1..0000000
--- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/OnamiSuiteTest.java
+++ /dev/null
@@ -1,29 +0,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. *
- ****************************************************************/
-
-package org.apache.james.mpt.onami.test;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
-
-@RunWith(OnamiSuite.class)
-@SuiteClasses({InjectDependingMockObjectTestCase.class, InjectFromSuperClassTestCase.class})
-public class OnamiSuiteTest {
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/ServiceMockProviderTest.java
----------------------------------------------------------------------
diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/ServiceMockProviderTest.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/ServiceMockProviderTest.java
deleted file mode 100644
index d076d36..0000000
--- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/ServiceMockProviderTest.java
+++ /dev/null
@@ -1,41 +0,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. *
- ****************************************************************/
-
-package org.apache.james.mpt.onami.test;
-
-import org.apache.james.mpt.onami.test.annotation.Mock;
-import org.apache.james.mpt.onami.test.data.Service;
-import org.apache.james.mpt.onami.test.data.ServiceMockProvider;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-
-@RunWith(OnamiRunner.class)
-public class ServiceMockProviderTest {
-
- @Mock(providedBy = "providerMethod", providerClass = ServiceMockProvider.class)
- private Service service;
-
- @Test
- public void test() {
- Assert.assertNotNull(service);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/SimpleTest.java
----------------------------------------------------------------------
diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/SimpleTest.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/SimpleTest.java
deleted file mode 100644
index 2a341d6..0000000
--- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/SimpleTest.java
+++ /dev/null
@@ -1,53 +0,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. *
- ****************************************************************/
-
-package org.apache.james.mpt.onami.test;
-
-
-import javax.inject.Inject;
-
-import org.apache.james.mpt.onami.test.annotation.GuiceModules;
-import org.apache.james.mpt.onami.test.data.HelloWorld;
-import org.apache.james.mpt.onami.test.data.SimpleModule;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(OnamiRunner.class)
-@GuiceModules(SimpleModule.class)
-public class SimpleTest {
-
- /*
- * Any NON-static filed will be injecteded before run each tests.
- */
- @Inject
- private HelloWorld helloWorldNotStatic;
-
- @BeforeClass
- public static void setUpClass() {
- }
-
- @Test
- public void testInjectNotStatic() {
- Assert.assertNotNull(helloWorldNotStatic);
- Assert.assertEquals("Hello World!!!!", helloWorldNotStatic.sayHallo());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ComplexModule.java
----------------------------------------------------------------------
diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ComplexModule.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ComplexModule.java
deleted file mode 100644
index 3632a1d..0000000
--- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ComplexModule.java
+++ /dev/null
@@ -1,37 +0,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. *
- ****************************************************************/
-
-package org.apache.james.mpt.onami.test.data;
-
-import com.google.inject.AbstractModule;
-
-public class ComplexModule extends AbstractModule {
-
- private final String name;
-
- public ComplexModule(String name) {
- this.name = name;
- }
-
- @Override
- protected void configure() {
- bind(WhoIm.class).toInstance(new WhoIm(name));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/HelloWordAnnotated.java
----------------------------------------------------------------------
diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/HelloWordAnnotated.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/HelloWordAnnotated.java
deleted file mode 100644
index f011333..0000000
--- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/HelloWordAnnotated.java
+++ /dev/null
@@ -1,44 +0,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. *
- ****************************************************************/
-
-package org.apache.james.mpt.onami.test.data;
-
-import javax.inject.Inject;
-
-import com.google.inject.name.Named;
-
-public class HelloWordAnnotated {
-
- @Inject
- @TestAnnotation
- Service service;
-
- @Inject
- @Named("test.named")
- Service named;
-
- public String go() {
- return service.go();
- }
-
- public String getNamed() {
- return named.go();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/HelloWorld.java
----------------------------------------------------------------------
diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/HelloWorld.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/HelloWorld.java
deleted file mode 100644
index c81001c..0000000
--- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/HelloWorld.java
+++ /dev/null
@@ -1,59 +0,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. *
- ****************************************************************/
-
-package org.apache.james.mpt.onami.test.data;
-
-import java.util.List;
-
-import javax.inject.Singleton;
-
-import com.google.inject.Inject;
-
-@Singleton
-public class HelloWorld {
-
- @Inject(optional = true)
- private Service service;
-
- @Inject(optional = true)
- private TelephonService telephon;
-
- @Inject(optional = true)
- private List<Service> services;
-
- public String sayHallo() {
- return "Hello World!!!!";
- }
-
- public String sayHalloByService() {
- return service.go();
- }
-
- public void callHelloWorldTelephon() {
- String number = telephon.getTelephonNumber();
- service.call(number);
- }
-
- public void sayHalloByServiceLists() {
- for (Service service : services) {
- service.go();
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/Service.java
----------------------------------------------------------------------
diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/Service.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/Service.java
deleted file mode 100644
index 5f0f6c3..0000000
--- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/Service.java
+++ /dev/null
@@ -1,28 +0,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. *
- ****************************************************************/
-
-package org.apache.james.mpt.onami.test.data;
-
-public interface Service {
-
- String go();
-
- void call(String value);
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceImpl.java
----------------------------------------------------------------------
diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceImpl.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceImpl.java
deleted file mode 100644
index bc891d6..0000000
--- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceImpl.java
+++ /dev/null
@@ -1,32 +0,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. *
- ****************************************************************/
-
-package org.apache.james.mpt.onami.test.data;
-
-public class ServiceImpl implements Service {
-
- public void call(String value) {
- // do nothing
- }
-
- public String go() {
- return "It's real class";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceMockProvider.java
----------------------------------------------------------------------
diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceMockProvider.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceMockProvider.java
deleted file mode 100644
index 3592d42..0000000
--- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceMockProvider.java
+++ /dev/null
@@ -1,31 +0,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. *
- ****************************************************************/
-
-package org.apache.james.mpt.onami.test.data;
-
-import org.easymock.EasyMock;
-
-public class ServiceMockProvider {
-
- public static Service providerMethod() {
- Service mockedService = EasyMock.createNiceMock(Service.class);
- return mockedService;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceModule.java
----------------------------------------------------------------------
diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceModule.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceModule.java
deleted file mode 100644
index 8fa7fa6..0000000
--- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceModule.java
+++ /dev/null
@@ -1,32 +0,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. *
- ****************************************************************/
-
-package org.apache.james.mpt.onami.test.data;
-
-import com.google.inject.AbstractModule;
-
-public class ServiceModule extends AbstractModule {
-
- @Override
- protected void configure() {
- bind(Service.class).to(ServiceImpl.class).asEagerSingleton();
- bind(TelephonService.class).to(TelephonServiceImpl.class).asEagerSingleton();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/SimpleModule.java
----------------------------------------------------------------------
diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/SimpleModule.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/SimpleModule.java
deleted file mode 100644
index 7c3a084..0000000
--- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/SimpleModule.java
+++ /dev/null
@@ -1,31 +0,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. *
- ****************************************************************/
-
-package org.apache.james.mpt.onami.test.data;
-
-import com.google.inject.AbstractModule;
-
-public class SimpleModule extends AbstractModule {
-
- @Override
- protected void configure() {
- bind(HelloWorld.class);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TelephonService.java
----------------------------------------------------------------------
diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TelephonService.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TelephonService.java
deleted file mode 100644
index 1699f03..0000000
--- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TelephonService.java
+++ /dev/null
@@ -1,26 +0,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. *
- ****************************************************************/
-
-package org.apache.james.mpt.onami.test.data;
-
-public interface TelephonService {
-
- String getTelephonNumber();
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TelephonServiceImpl.java
----------------------------------------------------------------------
diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TelephonServiceImpl.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TelephonServiceImpl.java
deleted file mode 100644
index 54b1044..0000000
--- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TelephonServiceImpl.java
+++ /dev/null
@@ -1,29 +0,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. *
- ****************************************************************/
-
-package org.apache.james.mpt.onami.test.data;
-
-public class TelephonServiceImpl
- implements TelephonService {
-
- public String getTelephonNumber() {
- return "It's real class";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TestAnnotation.java
----------------------------------------------------------------------
diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TestAnnotation.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TestAnnotation.java
deleted file mode 100644
index 2303176..0000000
--- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TestAnnotation.java
+++ /dev/null
@@ -1,31 +0,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. *
- ****************************************************************/
-
-package org.apache.james.mpt.onami.test.data;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import javax.inject.Qualifier;
-
-@Qualifier
-@Retention(RetentionPolicy.RUNTIME)
-public @interface TestAnnotation {
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TestAnnotation2.java
----------------------------------------------------------------------
diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TestAnnotation2.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TestAnnotation2.java
deleted file mode 100644
index 6b6be9b..0000000
--- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TestAnnotation2.java
+++ /dev/null
@@ -1,31 +0,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. *
- ****************************************************************/
-
-package org.apache.james.mpt.onami.test.data;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import javax.inject.Qualifier;
-
-@Qualifier
-@Retention(RetentionPolicy.RUNTIME)
-public @interface TestAnnotation2 {
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/WhoIm.java
----------------------------------------------------------------------
diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/WhoIm.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/WhoIm.java
deleted file mode 100644
index cb6bc11..0000000
--- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/WhoIm.java
+++ /dev/null
@@ -1,34 +0,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. *
- ****************************************************************/
-
-package org.apache.james.mpt.onami.test.data;
-
-public class WhoIm {
-
- private final String name;
-
- public WhoIm(String name) {
- this.name = name;
- }
-
- public String sayWhoIm() {
- return name;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/guice/MockAnnotatedWithTestCase.java
----------------------------------------------------------------------
diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/guice/MockAnnotatedWithTestCase.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/guice/MockAnnotatedWithTestCase.java
deleted file mode 100644
index a0b4e29..0000000
--- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/guice/MockAnnotatedWithTestCase.java
+++ /dev/null
@@ -1,73 +0,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. *
- ****************************************************************/
-
-package org.apache.james.mpt.onami.test.guice;
-
-import javax.inject.Inject;
-
-import org.apache.james.mpt.onami.test.OnamiRunner;
-import org.apache.james.mpt.onami.test.annotation.Mock;
-import org.apache.james.mpt.onami.test.data.HelloWordAnnotated;
-import org.apache.james.mpt.onami.test.data.Service;
-import org.apache.james.mpt.onami.test.data.TestAnnotation;
-import org.easymock.EasyMock;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(OnamiRunner.class)
-public class MockAnnotatedWithTestCase {
-
- @Mock(annotatedWith = TestAnnotation.class)
- private Service service2;
-
- @Mock
- private Service service;
-
- @Mock(namedWith = "test.named")
- private Service serviceNamed;
-
- @Inject
- private HelloWordAnnotated seviceImplAnnotated;
-
- @Test
- public void test()
- throws Exception {
- Assert.assertNotNull(service2);
- Assert.assertNotNull(service);
- Assert.assertNotNull(serviceNamed);
- }
-
- @Test
- public void test3()
- throws Exception {
- Assert.assertNotNull(service2);
- Assert.assertNotNull(serviceNamed);
-
- EasyMock.expect(service2.go()).andReturn("Mocked injected class annotated").anyTimes();
- EasyMock.expect(serviceNamed.go()).andReturn("Mocked injected class named").anyTimes();
- EasyMock.replay(service2, serviceNamed);
-
- Assert.assertEquals("Mocked injected class annotated", service2.go());
- Assert.assertEquals("Mocked injected class annotated", seviceImplAnnotated.go());
- Assert.assertEquals("Mocked injected class named", seviceImplAnnotated.getNamed());
- EasyMock.verify(service2);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/guice/TestCustomInjectionTest.java
----------------------------------------------------------------------
diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/guice/TestCustomInjectionTest.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/guice/TestCustomInjectionTest.java
deleted file mode 100644
index d3e0e02..0000000
--- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/guice/TestCustomInjectionTest.java
+++ /dev/null
@@ -1,78 +0,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. *
- ****************************************************************/
-
-package org.apache.james.mpt.onami.test.guice;
-
-import javax.inject.Inject;
-
-import org.apache.james.mpt.onami.test.OnamiRunner;
-import org.apache.james.mpt.onami.test.annotation.GuiceModules;
-import org.apache.james.mpt.onami.test.annotation.Mock;
-import org.apache.james.mpt.onami.test.data.HelloWorld;
-import org.apache.james.mpt.onami.test.data.Service;
-import org.apache.james.mpt.onami.test.data.ServiceModule;
-import org.apache.james.mpt.onami.test.data.TelephonService;
-import org.easymock.EasyMock;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(OnamiRunner.class)
-@GuiceModules(ServiceModule.class)
-public class TestCustomInjectionTest {
-
- @Mock
- private static Service service;
-
- @Inject
- private TelephonService telephonService;
-
- @Inject
- private HelloWorld helloWorld;
-
- @BeforeClass
- public static void setUp() {
- Assert.assertNotNull(service);
- // service.go();
- }
-
- @Test
- public void test()
- throws Exception {
- Assert.assertNotNull(service);
- Assert.assertNotNull(telephonService);
- Assert.assertNotNull(helloWorld);
- }
-
- @Test
- public void testOverideModule()
- throws Exception {
- Assert.assertNotNull(service);
- Assert.assertNotNull(telephonService);
- Assert.assertEquals("It's real class", telephonService.getTelephonNumber());
-
- EasyMock.expect(service.go()).andReturn("Mocked injected class");
- EasyMock.replay(service);
-
- Assert.assertEquals("Mocked injected class", helloWorld.sayHalloByService());
- EasyMock.verify(service);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/onami-test/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/mpt/onami-test/src/test/resources/log4j.properties b/mpt/onami-test/src/test/resources/log4j.properties
deleted file mode 100644
index 3836f2c..0000000
--- a/mpt/onami-test/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,46 +0,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.
-#
-
-# Set root category priority to INFO and its only appender to CONSOLE.
-#log4j.rootCategory=DEBUG, CONSOLE
-
-# Set the enterprise logger category to FATAL and its only appender to CONSOLE.
-#log4j.logger.org.apache.onami=CONSOLE
-
-# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
-#log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-#log4j.appender.CONSOLE.Threshold=DEBUG
-#log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-#log4j.appender.CONSOLE.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
-
-
-
-# Specify the handlers to create in the root logger
-# (all loggers are children of the root logger)
-# The following creates two handlers
-handlers = java.util.logging.ConsoleHandler
-
-# Set the default logging level for the root logger
-.level = ALL
-
-# Set the default logging level for new ConsoleHandler instances
-java.util.logging.ConsoleHandler.level = ALL
-
-# Set the default formatter for new ConsoleHandler instances
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
http://git-wip-us.apache.org/repos/asf/james-project/blob/78cf06ab/mpt/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/pom.xml b/mpt/pom.xml
index 5562035..65607ed 100644
--- a/mpt/pom.xml
+++ b/mpt/pom.xml
@@ -44,7 +44,6 @@
<module>impl/managesieve</module>
<module>impl/smtp</module>
<module>mavenplugin</module>
- <module>onami-test</module>
</modules>
<issueManagement>
@@ -117,11 +116,6 @@
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-mpt-onami-test</artifactId>
- <version>${project.version}</version>
- </dependency>
<!-- Other Apache James sub projects -->
<dependency>
<groupId>org.apache.james</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org