packetfu 1.1.13 → 2.0.0

data/spec/tcp_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'packetfu/protos/eth'
 require 'packetfu/protos/ip'
+require 'packetfu/protos/ipv6'
 require 'packetfu/protos/tcp'
 require 'packetfu/pcap'
 
@@ -29,75 +30,176 @@ end
 
 describe TCPPacket do
 
-  subject do
-    bytes = PcapFile.file_to_array(File.join(File.dirname(__FILE__), "sample2.pcap"))[2]
-    packet = Packet.parse(bytes)
-  end
-
-  context "TcpHlen reading and setting" do
-    context "TcpHlen set via #read" do
-      tcp_hlen_numeric(8)
+  context 'TCPHeader' do
+    subject do
+      bytes = PcapFile.file_to_array(File.join(File.dirname(__FILE__), "sample2.pcap"))[2]
+      packet = Packet.parse(bytes)
     end
-    context "TcpHlen set via an Integer for the setter" do
-      (0..15).each do |i|
-        context "i is #{i}" do
-          before { subject.tcp_hlen = i }
-          tcp_hlen_numeric(i)
+
+    context "TcpHlen reading and setting" do
+      context "TcpHlen set via #read" do
+        tcp_hlen_numeric(8)
+      end
+      context "TcpHlen set via an Integer for the setter" do
+        (0..15).each do |i|
+          context "i is #{i}" do
+            before { subject.tcp_hlen = i }
+            tcp_hlen_numeric(i)
+          end
         end
       end
+      context "TcpHlen set via a String for the setter" do
+        before { subject.tcp_hlen = "\x60" }
+        tcp_hlen_numeric(6)
+      end
+      context "TcpHlen set via a TcpHlen for the setter" do
+        before { subject.tcp_hlen = TcpHlen.new(:hlen => 7) }
+        tcp_hlen_numeric(7)
+      end
     end
-    context "TcpHlen set via a String for the setter" do
-      before { subject.tcp_hlen = "\x60" }
-      tcp_hlen_numeric(6)
-    end
-    context "TcpHlen set via a TcpHlen for the setter" do
-      before { subject.tcp_hlen = TcpHlen.new(:hlen => 7) }
-      tcp_hlen_numeric(7)
-    end
-  end
 
-  context "TcpReserved reading and setting" do
-    context "TcpReserved set via #read" do
-      tcp_reserved_numeric(0)
+    context "TcpReserved reading and setting" do
+      context "TcpReserved set via #read" do
+        tcp_reserved_numeric(0)
+      end
+      context "TcpReserved set via an Integer for the setter" do
+        (0..7).each do |i|
+          context "i is #{i}" do
+            before { subject.tcp_reserved = i }
+            tcp_reserved_numeric(i)
+          end
+        end
+      end
+      context "TcpReserved set via a String for the setter" do
+        before { subject.tcp_reserved = "\x03" }
+        tcp_reserved_numeric(3)
+      end
+      context "TcpReserved set via a TcpReserved for the setter" do
+        before { subject.tcp_reserved = TcpReserved.new(:r1 => 1, :r2 => 0, :r3 => 1) }
+        tcp_reserved_numeric(5)
+      end
     end
-    context "TcpReserved set via an Integer for the setter" do
-      (0..7).each do |i|
-        context "i is #{i}" do
-          before { subject.tcp_reserved = i }
-          tcp_reserved_numeric(i)
+
+    context "TcpEcn reading and setting" do
+      context "TcpEcn set via #read" do
+        tcp_ecn_numeric(0)
+      end
+      context "TcpEcn set via an Integer for the setter" do
+        (0..7).each do |i|
+          context "i is #{i}" do
+            before { subject.tcp_ecn = i }
+            tcp_ecn_numeric(i)
+          end
         end
       end
