Merge in bugfix for #5912
authorJaroslav Tulach <jtulach@netbeans.org>
Sat, 29 Mar 2014 11:38:00 +0100
changeset 644be06e8f28500
parent 642 38d99662928c
parent 643 9a267fc965ec
child 646 a838ef015f5f
Merge in bugfix for #5912
     1.1 --- a/json/src/main/java/org/netbeans/html/json/impl/ModelProcessor.java	Wed Mar 26 18:59:04 2014 +0100
     1.2 +++ b/json/src/main/java/org/netbeans/html/json/impl/ModelProcessor.java	Sat Mar 29 11:38:00 2014 +0100
     1.3 @@ -918,7 +918,7 @@
     1.4                      } else {
     1.5                          simpleName = type.toString();
     1.6                      }
     1.7 -                    if (simpleName.toString().equals(className)) {
     1.8 +                    if (checkFirst && simpleName.toString().equals(className)) {
     1.9                          checkFirst = false;
    1.10                      } else {
    1.11                          if (checkFirst) {
     2.1 --- a/json/src/test/java/net/java/html/json/OperationTest.java	Wed Mar 26 18:59:04 2014 +0100
     2.2 +++ b/json/src/test/java/net/java/html/json/OperationTest.java	Sat Mar 29 11:38:00 2014 +0100
     2.3 @@ -67,6 +67,11 @@
     2.4              m.getNames().add(name.toUpperCase());
     2.5          }
     2.6      }
     2.7 +    
     2.8 +    @ModelOperation static void copy(OpModel m, OpModel orig) {
     2.9 +        m.getNames().clear();
    2.10 +        m.getNames().addAll(orig.getNames());
    2.11 +    }
    2.12  
    2.13      @Test public void addOneToTheModel() {
    2.14          BrwsrCtx ctx = Contexts.newBuilder().build();
    2.15 @@ -108,4 +113,13 @@
    2.16              fail("There should be at least one inner class: " + cnt);
    2.17          }
    2.18      }
    2.19 +    
    2.20 +    @Test public void copyOperation() {
    2.21 +        OpModel orig = new OpModel("Ahoj", "Jardo");
    2.22 +        OpModel n = new OpModel();
    2.23 +        n.copy(orig);
    2.24 +        assertEquals(n.getNames().size(), 2, "Two elems");
    2.25 +        assertEquals(n.getNames().get(0), "Ahoj", "1st");
    2.26 +        assertEquals(n.getNames().get(1), "Jardo", "2nd");
    2.27 +    }
    2.28  }