accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [11/15] git commit: ACCUMULO-2723 Put test in correct location
Date Wed, 23 Apr 2014 15:05:44 GMT
ACCUMULO-2723 Put test in correct location

  Introduced by ACCUMULO-2631 bad merge


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/89d64c5b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/89d64c5b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/89d64c5b

Branch: refs/heads/master
Commit: 89d64c5bd0588e9dadfc076783d55aa000a12194
Parents: 9c049a2
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Wed Apr 23 10:54:27 2014 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Wed Apr 23 10:56:54 2014 -0400

----------------------------------------------------------------------
 .../monitor/servlets/trace/SummaryTest.java     | 42 ++++++++++++++++++++
 .../monitor/servlets/trace/SummaryTest.java     | 42 --------------------
 2 files changed, 42 insertions(+), 42 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/89d64c5b/server/monitor/src/test/java/org/apache/accumulo/monitor/servlets/trace/SummaryTest.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/test/java/org/apache/accumulo/monitor/servlets/trace/SummaryTest.java
b/server/monitor/src/test/java/org/apache/accumulo/monitor/servlets/trace/SummaryTest.java
new file mode 100644
index 0000000..23cdc0b
--- /dev/null
+++ b/server/monitor/src/test/java/org/apache/accumulo/monitor/servlets/trace/SummaryTest.java
@@ -0,0 +1,42 @@
+/*
+ * 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.accumulo.monitor.servlets.trace;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * 
+ */
+public class SummaryTest {
+
+  private Summary summary;
+
+  @Before
+  public void setup() {
+    summary = new Summary();
+  }
+
+  @Test
+  public void testRangeValues() {
+    summary.getRangeForTrace(10);
+    summary.getRangeForTrace(100);
+    summary.getRangeForTrace(4990000);
+    summary.getRangeForTrace(Long.MAX_VALUE);
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/89d64c5b/server/src/test/java/org/apache/accumulo/server/monitor/servlets/trace/SummaryTest.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/accumulo/server/monitor/servlets/trace/SummaryTest.java
b/server/src/test/java/org/apache/accumulo/server/monitor/servlets/trace/SummaryTest.java
deleted file mode 100644
index f983066..0000000
--- a/server/src/test/java/org/apache/accumulo/server/monitor/servlets/trace/SummaryTest.java
+++ /dev/null
@@ -1,42 +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.accumulo.server.monitor.servlets.trace;
-
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * 
- */
-public class SummaryTest {
-
-  private Summary summary;
-
-  @Before
-  public void setup() {
-    summary = new Summary();
-  }
-
-  @Test
-  public void testRangeValues() {
-    summary.getRangeForTrace(10);
-    summary.getRangeForTrace(100);
-    summary.getRangeForTrace(4990000);
-    summary.getRangeForTrace(Long.MAX_VALUE);
-  }
-
-}


Mime
View raw message