+      context "TcpEcn set via a String for the setter" do
+        before { subject.tcp_ecn = "\x00\xc0" }
+        tcp_ecn_numeric(3)
+      end
+      context "TcpEcn set via a TcpEcn for the setter" do
+        before { subject.tcp_ecn = TcpEcn.new(:n => 1, :c => 0, :e => 1) }
+        tcp_ecn_numeric(5)
+      end
     end
-    context "TcpReserved set via a String for the setter" do
-      before { subject.tcp_reserved = "\x03" }
-      tcp_reserved_numeric(3)
+  end
+
+  context 'when read from a pcap file' do
+    context '(TCP over IPv4)' do
+      before(:all) do
+        @tcp4_packet = PcapFile.read_packets(File.join(__dir__, '..', 'test',
+                                                       'sample2.pcap'))[5]
+      end
+
+      it 'should be recognize as a TCP packet' do
+        expect(@tcp4_packet).to be_a(TCPPacket)
+        expect(@tcp4_packet.is_tcp?).to be(true)
+        expect(@tcp4_packet.ipv6?).to be(false)
+      end
+
+      it 'should have the right port numbers' do
+        expect(@tcp4_packet.tcp_src).to eq(80)
+        expect(@tcp4_packet.tcp_dst).to eq(55954)
+      end
+
+      it 'should have the right length' do
+        expect(@tcp4_packet.tcp_hlen).to eq(8)
+      end
+
+      it 'should have the right checksum' do
+        expect(@tcp4_packet.tcp_sum).to eq(0x243a)
+      end
     end
-    context "TcpReserved set via a TcpReserved for the setter" do
-      before { subject.tcp_reserved = TcpReserved.new(:r1 => 1, :r2 => 0, :r3 => 1) }
-      tcp_reserved_numeric(5)
+
+    context '(TCP over IPv6)' do
+      before(:all) do
+        @tcp6_packet = PcapFile.read_packets(File.join(__dir__, '..', 'test',
+                                                       'sample-ipv6.pcap')).last
+      end
+
+      it 'should be recognize as a TCP packet' do
+        expect(@tcp6_packet).to be_a(TCPPacket)
+        expect(@tcp6_packet.is_tcp?).to be(true)
+        expect(@tcp6_packet.ipv6?).to be(true)
+      end
+
+      it 'should have the right port numbers' do
+        expect(@tcp6_packet.tcp_src).to eq(39278)
+        expect(@tcp6_packet.tcp_dst).to eq(443)
+      end
+
+      it 'should have the right length' do
+        expect(@tcp6_packet.tcp_hlen).to eq(8)
+      end
+
+      it 'should have the right checksum' do
+        expect(@tcp6_packet.tcp_sum).to eq(0xd8c9)
+      end
     end
   end
 
-  context "TcpEcn reading and setting" do
-    context "TcpEcn set via #read" do
-      tcp_ecn_numeric(0)
+  context "when initializing TCPPacket from scratch" do
+    it "should create TCP on IPv4 packets by default" do
+      tcp = TCPPacket.new
+      expect(tcp.ip_header).to be_a(IPHeader)
+      expect(tcp.ipv6_header).to be_nil
     end
-    context "TcpEcn set via an Integer for the setter" do
-      (0..7).each do |i|
-        context "i is #{i}" do
-          before { subject.tcp_ecn = i }
-          tcp_ecn_numeric(i)
-        end
-      end
+
+    it "should create TCP on IPv6 packets" do
+      tcp = TCPPacket.new(:on_ipv6 => true)
+      expect(tcp.ip_header).to be_nil
+      expect(tcp.ipv6_header).to be_a(IPv6Header)
+
+      tcp.ipv6_saddr = "::1"
+      tcp.ipv6_daddr = "::2"
+      tcp.tcp_src = 41000
+      tcp.tcp_dst = 42000
+      tcp.tcp_seq = 1
+      tcp.payload = "\0" * 16
+      tcp.recalc
+      expect(tcp.tcp_sum).to eq(0x2b98)
+      expect(tcp.tcp_hlen).to eq(5)
     end
