You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/05/10 13:37:25 UTC
[02/22] ambari git commit: AMBARI-20952. Collection added to itself
AMBARI-20952. Collection added to itself
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3dd206cc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3dd206cc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3dd206cc
Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 3dd206ccf4bd3dfeee128581e3641dedca86a842
Parents: 8a69951
Author: Attila Doroszlai <ad...@hortonworks.com>
Authored: Mon May 8 10:39:22 2017 +0200
Committer: Attila Doroszlai <ad...@hortonworks.com>
Committed: Mon May 8 20:35:35 2017 +0200
----------------------------------------------------------------------
.../server/stack/QuickLinksConfigurationModule.java | 2 +-
.../org/apache/ambari/server/stack/ThemeModule.java | 2 +-
.../server/stack/QuickLinksConfigurationModuleTest.java | 10 ++++++++++
.../org/apache/ambari/server/stack/ThemeModuleTest.java | 12 ++++++++++--
4 files changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3dd206cc/ambari-server/src/main/java/org/apache/ambari/server/stack/QuickLinksConfigurationModule.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/QuickLinksConfigurationModule.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/QuickLinksConfigurationModule.java
index c879c02..0f36a9a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/QuickLinksConfigurationModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/QuickLinksConfigurationModule.java
@@ -125,7 +125,7 @@ public class QuickLinksConfigurationModule extends BaseModule<QuickLinksConfigur
@Override
public void addErrors(Collection<String> errors) {
- errors.addAll(errors);
+ this.errors.addAll(errors);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/3dd206cc/ambari-server/src/main/java/org/apache/ambari/server/stack/ThemeModule.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/ThemeModule.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/ThemeModule.java
index 72d3bd3..d0a5f34 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/ThemeModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/ThemeModule.java
@@ -125,7 +125,7 @@ public class ThemeModule extends BaseModule<ThemeModule, ThemeInfo> implements V
@Override
public void addErrors(Collection<String> errors) {
- errors.addAll(errors);
+ this.errors.addAll(errors);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/3dd206cc/ambari-server/src/test/java/org/apache/ambari/server/stack/QuickLinksConfigurationModuleTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/QuickLinksConfigurationModuleTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/QuickLinksConfigurationModuleTest.java
index f6b7dfa..142efa3 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/stack/QuickLinksConfigurationModuleTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/QuickLinksConfigurationModuleTest.java
@@ -27,6 +27,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.state.quicklinks.Check;
@@ -37,11 +38,20 @@ import org.apache.ambari.server.state.quicklinks.QuickLinks;
import org.apache.ambari.server.state.quicklinks.QuickLinksConfiguration;
import org.junit.Test;
+import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
public class QuickLinksConfigurationModuleTest {
@Test
+ public void testAddErrors() {
+ Set<String> errors = ImmutableSet.of("one error", "two errors");
+ QuickLinksConfigurationModule module = new QuickLinksConfigurationModule((File) null);
+ module.addErrors(errors);
+ assertEquals(errors, ImmutableSet.copyOf(module.getErrors()));
+ }
+
+ @Test
public void testResolveInherit() throws Exception{
QuickLinks[] results = resolveQuickLinks("parent_quicklinks.json", "child_quicklinks_to_inherit.json");
QuickLinks parentQuickLinks = results[0];
http://git-wip-us.apache.org/repos/asf/ambari/blob/3dd206cc/ambari-server/src/test/java/org/apache/ambari/server/stack/ThemeModuleTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/ThemeModuleTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/ThemeModuleTest.java
index ec89a8c..e8b1b40 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/stack/ThemeModuleTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/ThemeModuleTest.java
@@ -22,12 +22,14 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import java.io.File;
+import java.util.Set;
import org.apache.ambari.server.state.theme.Theme;
import org.junit.Test;
-public class ThemeModuleTest {
+import com.google.common.collect.ImmutableSet;
+public class ThemeModuleTest {
@Test
public void testResolve() throws Exception {
@@ -49,7 +51,13 @@ public class ThemeModuleTest {
assertEquals(10, parentTheme.getThemeConfiguration().getWidgets().size());
assertEquals(12, childTheme.getThemeConfiguration().getWidgets().size());
+ }
-
+ @Test
+ public void testAddErrors() {
+ Set<String> errors = ImmutableSet.of("one error", "two errors");
+ ThemeModule module = new ThemeModule((File) null);
+ module.addErrors(errors);
+ assertEquals(errors, ImmutableSet.copyOf(module.getErrors()));
}
}
\ No newline at end of file