You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by iv...@apache.org on 2012/06/19 12:39:38 UTC
svn commit: r1351646 [3/3] - in /zookeeper/bookkeeper/trunk: ./
bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/
bookkeeper-server/src/main/java/org/apache/bookkeeper/client/
bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ book...
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerDeleteTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerDeleteTest.java?rev=1351646&r1=1351645&r2=1351646&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerDeleteTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerDeleteTest.java Tue Jun 19 10:39:37 2012
@@ -25,7 +25,6 @@ import java.io.File;
import org.apache.bookkeeper.client.LedgerHandle;
import org.apache.bookkeeper.client.BookKeeper.DigestType;
-import org.apache.bookkeeper.proto.BookieServer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.junit.Before;
@@ -35,13 +34,17 @@ import org.junit.Test;
* This class tests the ledger delete functionality both from the BookKeeper
* client and the server side.
*/
-public class LedgerDeleteTest extends BookKeeperClusterTestCase {
+public class LedgerDeleteTest extends MultiLedgerManagerTestCase {
static Logger LOG = LoggerFactory.getLogger(LedgerDeleteTest.class);
DigestType digestType;
- public LedgerDeleteTest() {
+ public LedgerDeleteTest(String ledgerManagerFactory) {
super(3);
+ LOG.info("Running test case using ledger manager : " + ledgerManagerFactory);
this.digestType = DigestType.CRC32;
+ // set ledger manager name
+ baseConf.setLedgerManagerFactoryClassName(ledgerManagerFactory);
+ baseClientConf.setLedgerManagerFactoryClassName(ledgerManagerFactory);
}
@Before
Copied: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/MultiLedgerManagerMultiDigestTestCase.java (from r1351374, zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/LedgerManagerTestCase.java)
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/MultiLedgerManagerMultiDigestTestCase.java?p2=zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/MultiLedgerManagerMultiDigestTestCase.java&p1=zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/LedgerManagerTestCase.java&r1=1351374&r2=1351646&rev=1351646&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/LedgerManagerTestCase.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/MultiLedgerManagerMultiDigestTestCase.java Tue Jun 19 10:39:37 2012
@@ -19,59 +19,45 @@
*
*/
-package org.apache.bookkeeper.meta;
+package org.apache.bookkeeper.test;
-import java.util.Arrays;
+import java.util.ArrayList;
import java.util.Collection;
-import org.apache.bookkeeper.conf.ServerConfiguration;
-import org.apache.bookkeeper.test.BookKeeperClusterTestCase;
+import org.apache.bookkeeper.client.BookKeeper.DigestType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.junit.After;
-import org.junit.Before;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-import junit.framework.TestCase;
-
/**
- * Test case to run over serveral ledger managers
+ * Running test case using different ledger managers.
*/
@RunWith(Parameterized.class)
-public abstract class LedgerManagerTestCase extends BookKeeperClusterTestCase {
- static final Logger LOG = LoggerFactory.getLogger(LedgerManagerTestCase.class);
-
- LedgerManager ledgerManager;
+public abstract class MultiLedgerManagerMultiDigestTestCase extends BookKeeperClusterTestCase {
+ static final Logger LOG = LoggerFactory.getLogger(MultiLedgerManagerMultiDigestTestCase.class);
- public LedgerManagerTestCase(String ledgerManagerType) {
- super(0);
- baseConf.setLedgerManagerType(ledgerManagerType);
+ public MultiLedgerManagerMultiDigestTestCase(int numBookies) {
+ super(numBookies);
}
@Parameters
public static Collection<Object[]> configs() {
- return Arrays.asList(new Object[][] {
- { FlatLedgerManager.NAME },
- { HierarchicalLedgerManager.NAME }
- });
- }
-
- @Before
- @Override
- public void setUp() throws Exception {
- super.setUp();
- ledgerManager = LedgerManagerFactory.newLedgerManager(baseConf, zkc);
- }
-
- @After
- @Override
- public void tearDown() throws Exception {
- ledgerManager.close();
- super.tearDown();
+ String[] ledgerManagers = {
+ "org.apache.bookkeeper.meta.FlatLedgerManagerFactory",
+ "org.apache.bookkeeper.meta.HierarchicalLedgerManagerFactory",
+ };
+ ArrayList<Object[]> cfgs = new ArrayList<Object[]>(ledgerManagers.length);
+ DigestType[] digestTypes = new DigestType[] { DigestType.MAC, DigestType.CRC32 };
+ for (String lm : ledgerManagers) {
+ for (DigestType type : digestTypes) {
+ cfgs.add(new Object[] { lm, type });
+ }
+ }
+ return cfgs;
}
}
Added: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/MultiLedgerManagerTestCase.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/MultiLedgerManagerTestCase.java?rev=1351646&view=auto
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/MultiLedgerManagerTestCase.java (added)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/MultiLedgerManagerTestCase.java Tue Jun 19 10:39:37 2012
@@ -0,0 +1,55 @@
+package org.apache.bookkeeper.test;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+/*
+ *
+ * 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.
+ *
+ */
+
+import org.apache.bookkeeper.meta.LedgerManagerFactory;
+
+/**
+ * Test Case run over different ledger manager.
+ */
+@RunWith(Parameterized.class)
+public abstract class MultiLedgerManagerTestCase extends BookKeeperClusterTestCase {
+
+ public MultiLedgerManagerTestCase(int numBookies) {
+ super(numBookies);
+ }
+
+ @Parameters
+ public static Collection<Object[]> configs() {
+ String[] ledgerManagers = new String[] {
+ "org.apache.bookkeeper.meta.FlatLedgerManagerFactory",
+ "org.apache.bookkeeper.meta.HierarchicalLedgerManagerFactory",
+ };
+ ArrayList<Object[]> cfgs = new ArrayList<Object[]>(ledgerManagers.length);
+ for (String lm : ledgerManagers) {
+ cfgs.add(new Object[] { lm });
+ }
+ return cfgs;
+ }
+}