-    context "TcpEcn set via a String for the setter" do
-      before { subject.tcp_ecn = "\x00\xc0" }
-      tcp_ecn_numeric(3)
+
+    it 'should support peek functionnality (IPv4 case)' do
+      tcp = TCPPacket.new
+      tcp.ip_saddr = '192.168.1.1'
+      tcp.ip_daddr = '192.168.1.254'
+      tcp.tcp_src = 32756
+      tcp.tcp_dst = 80
+      tcp.payload = 'abcdefghijklmnopqrstuvwxyz'
+      tcp.recalc
+      expect(tcp.peek).to match(/T  80\s+192.168.1.1:32756\s+->\s+192.168.1.254:80 \[\.{6,6}\] S:[a-f0-9]+|I:[a-f0-9]+/)
     end
-    context "TcpEcn set via a TcpEcn for the setter" do
-      before { subject.tcp_ecn = TcpEcn.new(:n => 1, :c => 0, :e => 1) }
-      tcp_ecn_numeric(5)
+
+    it 'should support peek functionnality (IPv6 case)' do
+      tcp = TCPPacket.new(:on_ipv6 => true)
+      tcp.ipv6_saddr = '2000::1'
+      tcp.ipv6_daddr = '2001::1'
+      tcp.tcp_src = 32756
+      tcp.tcp_dst = 80
+      tcp.payload = 'abcdefghijklmnopqrstuvwxyz'
+      tcp.recalc
+      expect(tcp.peek).to match(/6T 100\s+2000::1:32756\s+->\s+2001::1:80 \[\.{6,6}\] S:[a-f0-9]+/)
     end
   end
-
 end

metadata

@@ -1,30 +1,56 @@
 --- !ruby/object:Gem::Specification
 name: packetfu
 version: !ruby/object:Gem::Version
-  version: 1.1.13
+  version: 2.0.0
 platform: ruby
 authors:
 - Tod Beardsley
 - Jonathan Claudius
-autorequire: 
+autorequire:
 bindir: bin
-cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIENDCCApygAwIBAgIBATANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBd0b2Ri
+  L0RDPXBhY2tldGZ1L0RDPWNvbTAeFw0yMzA2MjcwMDExMjdaFw0yNDA2MjYwMDEx
+  MjdaMCIxIDAeBgNVBAMMF3RvZGIvREM9cGFja2V0ZnUvREM9Y29tMIIBojANBgkq
+  hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAyz2+nfp+Vv+JVHrJMy5Ck3qWBkiZmE0w
+  7bR1I/bNXrCtv75l1GxTdRAoxKcXpXyC8elJQ9PEjEEDtdGBYQ13BKcQbDJ36etD
+  wjbhRs5SBXgIilJAiR3i/cVnNoNJKOpiJZPufkOpag7Sg8Ze+cWbsc0gYN9nyCmz
+  LYwWDC6Ji0KgJFw5YxFvIxVeOx86Ccfd64Wsa3EhkZd6fOpDE3029GWDqZwZTBIX
+  RzJP4M7QZHZjq3gbHgSKFCFv0MqsjnQzUhPyB/U27c/n+wfRzZNx4Y1eRVm7gwPP
+  LJDzt6mvtlXqc6pQ1NsR9hv3sieFLZDDPU1AaWiOAckIKcVoXB8sGnuFMczMW97o
+  OZLfqfZUAN6LSY939T2sCyOcGhjxZIQbXtn/R/RAJ7UTfJld9UdthKm1W/f0cjwW
+  yqoVsFL+nda6xfta9EnRqqFLOJqyX/wwA2cPO9B8EyM8vFEE8AG8wLu1tF3ggoMg
+  rKut/WQADc3ymKAtsr9bOWajj7bIQVJnAgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYD
+  VR0PBAQDAgSwMB0GA1UdDgQWBBR2kf7ATPt3O7Lpc0uyyCiow3P88DAcBgNVHREE
+  FTATgRF0b2RiQHBhY2tldGZ1LmNvbTAcBgNVHRIEFTATgRF0b2RiQHBhY2tldGZ1
+  LmNvbTANBgkqhkiG9w0BAQsFAAOCAYEAZMp8nY7WzGOPO6TrAlZg37D3s3Rcm0/z
+  6DBzFcY4F5CF3xq1Z/DZ3JwhjILaHPAZTvVT4uj91K4BYh/QgteS52C+O/9qsZ25
+  L3Ocu4Yp+aU40KpjW+IjlzgTS3E21pCBrBTgT7NuTHmTmoNmHfE6Gbbig3a68C9z
+  LcXj2RaEQuhOKrq5vw/0AV34wRieClM/oW8kWAKJDQ8/WEocHQpO1K/dhQ9hHNir
+  lMpjKXsWuxdAZPyvNj15w9fw5a4gZgW26P4VBNJUD/iCe7QYhwXrhdhxf+cygW2A
+  gBCt2UC6yISUDFiajyTw8cTJB1UyfLIADS4hiOEShx7hvVee444bgmOA99C+YuzT
+  FFUt9KVtWsXKD0R6GBvbAUW4/LjmXCCM+Z3uWo1Ph6zljlNHz6/tg+SB7DVgsI3i
+  XuSkzAmFsPisZ7uZk/7gJVlmyaqIxdrPVt9ZOTeSc/8pgSoRurHEJ7KlUXv4kcYM
+  F3a8dA5tl/TC0vkHlCtghhLuD46SlAmH
+  -----END CERTIFICATE-----
+date: 2023-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pcaprub
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -43,46 +69,46 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: sdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -99,16 +125,16 @@ dependencies:
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 description: "\n    PacketFu is a mid-level packet manipulation library for Ruby.
   With\n    it, users can read, parse, and write network packets with the level of\n
   \   ease and fun they expect from Ruby.\n  "
@@ -122,6 +148,8 @@ extra_rdoc_files:
 - README.md
 files:
 - ".document"
+- ".github/ISSUE_TEMPLATE.md"
+- ".github/workflows/verify.yml"
 - ".gitignore"
 - ".mailmap"
 - ".rspec"
@@ -139,6 +167,7 @@ files:
 - bench/octets_after.txt
 - bench/octets_after_refactor.txt
 - bench/octets_before.txt
+- certs/todb.pem
 - examples/100kpackets.rb
 - examples/ackscan.rb
 - examples/arp.rb
@@ -153,6 +182,7 @@ files:
 - examples/packetfu-shell.rb
 - examples/pcap2pcapng.rb
 - examples/ping.rb
+- examples/readpcap.rb
 - examples/simple-sniffer.rb
 - examples/simple-stats.rb
 - examples/slammer.rb
@@ -217,11 +247,13 @@ files:
 - lib/packetfu/version.rb
 - packetfu.gemspec
 - spec/arp_spec.rb
+- spec/capture_spec.rb
 - spec/eth_spec.rb
 - spec/fake_packets.rb
 - spec/hsrp_spec.rb
 - spec/icmp_spec.rb
 - spec/icmpv6_spec.rb
+- spec/inject_spec.rb
 - spec/invalid_spec.rb
 - spec/ip_spec.rb
 - spec/ipv4_icmp.pcap
@@ -357,17 +389,14 @@ files:
 - test/sample2.pcapng
 - test/sample_hsrp_pcapr.cap
 - test/sample_lldp.pcap
-- test/test_capture.rb
-- test/test_inject.rb
 - test/test_packet.rb
-- test/test_structfu.rb
 - test/test_tcp.rb
 - test/vlan-pcapr.cap
 homepage: https://github.com/packetfu/packetfu
 licenses:
-- BSD
+- BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -375,24 +404,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: packetfu
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.4.13
+signing_key:
 specification_version: 4
 summary: PacketFu is a mid-level packet manipulation library.
 test_files:
 - spec/arp_spec.rb
+- spec/capture_spec.rb
 - spec/eth_spec.rb
 - spec/hsrp_spec.rb
 - spec/icmp_spec.rb
 - spec/icmpv6_spec.rb
+- spec/inject_spec.rb
 - spec/invalid_spec.rb
 - spec/ip_spec.rb
 - spec/ipv6_spec.rb
@@ -412,8 +442,5 @@ test_files:
 - spec/tcp_spec.rb
 - spec/udp_spec.rb
 - spec/utils_spec.rb
-- test/test_capture.rb
-- test/test_inject.rb
 - test/test_packet.rb
-- test/test_structfu.rb
 - test/test_tcp.rb

data/test/test_capture.rb

@@ -1,58 +0,0 @@
-#!/usr/bin/env ruby
-require 'test/unit'
-$:.unshift File.join(File.expand_path(File.dirname(__FILE__)), "..", "lib")
-require 'packetfu'
-
-
-class CaptureTest < Test::Unit::TestCase
-
-  def test_cap
-    assert_nothing_raised { PacketFu::Capture }
-  end
-
-  def test_whoami
-    assert_nothing_raised { PacketFu::Utils.whoami?(:iface => PacketFu::Utils.default_int) }
-  end
-  
-  def test_new
-    cap = PacketFu::Capture.new
-    assert_kind_of PacketFu::Capture, cap
-    cap = PacketFu::Capture.new(
-      :filter => 'tcp and dst host 1.2.3.4'
-    )
-  end
-  
-  def test_filter
-    daddr = PacketFu::Utils.rand_routable_daddr.to_s
-    cap = PacketFu::Capture.new( :filter => "icmp and dst host #{daddr}")
-    cap.start
-    %x{ping -c 1 #{daddr}}
-    sleep 1
-    cap.save
-    assert cap.array.size == 1
-    pkt = PacketFu::Packet.parse(cap.array.first)
-    assert pkt.ip_daddr == daddr
-  end
-  
-  def test_no_filter
-    daddr = PacketFu::Utils.rand_routable_daddr.to_s
-    daddr2 = PacketFu::Utils.rand_routable_daddr.to_s
-    cap = PacketFu::Capture.new
-    cap.start
-    %x{ping -c 1 #{daddr}}
-    %x{ping -c 1 #{daddr2}}
-    sleep 1
-    cap.save
-    assert cap.array.size > 1
-  end
-
-  def test_bpf_alias
-    daddr = PacketFu::Utils.rand_routable_daddr.to_s
-    cap = PacketFu::Capture.new( :filter => "icmp and dst host #{daddr}")
-    assert cap.filter.object_id == cap.bpf.object_id
-  end
-
-end
-
-
-# vim: nowrap sw=2 sts=0 ts=2 ff=unix ft=ruby

data/test/test_inject.rb

@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-require 'test/unit'
-$:.unshift File.join(File.expand_path(File.dirname(__FILE__)), "..", "lib")
-require 'packetfu'
-
-
-class InjectTest < Test::Unit::TestCase
-
-  def test_cap
-    assert_nothing_raised { PacketFu::Capture }
-  end
-
-  def test_whoami
-    assert_nothing_raised { PacketFu::Utils.whoami?(:iface => PacketFu::Utils.default_int) }
-  end
-
-  def test_to_w
-    assert_equal(Process.euid, 0, "TEST FAIL: This test must be run as root")
-    conf = PacketFu::Utils.whoami?(:iface => PacketFu::Utils.default_int)
-    p = PacketFu::UDPPacket.new(:config => conf)
-    p.udp_dport = 12345
-    p.udp_sport = 12345
-    p.payload = "PacketFu test packet"
-    p.recalc
-    assert p.to_w
-  end
-
-end
-
-
-# vim: nowrap sw=2 sts=0 ts=2 ff=unix ft=ruby

data/test/test_structfu.rb

@@ -1,114 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: binary -*-
-
-require 'test/unit'
-$:.unshift File.join(File.expand_path(File.dirname(__FILE__)), "..", "lib")
-require 'packetfu'
-
-# Whee unit testing.
-class IntStringTest < Test::Unit::TestCase
-  include StructFu
-
-  def test_intstring_len
-    s = IntString.new("hello!", Int32)
-    assert_equal(s.len, s.int.v)
-    assert_not_equal(s.len, s.length)
-    s.len=10
-    assert_equal(s.len, s[:int][:value])
-  end
-
-  def test_intstring_to_s
-    s = IntString.new("hello!", Int16)
-    assert_equal("\x00\x06hello!",s.to_s)
-    s.len=10
-    assert_equal("\x00\x0ahello!",s.to_s)
-    s = IntString.new("hello!", Int16, :parse)
-    s.len=10
-    assert_equal("\x00\x0ahello!\x00\x00\x00\x00",s.to_s)
-    s = IntString.new("hello!", Int16, :fix)
-    s.len=10
-    assert_equal("\x00\x06hello!",s.to_s)
-  end
-
-  def test_intstring_new
-    assert_equal("\x06Hello!",IntString.new("Hello!").to_s)
-    assert_equal("\x00\x06Hello!",IntString.new("Hello!",Int16).to_s)
-    assert_equal("\x06\x00\x00\x00Hello!",IntString.new("Hello!",Int32le).to_s)
-  end
-
-  def test_intstring_read
-    s = IntString.new
-    s.read("\x06Hello!")
-    assert_equal("Hello!", s.string)
-    assert_equal("Hello!", s[:string])
-    assert_equal(6, s.int.value)
-    assert_equal(6, s.len)
-  end
-
-  def test_intstring_parse
-    s = IntString.new
-    s[:mode] = :parse
-    s.parse("\x02Hello!")
-    assert_equal("He", s.string)
-    assert_equal(2, s.int.v)
-    s.parse("\x0aHello!")
-    assert_equal("Hello!\x00\x00\x00\x00", s.string)
-    s[:mode] = :fix
-    s.parse("\x0aHello!")
-    assert_equal("Hello!", s.string)
-  end
-
-  def test_intstring_nocalc
-    s = IntString.new
-    s[:string] = "Hello"
-    assert_equal(0,s.int.value)
-  end
-
-end
-
-class IntTest < Test::Unit::TestCase
-  include StructFu
-
-  def test_int_to_s
-    assert_equal("\x02",Int8.new(2).to_s) 
-    assert_equal("\x00\x07",Int16.new(7).to_s) 
-    assert_equal("\x00\x00\x00\x0a",Int32.new(10).to_s) 
-  end
-
-  def test_int_big
-    assert_equal("\x00\x07",Int16be.new(7).to_s) 
-    assert_equal("\x00\x00\x00\x0a",Int32be.new(10).to_s) 
-  end
-
-  def test_int_little
-    assert_equal("\x07\x00",Int16le.new(7).to_s) 
-    assert_equal("\x01\x04\x00\x00",Int32le.new(1025).to_s) 
-  end
-
-  def test_read
-    assert_equal(7,Int16.new.read("\x00\x07").to_i) 
-    assert_equal(Int32.new.read("\x00\x00\x00\x0a").to_i,10) 
-    i = Int32.new
-    i.read("\x00\x00\x00\xff")
-    assert_equal(i.v, 255)
-    assert_equal(7, Int16le.new.read("\x07\x00").to_i) 
-    assert_equal(1025,Int32le.new.read("\x01\x04\x00\x00").to_i) 
-    i = Int32le.new
-    i.read("\xff\x00\x00\x00")
-    assert_equal(i.v, 255)
-  end
-
-  def test_int_compare
-    little = Int32le.new
-    big = Int32be.new
-    little.v = 128
-    big.v = 0x80
-    assert_not_equal(little.to_s, big.to_s)
-    assert_equal(little.v, big.v)
-    assert_equal(little[:value], big[:value])
-    assert_equal(little.value, big.value)
-  end
-
-end
-
-# vim: nowrap sw=2 sts=0 ts=2 ff=unix ft=ruby